From: Sergey Shtylyov <s.shtylyov@omprussia.ru>
Date: Sat, 31 Oct 2020 20:09:31 +0000 (+0300)
Subject: module: avoid *goto*s in module_sig_check()
X-Git-Tag: accepted/tizen/unified/20230118.172025~8230^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10ccd1abb808599a6dc7c9389560016ea3568085;p=platform%2Fkernel%2Flinux-rpi.git

module: avoid *goto*s in module_sig_check()

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>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru>
Signed-off-by: Jessica Yu <jeyu@kernel.org>
---

diff --git a/kernel/module.c b/kernel/module.c
index 0e54d58..02b87bc 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2908,20 +2908,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
@@ -2930,6 +2923,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)