iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apparmor: update ctime whenever the mtime changes on an inode

Browse Source 
In general, when updating the mtime on an inode, one must also update
the ctime. Add the missing ctime updates.

Acked-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Message-Id: <20230705190309.579783-5-jlayton@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Jeff Layton 2023-07-05 15:00:32 -04:00 committed by Christian Brauner
parent fb91816e40
commit 46fc6b35a6
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/apparmor/apparmorfs.c
View File

@ -1554,8 +1554,11 @@ void __aafs_profile_migrate_dents(struct aa_profile *old,
for (i = 0; i < AAFS_PROF_SIZEOF; i++) { for (i = 0; i < AAFS_PROF_SIZEOF; i++) {
new->dents[i] = old->dents[i]; new->dents[i] = old->dents[i];
if (new->dents[i]) if (new->dents[i]) {
new->dents[i]->d_inode->i_mtime = current_time(new->dents[i]->d_inode); struct inode *inode = d_inode(new->dents[i]);
inode->i_mtime = inode->i_ctime = current_time(inode);
}
old->dents[i] = NULL; old->dents[i] = NULL;
} }
} }

11
security/apparmor/policy_unpack.c
View File

@ -86,10 +86,13 @@ void __aa_loaddata_update(struct aa_loaddata *data, long revision)
data->revision = revision; data->revision = revision;
if ((data->dents[AAFS_LOADDATA_REVISION])) { if ((data->dents[AAFS_LOADDATA_REVISION])) {
d_inode(data->dents[AAFS_LOADDATA_DIR])->i_mtime = struct inode *inode;
current_time(d_inode(data->dents[AAFS_LOADDATA_DIR]));
d_inode(data->dents[AAFS_LOADDATA_REVISION])->i_mtime = inode = d_inode(data->dents[AAFS_LOADDATA_DIR]);
current_time(d_inode(data->dents[AAFS_LOADDATA_REVISION])); inode->i_mtime = inode->i_ctime = current_time(inode);
inode = d_inode(data->dents[AAFS_LOADDATA_REVISION]);
inode->i_mtime = inode->i_ctime = current_time(inode);
} }
} }