lkml.org 
[lkml]   [2020]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 078/114] gcc-10: avoid shadowing standard library free() in crypto
    Date
    From: Linus Torvalds <torvalds@linux-foundation.org>

    commit 1a263ae60b04de959d9ce9caea4889385eefcc7b upstream.

    gcc-10 has started warning about conflicting types for a few new
    built-in functions, particularly 'free()'.

    This results in warnings like:

    crypto/xts.c:325:13: warning: conflicting types for built-in function ‘free’; expected ‘void(void *)’ [-Wbuiltin-declaration-mismatch]

    because the crypto layer had its local freeing functions called
    'free()'.

    Gcc-10 is in the wrong here, since that function is marked 'static', and
    thus there is no chance of confusion with any standard library function
    namespace.

    But the simplest thing to do is to just use a different name here, and
    avoid this gcc mis-feature.

    [ Side note: gcc knowing about 'free()' is in itself not the
    mis-feature: the semantics of 'free()' are special enough that a
    compiler can validly do special things when seeing it.

    So the mis-feature here is that gcc thinks that 'free()' is some
    restricted name, and you can't shadow it as a local static function.

    Making the special 'free()' semantics be a function attribute rather
    than tied to the name would be the much better model ]

    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    crypto/lrw.c | 4 ++--
    crypto/xts.c | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    --- a/crypto/lrw.c
    +++ b/crypto/lrw.c
    @@ -531,7 +531,7 @@ static void exit_tfm(struct crypto_skcip
    crypto_free_skcipher(ctx->child);
    }

    -static void free(struct skcipher_instance *inst)
    +static void free_inst(struct skcipher_instance *inst)
    {
    crypto_drop_skcipher(skcipher_instance_ctx(inst));
    kfree(inst);
    @@ -642,7 +642,7 @@ static int create(struct crypto_template
    inst->alg.encrypt = encrypt;
    inst->alg.decrypt = decrypt;

    - inst->free = free;
    + inst->free = free_inst;

    err = skcipher_register_instance(tmpl, inst);
    if (err)
    --- a/crypto/xts.c
    +++ b/crypto/xts.c
    @@ -469,7 +469,7 @@ static void exit_tfm(struct crypto_skcip
    crypto_free_cipher(ctx->tweak);
    }

    -static void free(struct skcipher_instance *inst)
    +static void free_inst(struct skcipher_instance *inst)
    {
    crypto_drop_skcipher(skcipher_instance_ctx(inst));
    kfree(inst);
    @@ -580,7 +580,7 @@ static int create(struct crypto_template
    inst->alg.encrypt = encrypt;
    inst->alg.decrypt = decrypt;

    - inst->free = free;
    + inst->free = free_inst;

    err = skcipher_register_instance(tmpl, inst);
    if (err)

    \
     
     \ /
      Last update: 2020-05-18 19:51    [W:4.123 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site