Skip to content

Commit 89e8a23

Browse files
LuBaolujoergroedel
authored andcommitted
iommu: Return right value in iommu_sva_bind_device()
iommu_sva_bind_device() should return either a sva bond handle or an ERR_PTR value in error cases. Existing drivers (idxd and uacce) only check the return value with IS_ERR(). This could potentially lead to a kernel NULL pointer dereference issue if the function returns NULL instead of an error pointer. In reality, this doesn't cause any problems because iommu_sva_bind_device() only returns NULL when the kernel is not configured with CONFIG_IOMMU_SVA. In this case, iommu_dev_enable_feature(dev, IOMMU_DEV_FEAT_SVA) will return an error, and the device drivers won't call iommu_sva_bind_device() at all. Fixes: 26b25a2 ("iommu: Bind process address spaces to devices") Signed-off-by: Lu Baolu <[email protected]> Reviewed-by: Jean-Philippe Brucker <[email protected]> Reviewed-by: Kevin Tian <[email protected]> Reviewed-by: Vasant Hegde <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Joerg Roedel <[email protected]>
1 parent cc8d89d commit 89e8a23

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/iommu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,7 @@ struct iommu_domain *iommu_sva_domain_alloc(struct device *dev,
15331533
static inline struct iommu_sva *
15341534
iommu_sva_bind_device(struct device *dev, struct mm_struct *mm)
15351535
{
1536-
return NULL;
1536+
return ERR_PTR(-ENODEV);
15371537
}
15381538

15391539
static inline void iommu_sva_unbind_device(struct iommu_sva *handle)

0 commit comments

Comments
 (0)