linux-kernel - [PATCH] init, allow blacklisting of module

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1466004652-27206-1-git-send-email-prarit@redhat.com>
Date:	Wed, 15 Jun 2016 11:30:52 -0400
From:	Prarit Bhargava <prarit@...hat.com>
To:	linux-kernel@...r.kernel.org
Cc:	Prarit Bhargava <prarit@...hat.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Yang Shi <yang.shi@...aro.org>, Ingo Molnar <mingo@...nel.org>,
	Mel Gorman <mgorman@...e.de>,
	Rasmus Villemoes <linux@...musvillemoes.dk>,
	Kees Cook <keescook@...omium.org>,
	Yaowei Bai <baiyaowei@...s.chinamobile.com>,
	Andrey Ryabinin <aryabinin@...tuozzo.com>
Subject: [PATCH] init, allow blacklisting of module_init functions

At some point I was 100% sure this worked.  I do remember testing it against
just a loadable module and had positive testing results.  I went back to
the time that it was commited (3.15-ish) and blacklisting a module init
function didn't work there either, so something went wrong somewhere.  In
any case this is a trivial patch to add the functionality...

P.

---8<---

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.

Signed-off-by: Prarit Bhargava <prarit@...hat.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Yang Shi <yang.shi@...aro.org>
Cc: Prarit Bhargava <prarit@...hat.com>
Cc: Ingo Molnar <mingo@...nel.org>
Cc: Mel Gorman <mgorman@...e.de>
Cc: Rasmus Villemoes <linux@...musvillemoes.dk>
Cc: Kees Cook <keescook@...omium.org>
Cc: Yaowei Bai <baiyaowei@...s.chinamobile.com>
Cc: Andrey Ryabinin <aryabinin@...tuozzo.com>
---
 init/main.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/init/main.c b/init/main.c
index 4c17fda5c2ff..730d6a846216 100644
--- a/init/main.c
+++ b/init/main.c
@@ -708,14 +708,25 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
 {
 	struct blacklist_entry *entry;
 	char fn_name[KSYM_SYMBOL_LEN];
+	char *space;
+	int length;
 
 	if (list_empty(&blacklisted_initcalls))
 		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].
+	 */
+	space = strchrnul(fn_name, ' ');
+	if (!space)
+		length = strlen(fn_name);
+	else
+		length = space - fn_name;
 
 	list_for_each_entry(entry, &blacklisted_initcalls, next) {
-		if (!strcmp(fn_name, entry->buf)) {
+		if (!strncmp(fn_name, entry->buf, length)) {
 			pr_debug("initcall %s blacklisted\n", fn_name);
 			return true;
 		}
-- 
1.7.9.3