From: Matthew Brost <matthew.brost@intel.com>
To: <intel-xe@lists.freedesktop.org>
Cc: Matthew Brost <matthew.brost@intel.com>
Subject: [PATCH 2/3] drm/xe: Validate user fence during creation
Date: Mon, 26 Feb 2024 18:43:36 -0800 [thread overview]
Message-ID: <20240227024337.141585-3-matthew.brost@intel.com> (raw)
In-Reply-To: <20240227024337.141585-1-matthew.brost@intel.com>
Fail invalidate addresses during user fence creation.
Fixes: dd08ebf6c352 drm/xe: ("Introduce a new DRM driver for Intel GPUs")
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
drivers/gpu/drm/xe/xe_sync.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_sync.c b/drivers/gpu/drm/xe/xe_sync.c
index da8799bf7237..022e158d28d9 100644
--- a/drivers/gpu/drm/xe/xe_sync.c
+++ b/drivers/gpu/drm/xe/xe_sync.c
@@ -52,14 +52,18 @@ static struct user_fence *user_fence_create(struct xe_device *xe, u64 addr,
u64 value)
{
struct user_fence *ufence;
+ u64 __user *ptr = u64_to_user_ptr(addr);
+
+ if (!access_ok(ptr, sizeof(ptr)))
+ return ERR_PTR(-EFAULT);
ufence = kmalloc(sizeof(*ufence), GFP_KERNEL);
if (!ufence)
- return NULL;
+ return ERR_PTR(-ENOMEM);
ufence->xe = xe;
kref_init(&ufence->refcount);
- ufence->addr = u64_to_user_ptr(addr);
+ ufence->addr = ptr;
ufence->value = value;
ufence->mm = current->mm;
mmgrab(ufence->mm);
@@ -181,8 +185,8 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,
} else {
sync->ufence = user_fence_create(xe, sync_in.addr,
sync_in.timeline_value);
- if (XE_IOCTL_DBG(xe, !sync->ufence))
- return -ENOMEM;
+ if (XE_IOCTL_DBG(xe, IS_ERR(sync->ufence)))
+ return PTR_ERR(sync->ufence);
}
break;
--
2.34.1
next prev parent reply other threads:[~2024-02-27 2:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 2:43 [PATCH 0/3] xe_sync and ufence rework Matthew Brost
2024-02-27 2:43 ` [PATCH 1/3] drm/xe: Remove used xe_sync_entry_wait Matthew Brost
2024-02-27 10:37 ` Thomas Hellström
2024-02-27 2:43 ` Matthew Brost [this message]
2024-02-27 10:41 ` [PATCH 2/3] drm/xe: Validate user fence during creation Thomas Hellström
2024-02-27 2:43 ` [PATCH 3/3] drm/xe: Get page on user fence creation Matthew Brost
2024-02-27 11:01 ` Thomas Hellström
2024-02-27 12:38 ` Thomas Hellström
2024-02-27 17:05 ` Matthew Brost
2024-02-27 17:08 ` Matthew Brost
2024-02-27 2:48 ` ✓ CI.Patch_applied: success for xe_sync and ufence rework Patchwork
2024-02-27 2:48 ` ✗ CI.checkpatch: warning " Patchwork
2024-02-27 2:49 ` ✓ CI.KUnit: success " Patchwork
2024-02-27 3:00 ` ✓ CI.Build: " Patchwork
2024-02-27 3:01 ` ✓ CI.Hooks: " Patchwork
2024-02-27 3:02 ` ✓ CI.checksparse: " Patchwork
2024-02-27 3:21 ` ✓ CI.BAT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240227024337.141585-3-matthew.brost@intel.com \
--to=matthew.brost@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox