diff options
| author | Sergey Shtylyov <s.shtylyov@omprussia.ru> | 2020-10-31 23:06:45 +0300 | 
|---|---|---|
| committer | Jessica Yu <jeyu@kernel.org> | 2020-11-04 15:31:19 +0100 | 
| commit | 705e9195187d85249fbb0eaa844b1604a98fbc9a (patch) | |
| tree | 3d4187ddc116e0ee8f90e5236680ccccefbcf9e5 | |
| parent | 5e8ed280dab9eeabc1ba0b2db5dbe9fe6debb6b5 (diff) | |
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>
| -rw-r--r-- | kernel/module.c | 9 | 
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;  		}  | 
