From: John Johansen <john.johansen@canonical.com>
Date: Sun, 29 Jan 2023 09:55:03 +0000 (-0800)
Subject: apparmor: remove redundant unconfined check.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46b9b994dd554099b3ca74a20a0d1fb392c83a87;p=thirdparty%2Fkernel%2Fstable.git

apparmor: remove redundant unconfined check.

profile_af_perm and profile_af_sk_perm are only ever called after
checking that the profile is not unconfined. So we can drop these
redundant checks.

Signed-off-by: John Johansen <john.johansen@canonical.com>
---

diff --git a/security/apparmor/net.c b/security/apparmor/net.c
index 77413a519117..8b7a63c08ba1 100644
--- a/security/apparmor/net.c
+++ b/security/apparmor/net.c
@@ -118,9 +118,8 @@ int aa_profile_af_perm(struct aa_profile *profile,
 
 	AA_BUG(family >= AF_MAX);
 	AA_BUG(type < 0 || type >= SOCK_MAX);
+	AA_BUG(profile_unconfined(profile));
 
-	if (profile_unconfined(profile))
-		return 0;
 	state = RULE_MEDIATES(rules, AA_CLASS_NET);
 	if (!state)
 		return 0;