Merge tag 'iio-fixes-4.19a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[linux.git] / kernel / module_signing.c

diff --git a/kernel/module_signing.c b/kernel/module_signing.c
index 937c844bee4af8b17d2780bf69203ce381a434cd..f2075ce8e4b369c8e056a81ab18ccab271bbe192 100644 (file)
--- a/kernel/module_signing.c
+++ b/kernel/module_signing.c
@@ -45,10 +45,10 @@ struct module_signature {
 /*
  * Verify the signature on a module.
  */
-int mod_verify_sig(const void *mod, unsigned long *_modlen)
+int mod_verify_sig(const void *mod, struct load_info *info)
 {
        struct module_signature ms;
-       size_t modlen = *_modlen, sig_len;
+       size_t sig_len, modlen = info->len;
 
        pr_devel("==>%s(,%zu)\n", __func__, modlen);
 
@@ -62,10 +62,11 @@ int mod_verify_sig(const void *mod, unsigned long *_modlen)
        if (sig_len >= modlen)
                return -EBADMSG;
        modlen -= sig_len;
-       *_modlen = modlen;
+       info->len = modlen;
 
        if (ms.id_type != PKEY_ID_PKCS7) {
-               pr_err("Module is not signed with expected PKCS#7 message\n");
+               pr_err("%s: Module is not signed with expected PKCS#7 message\n",
+                      info->name);
                return -ENOPKG;
        }
 
@@ -76,7 +77,8 @@ int mod_verify_sig(const void *mod, unsigned long *_modlen)
            ms.__pad[0] != 0 ||
            ms.__pad[1] != 0 ||
            ms.__pad[2] != 0) {
-               pr_err("PKCS#7 signature info has unexpected non-zero params\n");
+               pr_err("%s: PKCS#7 signature info has unexpected non-zero params\n",
+                      info->name);
                return -EBADMSG;
        }