module: merge repetitive strings in module_sig_check()
authorSergey Shtylyov <s.shtylyov@omprussia.ru>
Sat, 31 Oct 2020 20:06:45 +0000 (23:06 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Mar 2021 08:04:11 +0000 (09:04 +0100)
[ Upstream commit 705e9195187d85249fbb0eaa844b1604a98fbc9a ]

The 'reason' variable in module_sig_check() points to 3 strings across
the *switch* statement, all needlessly starting with the same text.
Let's put the starting text into the pr_notice() call -- it saves 21
bytes of the object code (x86 gcc 10.2.1).

Suggested-by: Joe Perches <joe@perches.com>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru>
Signed-off-by: Jessica Yu <jeyu@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/module.c

index 94f9264..3b6dd82 100644 (file)
@@ -2922,16 +2922,17 @@ static int module_sig_check(struct load_info *info, int flags)
                 * enforcing, certain errors are non-fatal.
                 */
        case -ENODATA:
-               reason = "Loading of unsigned module";
+               reason = "unsigned module";
                goto decide;
        case -ENOPKG:
-               reason = "Loading of module with unsupported crypto";
+               reason = "module with unsupported crypto";
                goto decide;
        case -ENOKEY:
-               reason = "Loading of module with unavailable key";
+               reason = "module with unavailable key";
        decide:
                if (is_module_sig_enforced()) {
-                       pr_notice("%s: %s is rejected\n", info->name, reason);
+                       pr_notice("%s: loading of %s is rejected\n",
+                                 info->name, reason);
                        return -EKEYREJECTED;
                }