amdgpu: validate offset_in_bo of drm_amdgpu_gem_va
Subsystems (2)
PATCH v3 1/1 amdgpu: validate offset_in_bo of drm_amdgpu_gem_va
This is motivated by OOB access in amdgpu_vm_update_range when offset_in_bo+map_size overflows.
v2: keep the validations in amdgpu_vm_bo_map
v3: add the validations to amdgpu_vm_bo_map/amdgpu_vm_bo_replace_map
rather than to amdgpu_gem_va_ioctl
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +8 -8
@@ -1434,14 +1434,14 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev,uint64_t eaddr;/* validate the parameters */ -if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || - size ==0 || size & ~PAGE_MASK ) +if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK ) +return -EINVAL ; +if (saddr + size <= saddr || offset + size <= offset)return -EINVAL ;/* make sure object fit at this offset */ eaddr = saddr + size -1 ; -if (saddr >= eaddr || - (bo && offset + size >amdgpu_bo_size (bo)) || +if ((bo && offset + size >amdgpu_bo_size (bo)) || (eaddr >= adev->vm_manager.max_pfn <<AMDGPU_GPU_PAGE_SHIFT ))return -EINVAL ;
@@ -1500,14 +1500,14 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_device *adev,int r;/* validate the parameters */ -if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || - size ==0 || size & ~PAGE_MASK ) +if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK ) +return -EINVAL ; +if (saddr + size <= saddr || offset + size <= offset)return -EINVAL ;/* make sure object fit at this offset */ eaddr = saddr + size -1 ; -if (saddr >= eaddr || - (bo && offset + size >amdgpu_bo_size (bo)) || +if ((bo && offset + size >amdgpu_bo_size (bo)) || (eaddr >= adev->vm_manager.max_pfn <<AMDGPU_GPU_PAGE_SHIFT ))return -EINVAL ;
Signature · 1 line
2.41.0.rc0.172.g3f132b7071-goog
Am 02.06.23 um 00:44 schrieb Chia-I Wu:
Quoted 9 lines
This is motivated by OOB access in
amdgpu_vm_update_rangewhen offset_in_bo+map_size overflows.v2: keep the validations in
amdgpu_vm_bo_map
v3: add the validations to amdgpu_vm_bo_map/amdgpu_vm_bo_replace_map
rather than toamdgpu_gem_va_ioctlFixes 9f7eb5367d00 ("drm/amdgpu: actually use the VM map parameters")Signed-off-by Chia-I Wu <[email protected]>
Quoted 46 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +8
-8@@ -1434,14 +1434,14 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev,uint64_t eaddr;/* validate the parameters */ -if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || - size ==0 || size & ~PAGE_MASK ) +if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK ) +return -EINVAL ; +if (saddr + size <= saddr || offset + size <= offset)return -EINVAL ;/* make sure object fit at this offset */ eaddr = saddr + size -1 ; -if (saddr >= eaddr || - (bo && offset + size >amdgpu_bo_size (bo)) || +if ((bo && offset + size >amdgpu_bo_size (bo)) || (eaddr >= adev->vm_manager.max_pfn <<AMDGPU_GPU_PAGE_SHIFT ))return -EINVAL ;@@ -1500,14 +1500,14 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_device *adev,int r;/* validate the parameters */ -if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || - size ==0 || size & ~PAGE_MASK ) +if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK ) +return -EINVAL ; +if (saddr + size <= saddr || offset + size <= offset)return -EINVAL ;/* make sure object fit at this offset */ eaddr = saddr + size -1 ; -if (saddr >= eaddr || - (bo && offset + size >amdgpu_bo_size (bo)) || +if ((bo && offset + size >amdgpu_bo_size (bo)) || (eaddr >= adev->vm_manager.max_pfn <<AMDGPU_GPU_PAGE_SHIFT ))return -EINVAL ;
Alex Deucher
AppliedApplied. Thanks!
Alex
Quoted 61 lines · Christian König
Am 02.06.23 um 00:44 schrieb Chia-I Wu:
Quoted 9 lines
This is motivated by OOB access in
amdgpu_vm_update_rangewhen offset_in_bo+map_size overflows.v2: keep the validations in
amdgpu_vm_bo_map
v3: add the validations to amdgpu_vm_bo_map/amdgpu_vm_bo_replace_map
rather than toamdgpu_gem_va_ioctlFixes 9f7eb5367d00 ("drm/amdgpu: actually use the VM map parameters")Signed-off-by Chia-I Wu <[email protected]>Reviewed-by Christian König <[email protected]>Quoted 46 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +8
-8@@ -1434,14 +1434,14 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev,uint64_t eaddr;/* validate the parameters */ -if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || - size ==0 || size & ~PAGE_MASK ) +if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK ) +return -EINVAL ; +if (saddr + size <= saddr || offset + size <= offset)return -EINVAL ;/* make sure object fit at this offset */ eaddr = saddr + size -1 ; -if (saddr >= eaddr || - (bo && offset + size >amdgpu_bo_size (bo)) || +if ((bo && offset + size >amdgpu_bo_size (bo)) || (eaddr >= adev->vm_manager.max_pfn <<AMDGPU_GPU_PAGE_SHIFT ))return -EINVAL ;@@ -1500,14 +1500,14 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_device *adev,int r;/* validate the parameters */ -if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || - size ==0 || size & ~PAGE_MASK ) +if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK ) +return -EINVAL ; +if (saddr + size <= saddr || offset + size <= offset)return -EINVAL ;/* make sure object fit at this offset */ eaddr = saddr + size -1 ; -if (saddr >= eaddr || - (bo && offset + size >amdgpu_bo_size (bo)) || +if ((bo && offset + size >amdgpu_bo_size (bo)) || (eaddr >= adev->vm_manager.max_pfn <<AMDGPU_GPU_PAGE_SHIFT ))return -EINVAL ;