From: Jeff Layton <jlayton@kernel.org>
To: Christian Brauner <brauner@kernel.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Brad Warrum <bwarrum@linux.ibm.com>,
Ritu Agarwal <rituagar@linux.ibm.com>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Ian Kent <raven@themaw.net>,
"Tigran A. Aivazian" <aivazian.tigran@gmail.com>,
Jeremy Kerr <jk@ozlabs.org>, Ard Biesheuvel <ardb@kernel.org>,
Namjae Jeon <linkinjeon@kernel.org>,
Sungjong Seo <sj1557.seo@samsung.com>,
Bob Peterson <rpeterso@redhat.com>,
Andreas Gruenbacher <agruenba@redhat.com>,
Steve French <sfrench@samba.org>,
Paulo Alcantara <pc@manguebit.com>,
Ronnie Sahlberg <lsahlber@redhat.com>,
Shyam Prasad N <sprasad@microsoft.com>,
Tom Talpey <tom@talpey.com>,
John Johansen <john.johansen@canonical.com>,
Paul Moore <paul@paul-moore.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
Ruihan Li <lrh2000@pku.edu.cn>,
Suren Baghdasaryan <surenb@google.com>,
Sebastian Reichel <sebastian.reichel@collabora.com>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
autofs@vger.kernel.org, linux-efi@vger.kernel.org,
linux-fsdevel@vger.kernel.org, cluster-devel@redhat.com,
linux-cifs@vger.kernel.org, samba-technical@lists.samba.org,
apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org
Subject: [PATCH 8/9] apparmor: update ctime whenever the mtime changes on an inode
Date: Fri, 9 Jun 2023 08:50:22 -0400 [thread overview]
Message-ID: <20230609125023.399942-9-jlayton@kernel.org> (raw)
In-Reply-To: <20230609125023.399942-1-jlayton@kernel.org>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
security/apparmor/apparmorfs.c | 7 +++++--
security/apparmor/policy_unpack.c | 11 +++++++----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index db7a51acf9db..c06053718836 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -1554,8 +1554,11 @@ void __aafs_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(new->dents[i]->d_inode);
+ if (new->dents[i]) {
+ struct inode *inode = d_inode(new->dents[i]);
+
+ inode->i_mtime = inode->i_ctime = current_time(inode);
+ }
old->dents[i] = NULL;
}
}
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index cf2ceec40b28..48a97c1800b9 100644
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -86,10 +86,13 @@ void __aa_loaddata_update(struct aa_loaddata *data, long revision)
data->revision = revision;
if ((data->dents[AAFS_LOADDATA_REVISION])) {
- d_inode(data->dents[AAFS_LOADDATA_DIR])->i_mtime =
- current_time(d_inode(data->dents[AAFS_LOADDATA_DIR]));
- d_inode(data->dents[AAFS_LOADDATA_REVISION])->i_mtime =
- current_time(d_inode(data->dents[AAFS_LOADDATA_REVISION]));
+ struct inode *inode;
+
+ inode = d_inode(data->dents[AAFS_LOADDATA_DIR]);
+ 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);
}
}
--
2.40.1
next prev parent reply other threads:[~2023-06-09 12:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-09 12:50 [PATCH 0/9] fs: add some missing ctime updates Jeff Layton
2023-06-09 12:50 ` [PATCH 1/9] ibmvmc: update ctime in conjunction with mtime on write Jeff Layton
2023-06-09 12:50 ` [PATCH 2/9] usb: update the ctime as well when updating mtime after an ioctl Jeff Layton
2023-06-09 13:10 ` Greg Kroah-Hartman
2023-06-09 12:50 ` [PATCH 3/9] autofs: set ctime as well when mtime changes on a dir Jeff Layton
2023-06-09 12:50 ` [PATCH 4/9] bfs: update ctime in addition to mtime when adding entries Jeff Layton
2023-06-09 12:50 ` [PATCH 5/9] efivarfs: update ctime when mtime changes on a write Jeff Layton
2023-06-09 12:50 ` [PATCH 6/9] exfat: ensure that ctime is updated whenever the mtime is Jeff Layton
2023-06-09 12:50 ` [PATCH 7/9] gfs2: update ctime when quota is updated Jeff Layton
2023-06-09 16:44 ` Andreas Gruenbacher
2023-06-12 10:36 ` Jeff Layton
2023-07-05 20:25 ` Andreas Gruenbacher
2023-07-05 21:48 ` Jeff Layton
2023-07-05 23:19 ` Andreas Grünbacher
2023-06-09 12:50 ` Jeff Layton [this message]
2023-06-09 12:50 ` [PATCH 9/9] cifs: update the ctime on a partial page write Jeff Layton
2023-06-09 13:10 ` [PATCH 0/9] fs: add some missing ctime updates Greg Kroah-Hartman
2023-06-09 13:27 ` Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230609125023.399942-9-jlayton@kernel.org \
--to=jlayton@kernel.org \
--cc=agruenba@redhat.com \
--cc=aivazian.tigran@gmail.com \
--cc=apparmor@lists.ubuntu.com \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=autofs@vger.kernel.org \
--cc=brauner@kernel.org \
--cc=bwarrum@linux.ibm.com \
--cc=cluster-devel@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=jk@ozlabs.org \
--cc=jmorris@namei.org \
--cc=john.johansen@canonical.com \
--cc=linkinjeon@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=lrh2000@pku.edu.cn \
--cc=lsahlber@redhat.com \
--cc=paul@paul-moore.com \
--cc=pc@manguebit.com \
--cc=raven@themaw.net \
--cc=rituagar@linux.ibm.com \
--cc=rpeterso@redhat.com \
--cc=samba-technical@lists.samba.org \
--cc=sebastian.reichel@collabora.com \
--cc=serge@hallyn.com \
--cc=sfrench@samba.org \
--cc=sj1557.seo@samsung.com \
--cc=sprasad@microsoft.com \
--cc=surenb@google.com \
--cc=tom@talpey.com \
--cc=viro@zeniv.linux.org.uk \
--cc=wsa+renesas@sang-engineering.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).