Skip to contentSkip to conversation

Patch "apparmor: fix change_hat not finding hat after policy replacement" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Nov 29, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

apparmor: fix change_hat not finding hat after policy replacement

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
apparmor-fix-change_hat-not-finding-hat-after-policy-replacement.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 3d40658c977769ce2138f286cf131537bf68bdfe Mon Sep 17 00:00:00 2001

From: John Johansen <[email protected]>
Date: Wed, 31 Aug 2016 21:10:06 -0700
Subject: apparmor: fix change_hat not finding hat after policy replacement

From: John Johansen <[email protected]>

commit 3d40658c977769ce2138f286cf131537bf68bdfe upstream.

After a policy replacement, the task cred may be out of date and need to be updated. However change_hat is using the stale profiles from the out of date cred resulting in either: a stale profile being applied or, incorrect failure when searching for a hat profile as it has been migrated to the new parent profile.

Fixes 01e2b670aa898a39259bc85c78e3d74820f4d3b6 (failure to find hat)
Fixes 898127c34ec03291c86f4ff3856d79e9e18952bc (stale policy being applied)

Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1000287

---
 security/apparmor/domain.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
security/apparmor/domain.c +4 -2
@@ -621,8 +621,8 @@ int aa_change_hat(const char *hats[], in
 	/* released below */
 	cred = get_current_cred();
 	cxt = cred_cxt(cred);
-	profile = aa_cred_profile(cred);
-	previous_profile = cxt->previous;
+	profile = aa_get_newest_profile(aa_cred_profile(cred));
+	previous_profile = aa_get_newest_profile(cxt->previous);
 
 	if (unconfined(profile)) {
 		info = "unconfined";
@@ -718,6 +718,8 @@ audit:
 out:
 	aa_put_profile(hat);
 	kfree(name);
+	aa_put_profile(profile);
+	aa_put_profile(previous_profile);
 	put_cred(cred);
 
 	return error;

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/apparmor-fix-change_hat-not-finding-hat-after-policy-replacement.patch