Skip to content

Commit d256459

Browse files
tititiou36awilliam
authored andcommitted
vfio: Fix handling of error returned by 'vfio_group_get_from_dev()'
'vfio_group_get_from_dev()' seems to return only NULL on error, not an error pointer. Fixes: 2169037 ("vfio iommu: Added pin and unpin callback functions to vfio_iommu_driver_ops") Fixes: c086de8 ("vfio iommu: Add blocking notifier to notify DMA_UNMAP") Signed-off-by: Christophe JAILLET <[email protected]> Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Alex Williamson <[email protected]>
1 parent 5ba6de9 commit d256459

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/vfio/vfio.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1933,8 +1933,8 @@ int vfio_pin_pages(struct device *dev, unsigned long *user_pfn, int npage,
19331933
return -E2BIG;
19341934

19351935
group = vfio_group_get_from_dev(dev);
1936-
if (IS_ERR(group))
1937-
return PTR_ERR(group);
1936+
if (!group)
1937+
return -ENODEV;
19381938

19391939
ret = vfio_group_add_container_user(group);
19401940
if (ret)
@@ -1982,8 +1982,8 @@ int vfio_unpin_pages(struct device *dev, unsigned long *user_pfn, int npage)
19821982
return -E2BIG;
19831983

19841984
group = vfio_group_get_from_dev(dev);
1985-
if (IS_ERR(group))
1986-
return PTR_ERR(group);
1985+
if (!group)
1986+
return -ENODEV;
19871987

19881988
ret = vfio_group_add_container_user(group);
19891989
if (ret)
@@ -2019,8 +2019,8 @@ int vfio_register_notifier(struct device *dev, struct notifier_block *nb)
20192019
return -EINVAL;
20202020

20212021
group = vfio_group_get_from_dev(dev);
2022-
if (IS_ERR(group))
2023-
return PTR_ERR(group);
2022+
if (!group)
2023+
return -ENODEV;
20242024

20252025
ret = vfio_group_add_container_user(group);
20262026
if (ret)
@@ -2055,8 +2055,8 @@ int vfio_unregister_notifier(struct device *dev, struct notifier_block *nb)
20552055
return -EINVAL;
20562056

20572057
group = vfio_group_get_from_dev(dev);
2058-
if (IS_ERR(group))
2059-
return PTR_ERR(group);
2058+
if (!group)
2059+
return -ENODEV;
20602060

20612061
ret = vfio_group_add_container_user(group);
20622062
if (ret)

0 commit comments

Comments
 (0)