From: Stefan Berger <stefanb@linux.ibm.com>
To: linux-integrity@vger.kernel.org,
linux-security-module@vger.kernel.org,
linux-unionfs@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, paul@paul-moore.com,
jmorris@namei.org, serge@hallyn.com, zohar@linux.ibm.com,
roberto.sassu@huawei.com, amir73il@gmail.com, brauner@kernel.org,
miklos@szeredi.hu, Stefan Berger <stefanb@linux.ibm.com>
Subject: [PATCH v2 5/9] evm: Use the inode holding the metadata to calculate metadata hash
Date: Mon, 5 Feb 2024 13:25:02 -0500 [thread overview]
Message-ID: <20240205182506.3569743-6-stefanb@linux.ibm.com> (raw)
In-Reply-To: <20240205182506.3569743-1-stefanb@linux.ibm.com>
Changes to file attributes (mode bits, uid, gid) on the lower layer are
not taken into account when d_backing_inode() is used when a file is
accessed on the overlay layer and this file has not yet been copied up.
This is because d_backing_inode() does not return the real inode of the
lower layer but instead returns the backing inode which in this case
holds wrong file attributes. Further, when CONFIG_OVERLAY_FS_METACOPY is
enabled and a copy-up is triggered due to file metadata changes, then
the metadata are held by the backing inode while the data are still held
by the real inode. Therefore, use d_inode(d_real(dentry, D_REAL_METADATA))
to get to the inode holding the file's metadata and use it to calculate
the metadata hash with.
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
security/integrity/evm/evm_crypto.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
index b1ffd4cc0b44..51e24a75742c 100644
--- a/security/integrity/evm/evm_crypto.c
+++ b/security/integrity/evm/evm_crypto.c
@@ -223,7 +223,7 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry,
size_t req_xattr_value_len,
uint8_t type, struct evm_digest *data)
{
- struct inode *inode = d_backing_inode(dentry);
+ struct inode *inode = d_inode(d_real(dentry, D_REAL_METADATA));
struct xattr_list *xattr;
struct shash_desc *desc;
size_t xattr_size = 0;
--
2.43.0
next prev parent reply other threads:[~2024-02-05 18:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-05 18:24 [PATCH v2 0/9] evm: Support signatures on stacked filesystem Stefan Berger
2024-02-05 18:24 ` [PATCH v2 1/9] ima: Rename backing_inode to real_inode Stefan Berger
2024-02-06 15:23 ` Amir Goldstein
2024-02-05 18:24 ` [PATCH v2 2/9] security: allow finer granularity in permitting copy-up of security xattrs Stefan Berger
2024-02-06 15:12 ` Amir Goldstein
2024-02-20 22:57 ` Paul Moore
2024-02-05 18:25 ` [PATCH v2 3/9] evm: Implement per signature type decision in security_inode_copy_up_xattr Stefan Berger
2024-02-05 18:25 ` [PATCH v2 4/9] ima: Reset EVM status upon detecting changes to the real file Stefan Berger
2024-02-06 12:38 ` kernel test robot
2024-02-06 15:44 ` Amir Goldstein
2024-02-07 5:04 ` kernel test robot
2024-02-05 18:25 ` Stefan Berger [this message]
2024-02-06 15:33 ` [PATCH v2 5/9] evm: Use the inode holding the metadata to calculate metadata hash Amir Goldstein
2024-02-06 18:22 ` kernel test robot
2024-02-05 18:25 ` [PATCH v2 6/9] evm: Enforce signatures on unsupported filesystem for EVM_INIT_X509 Stefan Berger
2024-02-05 18:25 ` [PATCH v2 7/9] fs: Rename SB_I_EVM_UNSUPPORTED to SB_I_EVM_HMAC_UNSUPPORTED Stefan Berger
2024-02-06 15:11 ` Amir Goldstein
2024-02-05 18:25 ` [PATCH v2 8/9] evm: Rename is_unsupported_fs to is_unsupported_hmac_fs Stefan Berger
2024-02-05 18:25 ` [PATCH v2 9/9] ima: Record i_version of real_inode for change detection Stefan Berger
2024-02-06 15:23 ` Amir Goldstein
2024-02-06 15:54 ` Jeff Layton
2024-02-13 23:14 ` Stefan Berger
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=20240205182506.3569743-6-stefanb@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=amir73il@gmail.com \
--cc=brauner@kernel.org \
--cc=jmorris@namei.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=paul@paul-moore.com \
--cc=roberto.sassu@huawei.com \
--cc=serge@hallyn.com \
--cc=zohar@linux.ibm.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).