Skip to content

Commit ddeb798

Browse files
mbrost05rodrigovivi
authored andcommitted
drm/xe: Validate user fence during creation
Fail invalid addresses during user fence creation. Fixes: dd08ebf ("drm/xe: Introduce a new DRM driver for Intel GPUs") Signed-off-by: Matthew Brost <matthew.brost@intel.com> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240717140429.1396820-1-matthew.brost@intel.com (cherry picked from commit 0fde907) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent 7c626ce commit ddeb798

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

drivers/gpu/drm/xe/xe_sync.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,18 @@ static struct xe_user_fence *user_fence_create(struct xe_device *xe, u64 addr,
5353
u64 value)
5454
{
5555
struct xe_user_fence *ufence;
56+
u64 __user *ptr = u64_to_user_ptr(addr);
57+
58+
if (!access_ok(ptr, sizeof(ptr)))
59+
return ERR_PTR(-EFAULT);
5660

5761
ufence = kmalloc(sizeof(*ufence), GFP_KERNEL);
5862
if (!ufence)
59-
return NULL;
63+
return ERR_PTR(-ENOMEM);
6064

6165
ufence->xe = xe;
6266
kref_init(&ufence->refcount);
63-
ufence->addr = u64_to_user_ptr(addr);
67+
ufence->addr = ptr;
6468
ufence->value = value;
6569
ufence->mm = current->mm;
6670
mmgrab(ufence->mm);
@@ -183,8 +187,8 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,
183187
} else {
184188
sync->ufence = user_fence_create(xe, sync_in.addr,
185189
sync_in.timeline_value);
186-
if (XE_IOCTL_DBG(xe, !sync->ufence))
187-
return -ENOMEM;
190+
if (XE_IOCTL_DBG(xe, IS_ERR(sync->ufence)))
191+
return PTR_ERR(sync->ufence);
188192
}
189193

190194
break;

0 commit comments

Comments
 (0)