Commit 841c06d7 authored Aug 02, 2016 by Prarit Bhargava Committed by Linus Torvalds Aug 02, 2016

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@redhat.com


Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yang Shi <yang.shi@linaro.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Kees Cook <keescook@chromium.org>
Cc: Yaowei Bai <baiyaowei@cmss.chinamobile.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ecfaf0c4

init/main.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -716,6 +716,12 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
		addr = (unsigned long) dereference_function_descriptor(fn);
		sprint_symbol_no_offset(fn_name, addr);

		/*
		* 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)) {
		pr_debug("initcall %s blacklisted\n", fn_name);

Admin message