lkml.org 
[lkml]   [2018]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 01/94] crypto: skcipher - Fix -Wstringop-truncation warnings
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    crypto/ablkcipher.c | 2 ++
    crypto/blkcipher.c | 1 +
    2 files changed, 3 insertions(+)

    --- a/crypto/ablkcipher.c
    +++ b/crypto/ablkcipher.c
    @@ -367,6 +367,7 @@ static int crypto_ablkcipher_report(stru
    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;
    @@ -441,6 +442,7 @@ static int crypto_givcipher_report(struc
    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;
    --- a/crypto/blkcipher.c
    +++ b/crypto/blkcipher.c
    @@ -510,6 +510,7 @@ static int crypto_blkcipher_report(struc
    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;

    \
     
     \ /
      Last update: 2018-10-02 15:46    [W:2.537 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site