Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto - Avoid free() namespace collision

Browse Source 
gcc-10 complains about using the name of a standard library
function in the kernel, as we are not building with -ffreestanding:

crypto/xts.c:325:13: error: conflicting types for built-in function 'free'; expected 'void(void *)' [-Werror=builtin-declaration-mismatch]
  325 | static void free(struct skcipher_instance *inst)
      |             ^~~~
crypto/lrw.c:290:13: error: conflicting types for built-in function 'free'; expected 'void(void *)' [-Werror=builtin-declaration-mismatch]
  290 | static void free(struct skcipher_instance *inst)
      |             ^~~~
crypto/lrw.c:27:1: note: 'free' is declared in header '<stdlib.h>'

The xts and lrw cipher implementations run into this because they do
not use the conventional namespaced function names.

It might be better to rename all local functions in those files to
help with things like 'ctags' and 'grep', but just renaming these two
avoids the build issue. I picked the more verbose crypto_xts_free()
and crypto_lrw_free() names for consistency with several other drivers
that do use namespaced function names.

Fixes: f1c131b454 ("crypto: xts - Convert to skcipher")
Fixes: 700cb3f5fe ("crypto: lrw - Convert to skcipher")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Arnd Bergmann 2020-04-30 23:30:43 +02:00 committed by Herbert Xu
parent e0664ebcea
commit d099ea6e6f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/lrw.c
View File

@ -287,7 +287,7 @@ static void exit_tfm(struct crypto_skcipher *tfm)
crypto_free_skcipher(ctx->child); crypto_free_skcipher(ctx->child);
} }
static void free(struct skcipher_instance *inst) static void crypto_lrw_free(struct skcipher_instance *inst)
{ {
crypto_drop_skcipher(skcipher_instance_ctx(inst)); crypto_drop_skcipher(skcipher_instance_ctx(inst));
kfree(inst); kfree(inst);
@ -400,12 +400,12 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb)
inst->alg.encrypt = encrypt; inst->alg.encrypt = encrypt;
inst->alg.decrypt = decrypt; inst->alg.decrypt = decrypt;
inst->free = free; inst->free = crypto_lrw_free;
err = skcipher_register_instance(tmpl, inst); err = skcipher_register_instance(tmpl, inst);
if (err) { if (err) {
err_free_inst: err_free_inst:
free(inst); crypto_lrw_free(inst);
} }
return err; return err;
} }

6
crypto/xts.c
View File

@ -322,7 +322,7 @@ static void exit_tfm(struct crypto_skcipher *tfm)
crypto_free_cipher(ctx->tweak); crypto_free_cipher(ctx->tweak);
} }
static void free(struct skcipher_instance *inst) static void crypto_xts_free(struct skcipher_instance *inst)
{ {
crypto_drop_skcipher(skcipher_instance_ctx(inst)); crypto_drop_skcipher(skcipher_instance_ctx(inst));
kfree(inst); kfree(inst);
@ -434,12 +434,12 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb)
inst->alg.encrypt = encrypt; inst->alg.encrypt = encrypt;
inst->alg.decrypt = decrypt; inst->alg.decrypt = decrypt;
inst->free = free; inst->free = crypto_xts_free;
err = skcipher_register_instance(tmpl, inst); err = skcipher_register_instance(tmpl, inst);
if (err) { if (err) {
err_free_inst: err_free_inst:
free(inst); crypto_xts_free(inst);
} }
return err; return err;
} }