Commit 3b1ada55 authored by Eric Biggers's avatar Eric Biggers
Browse files

fscrypt: don't check for ENOKEY from fscrypt_get_encryption_info() 

fscrypt_get_encryption_info() returns 0 if the encryption key is
unavailable; it never returns ENOKEY.  So remove checks for ENOKEY.

Link: https://lore.kernel.org/r/20191209212348.243331-1-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent b7e8d3d2

fs/ext4/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE