fscrypt: don't check for ENOKEY from fscrypt_get_encryption_info()
Subsystems (5)
Memory technology devices (MTD) ext4 file system F2FS file system UBI file system (UBIFS) +1 more subsystems
Eric Biggers
maintainerPATCH 1/1 fscrypt: don't check for ENOKEY from fscrypt_get_encryption_info()
From: Eric Biggers <[email protected]>
fscrypt_get_encryption_info() returns 0 if the encryption key is unavailable; it never returns ENOKEY. So remove checks for ENOKEY.
Signed-off-by Eric Biggers <[email protected]>
--- fs/ext4/dir.c | 2 +- fs/f2fs/dir.c | 2 +- fs/ubifs/dir.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
fs/ext4/dir.c +1 -1
@@ -116,7 +116,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)if (IS_ENCRYPTED (inode)) { err =fscrypt_get_encryption_info (inode); -if (err && err != -ENOKEY ) +if (err)return err; }
fs/f2fs/dir.c +1 -1
@@ -987,7 +987,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)if (IS_ENCRYPTED (inode)) { err =fscrypt_get_encryption_info (inode); -if (err && err != -ENOKEY ) +if (err) goto out; err =fscrypt_fname_alloc_buffer (inode,F2FS_NAME_LEN , &fstr);
fs/ubifs/dir.c +1 -1
@@ -512,7 +512,7 @@ static int ubifs_readdir(struct file *file, struct dir_context *ctx)if (encrypted) { err =fscrypt_get_encryption_info (dir); -if (err && err != -ENOKEY ) +if (err)return err; err =fscrypt_fname_alloc_buffer (dir,UBIFS_MAX_NLEN , &fstr);
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Quoted 54 lines · Eric Biggers
From: Eric Biggers <[email protected]>
fscrypt_get_encryption_info()returns 0 if the encryption key is unavailable; it never returns ENOKEY. So remove checks for ENOKEY.Signed-off-by Eric Biggers <[email protected]>--- fs/ext4/dir.c | 2 +- fs/f2fs/dir.c | 2 +- fs/ubifs/dir.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)fs/ext4/dir.c +1
-1@@ -116,7 +116,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)if (IS_ENCRYPTED (inode)) { err =fscrypt_get_encryption_info (inode); -if (err && err != -ENOKEY ) +if (err)return err; }fs/f2fs/dir.c +1
-1@@ -987,7 +987,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)if (IS_ENCRYPTED (inode)) { err =fscrypt_get_encryption_info (inode); -if (err && err != -ENOKEY ) +if (err) goto out; err =fscrypt_fname_alloc_buffer (inode,F2FS_NAME_LEN , &fstr);fs/ubifs/dir.c +1
-1@@ -512,7 +512,7 @@ static int ubifs_readdir(struct file *file, struct dir_context *ctx)if (encrypted) { err =fscrypt_get_encryption_info (dir); -if (err && err != -ENOKEY ) +if (err)return err; err =fscrypt_fname_alloc_buffer (dir,UBIFS_MAX_NLEN , &fstr);Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Applied to fscrypt.git#master for 5.6.
- Eric