From: Steven Price <steven.price@arm.com>
To: Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@linux.ie>,
Rob Herring <robh@kernel.org>,
Tomeu Vizoso <tomeu.vizoso@collabora.com>,
Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>,
Boris Brezillon <boris.brezillon@collabora.com>
Cc: Steven Price <steven.price@arm.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Dan Carpenter <dan.carpenter@oracle.com>
Subject: [PATCH] drm/panfrost: Avoid user size passed to kvmalloc()
Date: Thu, 16 Dec 2021 16:16:03 +0000 [thread overview]
Message-ID: <20211216161603.983711-1-steven.price@arm.com> (raw)
panfrost_copy_in_sync() takes the number of fences from user space
(in_sync_count) and used to kvmalloc() an array to hold that number of
fences before processing them. This provides an easy method for user
space to trigger the OOM killer (by temporarily allocating large amounts
of kernel memory) or hit the WARN_ONCE() added by 7661809d493b ("mm:
don't allow oversized kvmalloc() calls").
Since we don't expect there to be a large number of fences we can
instead iterate over the fences one-by-one and avoid the temporary
allocation altogether. This also makes the code simpler.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Steven Price <steven.price@arm.com>
---
drivers/gpu/drm/panfrost/panfrost_drv.c | 44 ++++++++-----------------
1 file changed, 14 insertions(+), 30 deletions(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index 96bb5a465627..12ab55e5782c 100644
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -186,47 +186,31 @@ panfrost_copy_in_sync(struct drm_device *dev,
struct drm_panfrost_submit *args,
struct panfrost_job *job)
{
- u32 *handles;
- int ret = 0;
- int i, in_fence_count;
-
- in_fence_count = args->in_sync_count;
-
- if (!in_fence_count)
- return 0;
-
- handles = kvmalloc_array(in_fence_count, sizeof(u32), GFP_KERNEL);
- if (!handles) {
- ret = -ENOMEM;
- DRM_DEBUG("Failed to allocate incoming syncobj handles\n");
- goto fail;
- }
+ int i;
+ u32 __user *user_handles = u64_to_user_ptr(args->in_syncs);
- if (copy_from_user(handles,
- (void __user *)(uintptr_t)args->in_syncs,
- in_fence_count * sizeof(u32))) {
- ret = -EFAULT;
- DRM_DEBUG("Failed to copy in syncobj handles\n");
- goto fail;
- }
-
- for (i = 0; i < in_fence_count; i++) {
+ for (i = 0; i < args->in_sync_count; i++) {
struct dma_fence *fence;
+ u32 handle;
+ int ret;
+
+ ret = copy_from_user(&handle, user_handles + i,
+ sizeof(handle));
+ if (ret)
+ return -EFAULT;
- ret = drm_syncobj_find_fence(file_priv, handles[i], 0, 0,
+ ret = drm_syncobj_find_fence(file_priv, handle, 0, 0,
&fence);
if (ret)
- goto fail;
+ return ret;
ret = drm_sched_job_add_dependency(&job->base, fence);
if (ret)
- goto fail;
+ return ret;
}
-fail:
- kvfree(handles);
- return ret;
+ return 0;
}
static int panfrost_ioctl_submit(struct drm_device *dev, void *data,
--
2.30.2
next reply other threads:[~2021-12-16 16:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 16:16 Steven Price [this message]
2021-12-16 17:12 ` Rob Herring
2021-12-17 8:55 ` Steven Price
2021-12-17 9:10 ` Dan Carpenter
2021-12-17 9:16 ` Steven Price
2021-12-17 9:28 ` Dan Carpenter
2021-12-17 9:48 ` Steven Price
2021-12-16 17:49 ` Alyssa Rosenzweig
2021-12-17 6:40 ` Dan Carpenter
2021-12-17 7:38 ` Tomeu Vizoso
2021-12-17 8:56 ` Steven Price
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=20211216161603.983711-1-steven.price@arm.com \
--to=steven.price@arm.com \
--cc=airlied@linux.ie \
--cc=alyssa.rosenzweig@collabora.com \
--cc=boris.brezillon@collabora.com \
--cc=dan.carpenter@oracle.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
--cc=tomeu.vizoso@collabora.com \
/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
all inboxes | Powered by JetHome®