From: John Johansen <john.johansen@canonical.com>
Date: Fri, 25 Jul 2014 11:01:56 +0000 (-0700)
Subject: apparmor: fix update the mtime of the profile file on replacement
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d671e890205a663429da74e1972e652bea4d73ab;p=deliverable%2Flinux.git

apparmor: fix update the mtime of the profile file on replacement

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Seth Arnold <seth.arnold@canonical.com>
---

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index ad4fa49ad1db..45a6199ce23b 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -379,6 +379,8 @@ void __aa_fs_profile_migrate_dents(struct aa_profile *old,
 
 	for (i = 0; i < AAFS_PROF_SIZEOF; i++) {
 		new->dents[i] = old->dents[i];
+		if (new->dents[i])
+			new->dents[i]->d_inode->i_mtime = CURRENT_TIME;
 		old->dents[i] = NULL;
 	}
 }