2023-02-22 13:48:45

by Nick Alcock

[permalink] [raw]
Subject: [PATCH 17/27] kbuild, crypto: remove MODULE_LICENSE in non-modules

Since commit 8b41fc4454e ("kbuild: create modules.builtin without
Makefile.modbuiltin or tristate.conf"), MODULE_LICENSE declarations
are used to identify modules. As a consequence, uses of the macro
in non-modules will cause modprobe to misidentify their containing
object file as a module when it is not (false positives), and modprobe
might succeed rather than failing with a suitable error message.

So remove it in the files in this commit, none of which can be built as
modules.

Signed-off-by: Nick Alcock <[email protected]>
Suggested-by: Luis Chamberlain <[email protected]>
Cc: Luis Chamberlain <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Hitomi Hasegawa <[email protected]>
Cc: Herbert Xu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
arch/x86/crypto/blake2s-glue.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/x86/crypto/blake2s-glue.c b/arch/x86/crypto/blake2s-glue.c
index aaba21230528..0df9ec15643a 100644
--- a/arch/x86/crypto/blake2s-glue.c
+++ b/arch/x86/crypto/blake2s-glue.c
@@ -74,4 +74,3 @@ static int __init blake2s_mod_init(void)

module_init(blake2s_mod_init);

-MODULE_LICENSE("GPL v2");
--
2.39.1.268.g9de2f9a303



2023-02-23 10:23:09

by Herbert Xu

[permalink] [raw]
Subject: Re: [PATCH 17/27] kbuild, crypto: remove MODULE_LICENSE in non-modules

On Wed, Feb 22, 2023 at 12:14:43PM +0000, Nick Alcock wrote:
>
> diff --git a/arch/x86/crypto/blake2s-glue.c b/arch/x86/crypto/blake2s-glue.c
> index aaba21230528..0df9ec15643a 100644
> --- a/arch/x86/crypto/blake2s-glue.c
> +++ b/arch/x86/crypto/blake2s-glue.c
> @@ -74,4 +74,3 @@ static int __init blake2s_mod_init(void)
>
> module_init(blake2s_mod_init);
>
> -MODULE_LICENSE("GPL v2");

Please change the module_init as well and remove module.h from
this file.

Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt