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.
[v2]: [email protected], switch to strreplace() Signed-off-by: Prarit Bhargava <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Yang Shi <[email protected]> Cc: Prarit Bhargava <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Rasmus Villemoes <[email protected]> Cc: Kees Cook <[email protected]> Cc: Yaowei Bai <[email protected]> Cc: Andrey Ryabinin <[email protected]> --- init/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/init/main.c b/init/main.c index 4c17fda5c2ff..e8fb1b537d08 100644 --- a/init/main.c +++ b/init/main.c @@ -713,6 +713,11 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn) 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)) { -- 1.7.9.3
