Messages in this thread Patch in this message | | | Subject | [PATCH v2 2/3] module: avoid *goto*s in module_sig_check() | From | Sergey Shtylyov <> | Date | Sat, 31 Oct 2020 23:09:31 +0300 |
| |
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 <joe@perches.com> Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru>
--- Changes in version 2: - new patch.
kernel/module.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
Index: linux/kernel/module.c =================================================================== --- linux.orig/kernel/module.c +++ linux/kernel/module.c @@ -2908,20 +2908,13 @@ static int module_sig_check(struct load_ */ 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 @@ -2930,6 +2923,13 @@ static int module_sig_check(struct load_ 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)
| |