From: Peter Chen <peter.chen@freescale.com>
To: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/1] drivers/usb/chipidea/debuc.c: avoid out of bound read
Date: Tue, 21 Apr 2015 09:32:56 +0800 [thread overview]
Message-ID: <20150421013254.GA25710@shlinux2> (raw)
In-Reply-To: <1429250653-1626-1-git-send-email-xypron.glpk@gmx.de>
On Fri, Apr 17, 2015 at 08:04:13AM +0200, Heinrich Schuchardt wrote:
> A string written by the user may not be zero terminated.
>
> sscanf may read memory beyond the buffer if no zero byte
> is found.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
> drivers/usb/chipidea/debug.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c
> index dfb05ed..ef08af3 100644
> --- a/drivers/usb/chipidea/debug.c
> +++ b/drivers/usb/chipidea/debug.c
> @@ -88,9 +88,13 @@ static ssize_t ci_port_test_write(struct file *file, const char __user *ubuf,
> char buf[32];
> int ret;
>
> - if (copy_from_user(buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
> + count = min_t(size_t, sizeof(buf) - 1, count);
> + if (copy_from_user(buf, ubuf, count))
> return -EFAULT;
Any reasons to change above?
>
> + /* sscanf requires a zero terminated string */
> + buf[count] = 0;
> +
I prefer using '\0'
> if (sscanf(buf, "%u", &mode) != 1)
> return -EINVAL;
>
> --
> 2.1.4
>
--
Best Regards,
Peter Chen
next prev parent reply other threads:[~2015-04-21 1:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-17 6:04 [PATCH 1/1] drivers/usb/chipidea/debuc.c: avoid out of bound read Heinrich Schuchardt
2015-04-21 1:32 ` Peter Chen [this message]
2015-04-21 19:25 ` Heinrich Schuchardt
2015-04-22 1:26 ` Peter Chen
2015-04-27 18:25 ` Heinrich Schuchardt
2015-04-28 8:22 ` Peter Chen
2015-04-28 17:30 ` [PATCH 1/1 v2] " Heinrich Schuchardt
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=20150421013254.GA25710@shlinux2 \
--to=peter.chen@freescale.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=xypron.glpk@gmx.de \
/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).