On 11/24/2016 4:38 PM, Dan Carpenter wrote:
> These are all checking for IS_ERR() but vfio_group_get_from_dev()
> returns NULL pointers on error.
>
> Fixes: c086de818dd8 ("vfio iommu: Add blocking notifier to notify DMA_UNMAP")
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
>
> diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
> index 0aac3ca..952e68c 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 -EINVAL;
>
> 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 -EINVAL;
>
> 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 -EINVAL;
>
> 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 -EINVAL;
>
> ret = vfio_group_add_container_user(group);
> if (ret)
> --
This makes sense. Thanks for fixing this.
Reviewed by: Kirti Wankhede <kwankhede@xxxxxxxxxx>
--
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
