]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
libkmod: do not crash on unknown signature algorithm
authorMikhail Novosyolov <m.novosyolov@rosalinux.ru>
Sun, 25 Sep 2022 14:46:08 +0000 (17:46 +0300)
committerLucas De Marchi <lucas.de.marchi@gmail.com>
Mon, 3 Oct 2022 13:59:41 +0000 (06:59 -0700)
Example kernel module:
https://file-store.rosalinux.ru/download/7281f97e0c04c0f818ad3f936706f4a407e8dc7e
(/lib/modules/5.15.67-generic-1rosa2021.1-x86_64/kernel/drivers/usb/host/xhci-pci.ko.zst)
It is signed with Streebog 512.

libkmod v30 crashed in libkmod-module.c:2413 in this code:

n = kmod_module_info_append(list,
"sig_hashalgo", strlen("sig_hashalgo"),
sig_info.hash_algo, strlen(sig_info.hash_algo));

because strlen() got null.

libkmod/libkmod-signature.c

index 4ae5af63ac22772f769508d179a78ef7fa419db8..092f3969c5f31bd02fb4d3439337692bc6961458 100644 (file)
@@ -278,6 +278,9 @@ static bool fill_pkcs7(const char *mem, off_t size,
        X509_ALGOR_get0(&o, NULL, NULL, dig_alg);
 
        sig_info->hash_algo = pkey_hash_algo[obj_to_hash_algo(o)];
+       // hash algo has not been recognized
+       if (sig_info->hash_algo == NULL)
+               goto err3;
        sig_info->id_type = pkey_id_type[modsig->id_type];
 
        pvt = malloc(sizeof(*pvt));