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

Commit 7d9e13d9 authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Greg Kroah-Hartman
Browse files

f2fs crypto: add missing locking for keyring_key access 



commit 745e8490b1e960ad79859dd8ba6a0b5a8d3d994e upstream.

This patch adopts:
	ext4 crypto: add missing locking for keyring_key access

Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4db9f111

fs/f2fs/crypto_key.c

+4 −0
Original line number Diff line number Diff line
@@ -193,9 +193,11 @@ int f2fs_get_encryption_info(struct inode *inode) 
		res = -ENOKEY;

		goto out;

	}

	down_read(&keyring_key->sem);

	ukp = user_key_payload(keyring_key);

	if (ukp->datalen != sizeof(struct f2fs_encryption_key)) {

		res = -EINVAL;

		up_read(&keyring_key->sem);

		goto out;

	}

	master_key = (struct f2fs_encryption_key *)ukp->data;
@@ -206,10 +208,12 @@ int f2fs_get_encryption_info(struct inode *inode) 
				"f2fs: key size incorrect: %d\n",

				master_key->size);

		res = -ENOKEY;

		up_read(&keyring_key->sem);

		goto out;

	}

	res = f2fs_derive_key_aes(ctx.nonce, master_key->raw,

				  raw_key);

	up_read(&keyring_key->sem);

	if (res)

		goto out;