'vfio_group_get_from_dev()' seems to return only NULL on error, not an error pointer. Fixes: 2169037dc322 ("vfio iommu: Added pin and unpin callback functions to vfio_iommu_driver_ops") Fixes: c086de818dd8 ("vfio iommu: Add blocking notifier to notify DMA_UNMAP") Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx> --- This could be split in 2 patches in order to have only one Fixes tag in each --- drivers/vfio/vfio.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index 0aac3ca54a53..7b39313abf0d 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -1933,8 +1933,8 @@ int vfio_pin_pages(struct device *dev, unsigned long *user_pfn, int npage, return -E2BIG; group = vfio_group_get_from_dev(dev); - if (IS_ERR(group)) - return PTR_ERR(group); + if (!group) + return -ENODEV; ret = vfio_group_add_container_user(group); if (ret) @@ -1982,8 +1982,8 @@ int vfio_unpin_pages(struct device *dev, unsigned long *user_pfn, int npage) return -E2BIG; group = vfio_group_get_from_dev(dev); - if (IS_ERR(group)) - return PTR_ERR(group); + if (!group) + return -ENODEV; ret = vfio_group_add_container_user(group); if (ret) @@ -2019,8 +2019,8 @@ int vfio_register_notifier(struct device *dev, struct notifier_block *nb) return -EINVAL; group = vfio_group_get_from_dev(dev); - if (IS_ERR(group)) - return PTR_ERR(group); + if (!group) + return -ENODEV; ret = vfio_group_add_container_user(group); if (ret) @@ -2055,8 +2055,8 @@ int vfio_unregister_notifier(struct device *dev, struct notifier_block *nb) return -EINVAL; group = vfio_group_get_from_dev(dev); - if (IS_ERR(group)) - return PTR_ERR(group); + if (!group) + return -ENODEV; ret = vfio_group_add_container_user(group); if (ret) -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html