From: Greg KH <gregkh@linuxfoundation.org>
To: Lee Jones <lee.jones@linaro.org>
Cc: arnd@arndb.de, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Rodolfo Giometti <giometti@enneenne.com>,
"Eurotech S.p.A" <info@eurotech.it>,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: Re: [PATCH 1/1] misc: c2port: core: Make copying name from userspace more secure
Date: Thu, 23 Jul 2020 09:41:15 +0200 [thread overview]
Message-ID: <20200723074115.GA1289884@kroah.com> (raw)
In-Reply-To: <20200714083259.1313267-1-lee.jones@linaro.org>
On Tue, Jul 14, 2020 at 09:32:59AM +0100, Lee Jones wrote:
> Currently the 'c2dev' device data is not zeroed when its allocated.
> Coupled with the fact strncpy() *may not* provide a NUL terminator
> means that a 1-byte leak would be possible *if* this was ever copied
> to userspace.
c2dev is a kernel internal structure, it is never copied to userspace,
so why even mention such a thing?
> To prevent such a failing, let's first ensure the 'c2dev' device data
> area is fully zeroed out and ensure the buffer will always be NUL
> terminated by using the kernel's strscpy() which a) uses the
> destination (instead of the source) size as the bytes to copy and b)
> is *always* NUL terminated.
>
> Cc: Rodolfo Giometti <giometti@enneenne.com>
> Cc: "Eurotech S.p.A" <info@eurotech.it>
> Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> drivers/misc/c2port/core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
> index 80d87e8a0bea9..0de538a1cc1c6 100644
> --- a/drivers/misc/c2port/core.c
> +++ b/drivers/misc/c2port/core.c
> @@ -899,7 +899,7 @@ struct c2port_device *c2port_device_register(char *name,
> unlikely(!ops->c2d_get) || unlikely(!ops->c2d_set))
> return ERR_PTR(-EINVAL);
>
> - c2dev = kmalloc(sizeof(struct c2port_device), GFP_KERNEL);
> + c2dev = kzalloc(sizeof(struct c2port_device), GFP_KERNEL);
All fields seem to be properly initialized so this really isn't needed
from what I can tell.
> if (unlikely(!c2dev))
> return ERR_PTR(-ENOMEM);
>
> @@ -923,7 +923,7 @@ struct c2port_device *c2port_device_register(char *name,
> }
> dev_set_drvdata(c2dev->dev, c2dev);
>
> - strncpy(c2dev->name, name, C2PORT_NAME_LEN - 1);
> + strscpy(c2dev->name, name, sizeof(c2dev->name));
Given there is only 1 user of this function, and it passes in "uc", this
isn't a big deal :)
But, I can take this as a separate patch, if you want to redo this, just
to be safe in the future.
thanks,
greg k-h
prev parent reply other threads:[~2020-07-23 7:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 8:32 [PATCH 1/1] misc: c2port: core: Make copying name from userspace more secure Lee Jones
2020-07-14 9:01 ` Arnd Bergmann
2020-07-23 7:41 ` Greg KH [this message]
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=20200723074115.GA1289884@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=arnd@arndb.de \
--cc=geert+renesas@glider.be \
--cc=giometti@enneenne.com \
--cc=info@eurotech.it \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).