From: John Johansen <john.johansen@canonical.com>
Date: Thu, 29 Aug 2019 18:35:50 +0000 (-0700)
Subject: apparmor: remove duplicate check of xattrs on profile attachment.
X-Git-Tag: v6.1-rc5~2655^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01df52d726b5d55d2970f5c957f1961930acd5d6;p=platform%2Fkernel%2Flinux-starfive.git

apparmor: remove duplicate check of xattrs on profile attachment.

The second check to ensure the xattrs are present and checked is
unneeded as this is already done in the profile attachment xmatch.

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

diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index 0a91d5f..0926553 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -625,8 +625,6 @@ static struct aa_label *profile_transition(struct aa_profile *profile,
 					   bool *secure_exec)
 {
 	struct aa_label *new = NULL;
-	struct aa_profile *component;
-	struct label_it i;
 	const char *info = NULL, *name = NULL, *target = NULL;
 	unsigned int state = profile->file.start;
 	struct aa_perms perms = {};
@@ -675,21 +673,6 @@ static struct aa_label *profile_transition(struct aa_profile *profile,
 			info = "profile transition not found";
 			/* remove MAY_EXEC to audit as failure */
 			perms.allow &= ~MAY_EXEC;
-		} else {
-			/* verify that each component's xattr requirements are
-			 * met, and fail execution otherwise
-			 */
-			label_for_each(i, new, component) {
-				if (aa_xattrs_match(bprm, component, state) <
-				    0) {
-					error = -EACCES;
-					info = "required xattrs not present";
-					perms.allow &= ~MAY_EXEC;
-					aa_put_label(new);
-					new = NULL;
-					goto audit;
-				}
-			}
 		}
 	} else if (COMPLAIN_MODE(profile)) {
 		/* no exec permission - learning mode */