]> git.baikalelectronics.ru Git - kernel.git/commitdiff
module: Fix prefix for module.sig_enforce module param
authorSaravana Kannan <saravanak@google.com>
Thu, 2 Jun 2022 03:56:52 +0000 (20:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Jun 2022 19:44:33 +0000 (12:44 -0700)
Commit cfc1d277891e ("module: Move all into module/") changed the prefix
of the module param by moving/renaming files.  A later commit also moves
the module_param() into a different file, thereby changing the prefix
yet again.

This would break kernel cmdline compatibility and also userspace
compatibility at /sys/module/module/parameters/sig_enforce.

So, set the prefix back to "module.".

Fixes: cfc1d277891e ("module: Move all into module/")
Link: https://lore.kernel.org/lkml/20220602034111.4163292-1-saravanak@google.com/
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Aaron Tomlin <atomlin@redhat.com>
Acked-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Saravana Kannan <saravanak@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/module/signing.c

index 85c8999dfecf543ad9a3bc3de8282d5408146bd1..a2ff4242e623d5d4e87d2f3d139d8620fb937579 100644 (file)
@@ -16,6 +16,9 @@
 #include <uapi/linux/module.h>
 #include "internal.h"
 
+#undef MODULE_PARAM_PREFIX
+#define MODULE_PARAM_PREFIX "module."
+
 static bool sig_enforce = IS_ENABLED(CONFIG_MODULE_SIG_FORCE);
 module_param(sig_enforce, bool_enable_only, 0644);