Skip to contentSkip to conversation

module: fix signature check failures when using in-kernel decompression

PATCH Applied Dmitry Torokhov 3 participants 3 messages Jan 14, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 module: fix signature check failures when using in-kernel decompression

The new flag MODULE_INIT_COMPRESSED_FILE unintentionally trips check in module_sig_check(). The check was supposed to catch case when version info or magic was removed from a signed module, making signature invalid, but it was coded too broadly and was catching this new flag as well.

Change the check to only test the 2 particular flags affecting signature validity.

Fixes b1ae6dc41eaa ("module: add in-kernel support for decompressing")
---
 kernel/module.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
kernel/module.c +5 -4
index 201398d58079..24dab046e16c 100644
@@ -2883,12 +2883,13 @@ static int module_sig_check(struct load_info *info, int flags)
 	const unsigned long markerlen = sizeof(MODULE_SIG_STRING) - 1;
 	const char *reason;
 	const void *mod = info->hdr;
-
+	bool mangled_module = flags & (MODULE_INIT_IGNORE_MODVERSIONS |
+				       MODULE_INIT_IGNORE_VERMAGIC);
 	/*
-	 * Require flags == 0, as a module with version information
-	 * removed is no longer the module that was signed
+	 * Do not allow mangled modules as a module with version information
+	 * removed is no longer the module that was signed.
 	 */
-	if (flags == 0 &&
+	if (!mangled_module &&
 	    info->len > markerlen &&
 	    memcmp(mod + info->len - markerlen, MODULE_SIG_STRING, markerlen) == 0) {
 		/* We truncate the module to discard the signature */
Signature · 5 lines
2.34.1.703.g22d0c6ccf7-goog


-- 
Dmitry
Reviewed-by on v1 1/1
#1 lore raw

Hi,

Quoted 25 lines · Dmitry Torokhov

The new flag MODULE_INIT_COMPRESSED_FILE unintentionally trips check in module_sig_check(). The check was supposed to catch case when version info or magic was removed from a signed module, making signature invalid, but it was coded too broadly and was catching this new flag as well.

Change the check to only test the 2 particular flags affecting signature validity.

Fixes b1ae6dc41eaa ("module: add in-kernel support for decompressing")
---
 kernel/module.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
kernel/module.c +0 -1
index 201398d58079..24dab046e16c 100644
@@ -2883,12 +2883,13 @@ static int module_sig_check(struct load_info *info, int flags)
        const unsigned long markerlen = sizeof(MODULE_SIG_STRING) - 1;
        const char *reason;
        const void *mod = info->hdr;
-

kernel/module.c static int module_sig_check(struct load_info *info, int flags) · line 2892

Quoted 10 lines
kernel/module.c +5 -3
+       bool mangled_module = flags & (MODULE_INIT_IGNORE_MODVERSIONS |
+                                      MODULE_INIT_IGNORE_VERMAGIC);
        /*
-        * Require flags == 0, as a module with version information
-        * removed is no longer the module that was signed
+        * Do not allow mangled modules as a module with version information
+        * removed is no longer the module that was signed.
         */
-       if (flags == 0 &&
+       if (!mangled_module &&

Seems reasonable to me. I guess the only question in my mind is whether this is the best way to handle "unknown" new flags. If someone introduces a new flag to "uapi/linux/module.h" should we consider it as "mangled" or not? Given that I can't predict the future and the comments seem to indicate that we're only trying to detect version-related issues, your choice seems OK to me.

#2 lore raw
In reply to Dmitry Torokhov
Quoted 11 lines · Dmitry Torokhov

The new flag MODULE_INIT_COMPRESSED_FILE unintentionally trips check in module_sig_check(). The check was supposed to catch case when version info or magic was removed from a signed module, making signature invalid, but it was coded too broadly and was catching this new flag as well.

Change the check to only test the 2 particular flags affecting signature validity.

Fixes b1ae6dc41eaa ("module: add in-kernel support for decompressing")

Queued on to modules-next.

Luis