| Message ID | 20191209212348.243331-1-ebiggers@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | fscrypt: don't check for ENOKEY from fscrypt_get_encryption_info() | expand |
On Mon, Dec 09, 2019 at 01:23:48PM -0800, Eric Biggers wrote: > From: Eric Biggers <ebiggers@google.com> > > 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 <ebiggers@google.com> > --- > fs/ext4/dir.c | 2 +- > fs/f2fs/dir.c | 2 +- > fs/ubifs/dir.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c > index 9fdd2b269d617..4c9d3ff394a5d 100644 > --- a/fs/ext4/dir.c > +++ b/fs/ext4/dir.c > @@ -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; > } > > diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c > index c967cacf979ef..d9ad842945df5 100644 > --- a/fs/f2fs/dir.c > +++ b/fs/f2fs/dir.c > @@ -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); > diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c > index 0b98e3c8b461d..acc4f942d25b6 100644 > --- a/fs/ubifs/dir.c > +++ b/fs/ubifs/dir.c > @@ -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); > -- > 2.24.0.393.g34dc348eaf-goog > Applied to fscrypt.git#master for 5.6. - Eric
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index 9fdd2b269d617..4c9d3ff394a5d 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c @@ -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; } diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index c967cacf979ef..d9ad842945df5 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -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); diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 0b98e3c8b461d..acc4f942d25b6 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -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);