From: Eric Biggers Subject: Re: [PATCH] crypto: blkcipher: prefer strlcpy to strncpy Date: Tue, 29 May 2018 09:34:00 -0700 Message-ID: <20180529163400.GA166256@gmail.com> References: <1527572683-26098-1-git-send-email-nick.desaulniers@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: herbert@gondor.apana.org.au, davem@davemloft.net, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org To: Nick Desaulniers Return-path: Content-Disposition: inline In-Reply-To: <1527572683-26098-1-git-send-email-nick.desaulniers@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-crypto.vger.kernel.org On Mon, May 28, 2018 at 10:44:43PM -0700, Nick Desaulniers wrote: > Fixes stringop-truncation warnings from gcc-8. > > Signed-off-by: Nick Desaulniers > --- > crypto/ablkcipher.c | 8 ++++---- > crypto/blkcipher.c | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c > index d880a48..e38867f 100644 > --- a/crypto/ablkcipher.c > +++ b/crypto/ablkcipher.c > @@ -370,8 +370,8 @@ static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) > { > struct crypto_report_blkcipher rblkcipher; > > - strncpy(rblkcipher.type, "ablkcipher", sizeof(rblkcipher.type)); > - strncpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "", > + strlcpy(rblkcipher.type, "ablkcipher", sizeof(rblkcipher.type)); > + strlcpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "", > sizeof(rblkcipher.geniv)); > > rblkcipher.blocksize = alg->cra_blocksize; > @@ -444,8 +444,8 @@ static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg) > { > struct crypto_report_blkcipher rblkcipher; > > - strncpy(rblkcipher.type, "givcipher", sizeof(rblkcipher.type)); > - strncpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "", > + strlcpy(rblkcipher.type, "givcipher", sizeof(rblkcipher.type)); > + strlcpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "", > sizeof(rblkcipher.geniv)); > > rblkcipher.blocksize = alg->cra_blocksize; > diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c > index 01c0d4a..ee88e48 100644 > --- a/crypto/blkcipher.c > +++ b/crypto/blkcipher.c > @@ -509,8 +509,8 @@ static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) > { > struct crypto_report_blkcipher rblkcipher; > > - strncpy(rblkcipher.type, "blkcipher", sizeof(rblkcipher.type)); > - strncpy(rblkcipher.geniv, alg->cra_blkcipher.geniv ?: "", > + strlcpy(rblkcipher.type, "blkcipher", sizeof(rblkcipher.type)); > + strlcpy(rblkcipher.geniv, alg->cra_blkcipher.geniv ?: "", > sizeof(rblkcipher.geniv)); > > rblkcipher.blocksize = alg->cra_blocksize; > -- > 2.7.4 > Hi Nick, this patch is wrong. The 'struct crypto_report_blkcipher' is being copied to userspace via netlink, so all bytes of it must be initialized. strncpy() does this but strlcpy() does not. I noticed that you're sending out some other patches replacing strncpy() with strlcpy() too. Can you please double check them for this same bug? Thanks, - Eric