From: Jeff Layton <jlayton@kernel.org>
To: ceph-devel@vger.kernel.org
Cc: idryomov@gmail.com, xiubli@redhat.com, lhenriques@suse.de
Subject: [PATCH] ceph: set DCACHE_NOKEY_NAME in atomic open
Date: Mon, 28 Mar 2022 16:33:51 -0400 [thread overview]
Message-ID: <20220328203351.79603-1-jlayton@kernel.org> (raw)
Atomic open can act as a lookup if handed a dentry that is negative on
the MDS. Ensure that we set DCACHE_NOKEY_NAME on the dentry in
atomic_open, if we don't have the key for the parent. Otherwise, we can
end up validating the dentry inappropriately if someone later adds a
key.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/ceph/file.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
Another patch for the fscrypt series.
A much less heavy-handed fix for generic/580 and generic/593. I'll
probably fold this into an earlier patch in the series since it appears
to be a straightforward bug.
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index eb04dc8f1f93..5072570c2203 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -765,8 +765,14 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
req->r_args.open.mask = cpu_to_le32(mask);
req->r_parent = dir;
ihold(dir);
- if (IS_ENCRYPTED(dir))
+ if (IS_ENCRYPTED(dir)) {
set_bit(CEPH_MDS_R_FSCRYPT_FILE, &req->r_req_flags);
+ if (!fscrypt_has_encryption_key(dir)) {
+ spin_lock(&dentry->d_lock);
+ dentry->d_flags |= DCACHE_NOKEY_NAME;
+ spin_unlock(&dentry->d_lock);
+ }
+ }
if (flags & O_CREAT) {
struct ceph_file_layout lo;
--
2.35.1
next reply other threads:[~2022-03-28 20:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-28 20:33 Jeff Layton [this message]
2022-03-29 0:57 ` [PATCH] ceph: set DCACHE_NOKEY_NAME in atomic open Xiubo Li
2022-03-29 9:19 ` Luís Henriques
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=20220328203351.79603-1-jlayton@kernel.org \
--to=jlayton@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=lhenriques@suse.de \
--cc=xiubli@redhat.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