Commit d099ea6e authored Apr 30, 2020 by Arnd Bergmann Committed by Herbert Xu May 08, 2020

crypto - Avoid free() namespace collision



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: f1c131b4 ("crypto: xts - Convert to skcipher")
Fixes: 700cb3f5 ("crypto: lrw - Convert to skcipher")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent e0664ebc

crypto/lrw.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -287,7 +287,7 @@ static void exit_tfm(struct crypto_skcipher *tfm)
		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));
		kfree(inst);
		@@ -400,12 +400,12 @@ static int create(struct crypto_template tmpl, struct rtattr *tb)
		inst->alg.encrypt = encrypt;
		inst->alg.decrypt = decrypt;

		inst->free = free;
		inst->free = crypto_lrw_free;

		err = skcipher_register_instance(tmpl, inst);
		if (err) {
		err_free_inst:
		free(inst);
		crypto_lrw_free(inst);
		}
		return err;
		}

crypto/xts.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -322,7 +322,7 @@ static void exit_tfm(struct crypto_skcipher *tfm)
		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));
		kfree(inst);
		@@ -434,12 +434,12 @@ static int create(struct crypto_template tmpl, struct rtattr *tb)
		inst->alg.encrypt = encrypt;
		inst->alg.decrypt = decrypt;

		inst->free = free;
		inst->free = crypto_xts_free;

		err = skcipher_register_instance(tmpl, inst);
		if (err) {
		err_free_inst:
		free(inst);
		crypto_xts_free(inst);
		}
		return err;
		}

Admin message