summaryrefslogtreecommitdiffstats
path: root/kernel/module.c
diff options
context:
space:
mode:
authorSergey Shtylyov <s.shtylyov@omprussia.ru>2020-10-31 23:06:45 +0300
committerJessica Yu <jeyu@kernel.org>2020-11-04 15:31:19 +0100
commit705e9195187d85249fbb0eaa844b1604a98fbc9a (patch)
tree3d4187ddc116e0ee8f90e5236680ccccefbcf9e5 /kernel/module.c
parent5e8ed280dab9eeabc1ba0b2db5dbe9fe6debb6b5 (diff)
downloadlinux-stable-705e9195187d85249fbb0eaa844b1604a98fbc9a.tar.gz
linux-stable-705e9195187d85249fbb0eaa844b1604a98fbc9a.tar.bz2
linux-stable-705e9195187d85249fbb0eaa844b1604a98fbc9a.zip
module: merge repetitive strings in module_sig_check()
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>
Diffstat (limited to 'kernel/module.c')
-rw-r--r--kernel/module.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/module.c b/kernel/module.c
index b34235082394..0e54d58babac 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2907,16 +2907,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;
}