vfio: checking of validity of user vaddr in vfio_dma_rw
Subsystems (2)
PATCH 1/1 vfio: checking of validity of user vaddr in vfio_dma_rw
instead of calling __copy_to/from_user(), use copy_to_from_user() to ensure vaddr range is a valid user address range before accessing them.
Cc Kees Cook <[email protected]>
Fixes 8d46c0cca5f4 ("vfio: introduce vfio_dma_rw to read/write a range of IOVAs")
Signed-off-by Yan Zhao <[email protected]>
--- drivers/vfio/vfio_iommu_type1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/vfio/vfio_iommu_type1.c +2 -2
@@ -2345,10 +2345,10 @@ static int vfio_iommu_type1_dma_rw_chunk(struct vfio_iommu *iommu, vaddr = dma->vaddr + offset;if (write) - *copied =__copy_to_user ((void __user *)vaddr, data, + *copied =copy_to_user ((void __user *)vaddr, data, count) ?0 : count;else - *copied =__copy_from_user (data, (void __user *)vaddr, + *copied =copy_from_user (data, (void __user *)vaddr, count) ?0 : count;if (kthread)unuse_mm (mm);
Signature · 1 line
2.17.1
Quoted 7 lines · Yan Zhao
instead of calling __copy_to/from_user(), use
copy_to_from_user()to ensure vaddr range is a valid user address range before accessing them.Cc Kees Cook <[email protected]>Fixes 8d46c0cca5f4 ("vfio: introduce vfio_dma_rw to read/write a range of IOVAs")Signed-off-by Yan Zhao <[email protected]>
Thanks!
Reported-by Kees Cook <[email protected]>
Reviewed-by Kees Cook <[email protected]>
-Kees
Quoted 24 lines
--- drivers/vfio/vfio_iommu_type1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/vfio/vfio_iommu_type1.c +2
-2@@ -2345,10 +2345,10 @@ static int vfio_iommu_type1_dma_rw_chunk(struct vfio_iommu *iommu, vaddr = dma->vaddr + offset;if (write) - *copied =__copy_to_user ((void __user *)vaddr, data, + *copied =copy_to_user ((void __user *)vaddr, data, count) ?0 : count;else - *copied =__copy_from_user (data, (void __user *)vaddr, + *copied =copy_from_user (data, (void __user *)vaddr, count) ?0 : count;if (kthread)unuse_mm (mm);Signature · 1 line
2.17.1
Signature · 1 line
Kees Cook