linux-kernel - [PATCH -v2 6/7] module: Account for the build time module name mangling

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20241202150810.606849101@infradead.org>
Date: Mon, 02 Dec 2024 15:59:52 +0100
From: Peter Zijlstra <peterz@...radead.org>
To: mcgrof@...nel.org
Cc: x86@...nel.org,
 hpa@...or.com,
 petr.pavlu@...e.com,
 samitolvanen@...gle.com,
 da.gomez@...sung.com,
 masahiroy@...nel.org,
 nathan@...nel.org,
 nicolas@...sle.eu,
 linux-kernel@...r.kernel.org,
 linux-modules@...r.kernel.org,
 linux-kbuild@...r.kernel.org,
 hch@...radead.org,
 gregkh@...uxfoundation.org,
 Sean Christopherson <seanjc@...gle.com>,
 "Peter Zijlstra (Intel)" <peterz@...radead.org>
Subject: [PATCH -v2 6/7] module: Account for the build time module name mangling

Sean noted that scripts/Makefile.lib:name-fix-token rule will mangle
the module name with s/-/_/g.

Since this happens late in the build, only the kernel needs to bother
with this, the modpost tool still sees the original name.

Reported-by: Sean Christopherson <seanjc@...gle.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
---
 kernel/module/main.c |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -1062,6 +1062,30 @@ static char *get_modinfo(const struct lo
 }
 
 /*
+ * Like strncmp(), except s/-/_/g as per scripts/Makefile.lib:name-fix-token rule.
+ */
+static int mod_strncmp(const char *str_a, const char *str_b, size_t n)
+{
+	for (int i = 0; i < n; i++) {
+		char a = str_a[i];
+		char b = str_b[i];
+		int d;
+
+		if (a == '-') a = '_';
+		if (b == '-') b = '_';
+
+		d = a - b;
+		if (d)
+			return d;
+
+		if (!a)
+			break;
+	}
+
+	return 0;
+}
+
+/*
  * @namespace ~= "MODULE_foo-*,bar", match @modname to 'foo-*' or 'bar'
  */
 static bool verify_module_namespace(const char *namespace, const char *modname)
@@ -1086,7 +1110,7 @@ static bool verify_module_namespace(cons
 		if (*sep)
 			sep++;
 
-		if (strncmp(namespace, modname, len) == 0 && (glob || len == modlen))
+		if (mod_strncmp(namespace, modname, len) == 0 && (glob || len == modlen))
 			return true;
 	}