Commit cb3524a8 authored Jan 26, 2021 by Jeff Layton Committed by Ilya Dryomov Aug 24, 2023

ceph: set DCACHE_NOKEY_NAME flag in ceph_lookup/atomic_open()



This is required so that we know to invalidate these dentries when the
directory is unlocked.

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>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

parent 4ac4c23e

fs/ceph/dir.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -760,6 +760,17 @@ static struct dentry ceph_lookup(struct inode dir, struct dentry *dentry,
		if (dentry->d_name.len > NAME_MAX)
		return ERR_PTR(-ENAMETOOLONG);

		if (IS_ENCRYPTED(dir)) {
		err = __fscrypt_prepare_readdir(dir);
		if (err)
		return ERR_PTR(err);
		if (!fscrypt_has_encryption_key(dir)) {
		spin_lock(&dentry->d_lock);
		dentry->d_flags \|= DCACHE_NOKEY_NAME;
		spin_unlock(&dentry->d_lock);
		}
		}

		/* can we conclude ENOENT locally? */
		if (d_really_is_negative(dentry)) {
		struct ceph_inode_info *ci = ceph_inode(dir);

fs/ceph/file.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -784,6 +784,13 @@ 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 (!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;