]> www.infradead.org Git - linux.git/commitdiff
drm/xe/ufence: Prefetch ufence addr to catch bogus address
authorNirmoy Das <nirmoy.das@intel.com>
Wed, 16 Oct 2024 08:23:03 +0000 (10:23 +0200)
committerNirmoy Das <nirmoy.das@intel.com>
Fri, 18 Oct 2024 15:36:22 +0000 (17:36 +0200)
access_ok() only checks for addr overflow so also try to read the addr
to catch invalid addr sent from userspace.

Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/1630
Cc: Francois Dugast <francois.dugast@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241016082304.66009-2-nirmoy.das@intel.com
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
drivers/gpu/drm/xe/xe_sync.c

index c6cf227ead40c0e60c843e237ce33289f4c6511a..2e72c06fd40d07c63ba5876f1663acefb97dea5c 100644 (file)
@@ -54,8 +54,9 @@ static struct xe_user_fence *user_fence_create(struct xe_device *xe, u64 addr,
 {
        struct xe_user_fence *ufence;
        u64 __user *ptr = u64_to_user_ptr(addr);
+       u64 __maybe_unused prefetch_val;
 
-       if (!access_ok(ptr, sizeof(*ptr)))
+       if (get_user(prefetch_val, ptr))
                return ERR_PTR(-EFAULT);
 
        ufence = kzalloc(sizeof(*ufence), GFP_KERNEL);