diff mbox series

[v19,70/70] ceph: switch ceph_open_atomic() to use the new fscrypt helper

Message ID 20230417032654.32352-71-xiubli@redhat.com
State Superseded
Headers show
Series ceph+fscrypt: full support | expand

Commit Message

Xiubo Li April 17, 2023, 3:26 a.m. UTC 
From: Luís Henriques <lhenriques@suse.de>

Switch ceph_atomic_open() to use new fscrypt helper function
fscrypt_prepare_lookup_partial().  This fixes a bug in the atomic open
operation where a dentry is incorrectly set with DCACHE_NOKEY_NAME when
'dir' has been evicted but the key is still available (for example, where
there's a drop_caches).

Tested-by: Luís Henriques <lhenriques@suse.de>
Tested-by: Venky Shankar <vshankar@redhat.com>
Signed-off-by: Luís Henriques <lhenriques@suse.de>
Signed-off-by: Xiubo Li <xiubli@redhat.com>
---
 fs/ceph/file.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Milind Changire June 6, 2023, 6:18 a.m. UTC | #1 
Looks good to me.

Reviewed-by: Milind Changire <mchangir@redhat.com>

On Mon, Apr 17, 2023 at 9:03 AM <xiubli@redhat.com> wrote:
>
> From: Luís Henriques <lhenriques@suse.de>
>
> Switch ceph_atomic_open() to use new fscrypt helper function
> fscrypt_prepare_lookup_partial().  This fixes a bug in the atomic open
> operation where a dentry is incorrectly set with DCACHE_NOKEY_NAME when
> 'dir' has been evicted but the key is still available (for example, where
> there's a drop_caches).
>
> Tested-by: Luís Henriques <lhenriques@suse.de>
> Tested-by: Venky Shankar <vshankar@redhat.com>
> Signed-off-by: Luís Henriques <lhenriques@suse.de>
> Signed-off-by: Xiubo Li <xiubli@redhat.com>
> ---
>  fs/ceph/file.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> index 317087ea017e..9e74ed673f93 100644
> --- a/fs/ceph/file.c
> +++ b/fs/ceph/file.c
> @@ -791,11 +791,9 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
>         ihold(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);
> -               }
> +               err = fscrypt_prepare_lookup_partial(dir, dentry);
> +               if (err < 0)
> +                       goto out_req;
>         }
>
>         if (flags & O_CREAT) {
> --
> 2.39.1
>
diff mbox series

Patch

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 317087ea017e..9e74ed673f93 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -791,11 +791,9 @@  int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
 	ihold(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);
-		}
+		err = fscrypt_prepare_lookup_partial(dir, dentry);
+		if (err < 0)
+			goto out_req;
 	}
 
 	if (flags & O_CREAT) {