path: root/drivers
diff options
authorAndrey Konovalov <>2019-09-25 16:48:51 -0700
committerLinus Torvalds <>2019-09-25 17:51:41 -0700
commit4fdfae8d8f855d79b7d83fcd590b6ac7ed0099cf (patch)
treed394bdd825e5e65fe3eab246f627760ffa2f0803 /drivers
parent35f3fc87bebfb2fffc1a9cdaf661ee3f95c2a5f1 (diff)
drm/radeon: untag user pointers in radeon_gem_userptr_ioctl
This patch is a part of a series that extends kernel ABI to allow to pass tagged user pointers (with the top byte set to something else other than 0x00) as syscall arguments. In radeon_gem_userptr_ioctl() an MMU notifier is set up with a (tagged) userspace pointer. The untagged address should be used so that MMU notifiers for the untagged address get correctly matched up with the right BO. This funcation also calls radeon_ttm_tt_pin_userptr(), which uses provided user pointers for vma lookups, which can only by done with untagged pointers. This patch untags user pointers in radeon_gem_userptr_ioctl(). Link: Signed-off-by: Andrey Konovalov <> Reviewed-by: Khalid Aziz <> Reviewed-by: Kees Cook <> Suggested-by: Felix Kuehling <> Acked-by: Felix Kuehling <> Cc: Al Viro <> Cc: Catalin Marinas <> Cc: Dave Hansen <> Cc: Eric Auger <> Cc: Jens Wiklander <> Cc: Mauro Carvalho Chehab <> Cc: Mike Rapoport <> Cc: Vincenzo Frascino <> Cc: Will Deacon <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'drivers')
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 4cf58dbbe439..b2b076606f54 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -296,6 +296,8 @@ int radeon_gem_userptr_ioctl(struct drm_device *dev, void *data,
uint32_t handle;
int r;
+ args->addr = untagged_addr(args->addr);
if (offset_in_page(args->addr | args->size))
return -EINVAL;