The patch titled
Subject: init: allow blacklisting of module_init functions
has been added to the -mm tree. Its filename is
init-allow-blacklisting-of-module_init-functions.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/init-allow-blacklisting-of-module_init-functions.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/init-allow-blacklisting-of-module_init-functions.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Prarit Bhargava <prarit@xxxxxxxxxx>
Subject: init: allow blacklisting of module_init functions
sprint_symbol_no_offset() returns the string "function_name [module_name]"
where [module_name] is not printed for built in kernel functions. This
means that the blacklisting code will fail when comparing module function
names with the extended string. This patch adds the functionality to
block a module's module_init() function by finding the space in the string
and truncating the comparison to that length.
Link: http://lkml.kernel.org/r/1466124387-20446-1-git-send-email-prarit@xxxxxxxxxx
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Yang Shi <yang.shi@xxxxxxxxxx>
Cc: Prarit Bhargava <prarit@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxx>
Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Yaowei Bai <baiyaowei@xxxxxxxxxxxxxxxxxxxx>
Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
init/main.c | 5 +++++
1 file changed, 5 insertions(+)
diff -puN init/main.c~init-allow-blacklisting-of-module_init-functions init/main.c
--- a/init/main.c~init-allow-blacklisting-of-module_init-functions
+++ a/init/main.c
@@ -713,6 +713,11 @@ static bool __init_or_module initcall_bl
return false;
sprint_symbol_no_offset(fn_name, (unsigned long)fn);
+ /*
+ * fn will be "function_name [module_name]" where [module_name] is not
+ * displayed for built-in init functions. Strip off the [module_name].
+ */
+ strreplace(fn_name, ' ', '\0');
list_for_each_entry(entry, &blacklisted_initcalls, next) {
if (!strcmp(fn_name, entry->buf)) {
_
Patches currently in -mm which might be from prarit@xxxxxxxxxx are
lib-switch-config_printk_time-to-int.patch
printk-allow-different-timestamps-for-printktime.patch
init-allow-blacklisting-of-module_init-functions.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
