From: Sergey Shtylyov <s.shtyl...@omprussia.ru>
[ Upstream commit 10ccd1abb808599a6dc7c9389560016ea3568085 ]
Let's move the common handling of the non-fatal errors after the *switch*
statement -- this avoids *goto*s inside that *switch*...
Suggested-by: Joe Perches <j...@perches.com>
Reviewed-by: Miroslav Benes <mbe...@suse.cz>
Signed-off-by: Sergey Shtylyov <s.shtyl...@omprussia.ru>
Signed-off-by: Jessica Yu <j...@kernel.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
kernel/module.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/kernel/module.c b/kernel/module.c
index 9fe3e9b85348..8d1def62a415 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2909,20 +2909,13 @@ static int module_sig_check(struct load_info *info, int
flags)
*/
case -ENODATA:
reason = "unsigned module";
- goto decide;
+ break;
case -ENOPKG:
reason = "module with unsupported crypto";
- goto decide;
+ break;
case -ENOKEY:
reason = "module with unavailable key";
- decide:
- if (is_module_sig_enforced()) {
- pr_notice("%s: loading of %s is rejected\n",
- info->name, reason);
- return -EKEYREJECTED;
- }
-
- return security_locked_down(LOCKDOWN_MODULE_SIGNATURE);
+ break;
/* All other errors are fatal, including nomem, unparseable
* signatures and signature check failures - even if signatures
@@ -2931,6 +2924,13 @@ static int module_sig_check(struct load_info *info, int
flags)
default:
return err;
}
+
+ if (is_module_sig_enforced()) {
+ pr_notice("%s: loading of %s is rejected\n", info->name,
reason);
+ return -EKEYREJECTED;
+ }
+
+ return security_locked_down(LOCKDOWN_MODULE_SIGNATURE);
}
#else /* !CONFIG_MODULE_SIG */
static int module_sig_check(struct load_info *info, int flags)
--
2.30.1
