summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2014-07-25 15:01:56 +0400
committerJiri Slaby <jslaby@suse.cz>2017-01-27 13:16:07 +0300
commit40c541cf20d052b3dff9f68687f68ffa5ca9fdeb (patch)
treea98dbfb4512fd00e20d7eded0f01edd00604e53d /security
parent2ee5e7afe18baa68bc8042f2ec84265d54ecbdbb (diff)
downloadlinux-40c541cf20d052b3dff9f68687f68ffa5ca9fdeb.tar.xz
apparmor: fix update the mtime of the profile file on replacement
commit d671e890205a663429da74e1972e652bea4d73ab upstream. Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-by: Seth Arnold <seth.arnold@canonical.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'security')
-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 b30489856741..a798c75c7726 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -380,6 +380,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;
}
}