From: Stafford Horne <shorne@gmail.com>
To: Eric Biggers <ebiggers3@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
Greg KH <gregkh@linuxfoundation.org>,
arnd@arndb.de, linux-crypto@vger.kernel.org,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Nick Desaulniers <nick.desaulniers@gmail.com>
Subject: Re: [RFC PATCH 1/2] crypto: Fix -Wstringop-truncation warnings
Date: Sat, 23 Jun 2018 15:46:48 +0900 [thread overview]
Message-ID: <20180623064648.GH24595@lianli.shorne-pla.net> (raw)
In-Reply-To: <20180623025256.GG24595@lianli.shorne-pla.net>
On Sat, Jun 23, 2018 at 11:52:56AM +0900, Stafford Horne wrote:
> On Fri, Jun 22, 2018 at 07:41:49PM -0700, Eric Biggers wrote:
> > On Sat, Jun 23, 2018 at 11:07:52AM +0900, Stafford Horne wrote:
> > > As of GCC 9.0.0 the build is reporting warnings like:
> > >
[...]
> > > strncpy(rblkcipher.type, "blkcipher", sizeof(rblkcipher.type));
> > > strncpy(rblkcipher.geniv, alg->cra_blkcipher.geniv ?: "<default>",
> > > - sizeof(rblkcipher.geniv));
> > > + sizeof(rblkcipher.geniv) - 1);
> > >
> > > rblkcipher.blocksize = alg->cra_blocksize;
> > > rblkcipher.min_keysize = alg->cra_blkcipher.min_keysize;
> >
> > Your "fix" introduces an information disclosure bug, as it results in
> > uninitialized memory being copied to userspace. This same broken patch was sent
> > by someone else too.
> >
> > Maybe it would be best to just memset() the crypto_report_* structs to 0 after
> > declaration and then replace the strncpy()'s with strscpy()'s, even if just to
> > stop people from sending broken "fixes". Do you want to do that?
>
> Right, I didnt realize that we were using strncpy to also init the whole buffer.
>
> I will do as suggest, and respin.
Hi Eric,
I thought about this a bit, doing memset() and strscpy() seemed fine, but the
below also would work, be a bit faster and stop gcc form complaining. What do
you think?
@@ -512,6 +512,7 @@ static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
strncpy(rblkcipher.type, "blkcipher", sizeof(rblkcipher.type));
strncpy(rblkcipher.geniv, alg->cra_blkcipher.geniv ?: "<default>",
sizeof(rblkcipher.geniv));
+ rblkcipher.geniv[sizeof(rblkcipher.geniv) - 1] = '\0';
rblkcipher.blocksize = alg->cra_blocksize;
rblkcipher.min_keysize = alg->cra_blkcipher.min_keysize;
Let me know what you think.
-Stafford
next prev parent reply other threads:[~2018-06-23 6:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-23 2:07 [RFC PATCH 0/2] Fix GCC -Wstringop-truncation warnings Stafford Horne
2018-06-23 2:07 ` [RFC PATCH 1/2] crypto: Fix " Stafford Horne
2018-06-23 2:22 ` Max Filippov
2018-06-23 2:41 ` Eric Biggers
2018-06-23 2:52 ` Stafford Horne
2018-06-23 6:46 ` Stafford Horne [this message]
2018-06-23 2:07 ` [RFC PATCH 2/2] kobject: Fix -Wstringop-truncation warning Stafford Horne
2018-06-23 2:31 ` Eric Biggers
2018-06-23 2:50 ` Stafford Horne
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=20180623064648.GH24595@lianli.shorne-pla.net \
--to=shorne@gmail.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=ebiggers3@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nick.desaulniers@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.