Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11dd7602 authored Dec 09, 2019 by Eric Biggers Committed by Jaegeuk Kim Feb 12, 2020

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: Eric Biggers <ebiggers@google.com>

parent bfc935af

fs/ext4/dir.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,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
		@@ -1001,7 +1001,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
		@@ -524,7 +524,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);