lkml.org 
[lkml]   [2018]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.4 01/43] crypto: skcipher - Fix -Wstringop-truncation warnings
    Date
    From: Stafford Horne <shorne@gmail.com>

    [ Upstream commit cefd769fd0192c84d638f66da202459ed8ad63ba ]

    As of GCC 9.0.0 the build is reporting warnings like:

    crypto/ablkcipher.c: In function ‘crypto_ablkcipher_report’:
    crypto/ablkcipher.c:374:2: warning: ‘strncpy’ specified bound 64 equals destination size [-Wstringop-truncation]
    strncpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "<default>",
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    sizeof(rblkcipher.geniv));
    ~~~~~~~~~~~~~~~~~~~~~~~~~

    This means the strnycpy might create a non null terminated string. Fix this by
    explicitly performing '\0' termination.

    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Max Filippov <jcmvbkbc@gmail.com>
    Cc: Eric Biggers <ebiggers3@gmail.com>
    Cc: Nick Desaulniers <nick.desaulniers@gmail.com>
    Signed-off-by: Stafford Horne <shorne@gmail.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    crypto/ablkcipher.c | 2 ++
    crypto/blkcipher.c | 1 +
    2 files changed, 3 insertions(+)

    diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
    index 149e7a7f04fe..b524f702e658 100644
    --- a/crypto/ablkcipher.c
    +++ b/crypto/ablkcipher.c
    @@ -384,6 +384,7 @@ static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
    strncpy(rblkcipher.type, "ablkcipher", sizeof(rblkcipher.type));
    strncpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "<default>",
    sizeof(rblkcipher.geniv));
    + rblkcipher.geniv[sizeof(rblkcipher.geniv) - 1] = '\0';

    rblkcipher.blocksize = alg->cra_blocksize;
    rblkcipher.min_keysize = alg->cra_ablkcipher.min_keysize;
    @@ -465,6 +466,7 @@ static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
    strncpy(rblkcipher.type, "givcipher", sizeof(rblkcipher.type));
    strncpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "<built-in>",
    sizeof(rblkcipher.geniv));
    + rblkcipher.geniv[sizeof(rblkcipher.geniv) - 1] = '\0';

    rblkcipher.blocksize = alg->cra_blocksize;
    rblkcipher.min_keysize = alg->cra_ablkcipher.min_keysize;
    diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
    index 2d08e59b3212..d524f838eb10 100644
    --- a/crypto/blkcipher.c
    +++ b/crypto/blkcipher.c
    @@ -515,6 +515,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;
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-17 05:07    [W:4.039 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site