summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2014-07-25 13:01:56 +0200
committerJohn Johansen <john.johansen@canonical.com>2016-07-12 17:43:10 +0200
commitd671e890205a663429da74e1972e652bea4d73ab (patch)
tree93980b7ce034ff8a7f692aabdc044497b5e27f47 /security/apparmor
parentapparmor: exec should not be returning ENOENT when it denies (diff)
downloadlinux-d671e890205a663429da74e1972e652bea4d73ab.tar.xz
linux-d671e890205a663429da74e1972e652bea4d73ab.zip
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>
Diffstat (limited to 'security/apparmor')
-rw-r--r--security/apparmor/apparmorfs.c2
1 files changed, 2 insertions, 0 deletions
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;
}
}