From: David Laight <David.Laight@ACULAB.COM>
To: 'Jonathan Cameron' <Jonathan.Cameron@Huawei.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Jonathan Cameron <jic23@kernel.org>,
Len Baker <len.baker@gmx.com>,
Lars-Peter Clausen <lars@metafoo.de>,
Kees Cook <keescook@chromium.org>,
"linux-hardening@vger.kernel.org"
<linux-hardening@vger.kernel.org>,
linux-iio <linux-iio@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v2] drivers/iio: Remove all strcpy() uses in favor of strscpy()
Date: Tue, 10 Aug 2021 08:30:26 +0000 [thread overview]
Message-ID: <9b509d0fd5c4459985aac9b35abe462b@AcuMS.aculab.com> (raw)
In-Reply-To: <20210809102131.000021eb@Huawei.com>
From: Jonathan Cameron
> Sent: 09 August 2021 10:22
>
> On Sun, 8 Aug 2021 22:00:34 +0300
> Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
>
> > On Sun, Aug 8, 2021 at 7:25 PM Jonathan Cameron <jic23@kernel.org> wrote:
> > >
> > > On Sat, 7 Aug 2021 17:22:25 +0200
> > > Len Baker <len.baker@gmx.com> wrote:
> > >
> > > > strcpy() performs no bounds checking on the destination buffer. This
> > > > could result in linear overflows beyond the end of the buffer, leading
> > > > to all kinds of misbehaviors. The safe replacement is strscpy().
> > > >
> > > > This patch is an effort to clean up the proliferation of str*()
> > > > functions in the kernel and a previous step in the path to remove
> > > > the strcpy function from the kernel entirely [1].
> > > >
> > > > [1] https://github.com/KSPP/linux/issues/88
> > > >
> > > > Signed-off-by: Len Baker <len.baker@gmx.com>
> > > Applied to the togreg branch of iio.git and pushed out as testing
> > > so 0-day can poke at it and see if we missed anything.
> >
> > Isn't it too early? Or am I missing something (see below)?
> >
> > ...
> >
> > > > /* use length + 2 for adding minus sign if needed */
> > > > - str = devm_kzalloc(regmap_get_device(st->map),
> > > > - strlen(orient) + 2, GFP_KERNEL);
> > > > + n = strlen(orient) + 2;
> > > > + str = devm_kzalloc(regmap_get_device(st->map), n,
> > > > + GFP_KERNEL);
> > > > if (str == NULL)
> > > > return -ENOMEM;
> > > > if (strcmp(orient, "0") == 0) {
> > > > - strcpy(str, orient);
> > > > + strscpy(str, orient, n);
> > > > } else if (orient[0] == '-') {
> > > > - strcpy(str, &orient[1]);
> > > > + strscpy(str, &orient[1], n);
> > > > } else {
> > > > str[0] = '-';
> > > > - strcpy(&str[1], orient);
> > > > + strscpy(&str[1], orient, n - 1);
> >
> > Why n-1?
>
> n is the total length and this is printing from [1], so n - 1 is remaining
> space.
If you do:
/* negate 'orient' */
n = strlen(orient) + 1;
str = malloc(n + 1);
if (n == 2 && orient[0] == '0')
memcpy(str, orient, n);
else if (orient[0] == '-')
memcpy(str, orient + 1, n - 1);
else {
str[0] = '-';
memcpy(str + 1, orient, n);
}
Then it is probably less confusing.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
prev parent reply other threads:[~2021-08-10 8:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-07 15:22 [PATCH v2] drivers/iio: Remove all strcpy() uses in favor of strscpy() Len Baker
2021-08-08 16:25 ` Jonathan Cameron
2021-08-08 19:00 ` Andy Shevchenko
2021-08-09 9:21 ` Jonathan Cameron
2021-08-09 16:14 ` Len Baker
2021-08-10 12:06 ` Andy Shevchenko
2021-08-10 12:11 ` Andy Shevchenko
2021-08-10 15:43 ` Len Baker
2021-08-10 8:30 ` David Laight [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=9b509d0fd5c4459985aac9b35abe462b@AcuMS.aculab.com \
--to=david.laight@aculab.com \
--cc=Jonathan.Cameron@Huawei.com \
--cc=andy.shevchenko@gmail.com \
--cc=jic23@kernel.org \
--cc=keescook@chromium.org \
--cc=lars@metafoo.de \
--cc=len.baker@gmx.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-iio@vger.kernel.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).