From: Danilo Krummrich <dakr@redhat.com>
To: Dan Carpenter <dan.carpenter@linaro.org>
Cc: Lyude Paul <lyude@redhat.com>, David Airlie <airlied@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>,
dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
Karol Herbst <kherbst@redhat.com>
Subject: Re: [PATCH] drm/nouveau: Use kmemdup_array() instead of kmemdup()
Date: Mon, 17 Jun 2024 17:55:33 +0200 [thread overview]
Message-ID: <a61d9781-7c6e-46b8-ab1b-cf4fc1c76ba3@redhat.com> (raw)
In-Reply-To: <a3e8cecc-77dd-4a4a-bb12-c1d6759d3efb@moroto.mountain>
On 6/17/24 11:33, Dan Carpenter wrote:
> Use kmemdup_array() because we're allocating an array.
>
> The main difference between kmemdup() and kmemdup_array() is that the
> kmemdup_array() function has integer overflow checking built it. The
> "args->in_sync.count" variable is a u32 so integer overflows would only
> be a concern on 32bit systems. Fortunately, however, the u_memcpya()
> function has integer overflow checking which means that it is not an
> issue.
>
> Still using kmemdup_array() is more appropriate and makes auditing the
> code easier.
Indeed, we shouldn't rely on the previous check here, good catch.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> drivers/gpu/drm/nouveau/nouveau_sched.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.c b/drivers/gpu/drm/nouveau/nouveau_sched.c
> index 32fa2e273965..53d8b0584a56 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_sched.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_sched.c
> @@ -45,10 +45,10 @@ nouveau_job_init(struct nouveau_job *job,
> if (job->sync)
> return -EINVAL;
>
> - job->in_sync.data = kmemdup(args->in_sync.s,
> - sizeof(*args->in_sync.s) *
> - args->in_sync.count,
> - GFP_KERNEL);
> + job->in_sync.data = kmemdup_array(args->in_sync.s,
> + args->in_sync.count,
> + sizeof(*args->in_sync.s),
> + GFP_KERNEL);
> if (!job->in_sync.data)
> return -ENOMEM;
Not sure if this is what we want for kmemdup_array(). It just saturates the
size. This doesn't prevent accessing the array out of bounds later on. I mean,
it's rather unlikely to get such a huge amount of physically contiguous memory
anyways, but wouldn't it be cleaner to let kmemdup_array() return
ERR_PTR(-EOVERFLOW) on overflow, just like memdup_array_user()[1]?
AFAICS, there's just two users of kmemdup_array(), hence it should be an easy
change. :-)
[1] https://elixir.bootlin.com/linux/latest/source/include/linux/string.h#L30
> }
> @@ -60,10 +60,10 @@ nouveau_job_init(struct nouveau_job *job,
> goto err_free_in_sync;
> }
>
> - job->out_sync.data = kmemdup(args->out_sync.s,
> - sizeof(*args->out_sync.s) *
> - args->out_sync.count,
> - GFP_KERNEL);
> + job->out_sync.data = kmemdup_array(args->out_sync.s,
> + args->out_sync.count,
> + sizeof(*args->out_sync.s),
> + GFP_KERNEL);
> if (!job->out_sync.data) {
> ret = -ENOMEM;
> goto err_free_in_sync;
next prev parent reply other threads:[~2024-06-17 15:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-17 9:33 Dan Carpenter
2024-06-17 15:55 ` Danilo Krummrich [this message]
2024-06-18 7:00 ` Dan Carpenter
2024-06-18 5:33 ` Markus Elfring
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=a61d9781-7c6e-46b8-ab1b-cf4fc1c76ba3@redhat.com \
--to=dakr@redhat.com \
--cc=airlied@gmail.com \
--cc=dan.carpenter@linaro.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=kherbst@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lyude@redhat.com \
--cc=nouveau@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
all inboxes | Powered by JetHome®