Skip to content

Commit 7d9e13d

Browse files
Jaegeuk Kimgregkh
authored andcommitted
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: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4db9f11 commit 7d9e13d

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

fs/f2fs/crypto_key.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,11 @@ int f2fs_get_encryption_info(struct inode *inode)
193193
res = -ENOKEY;
194194
goto out;
195195
}
196+
down_read(&keyring_key->sem);
196197
ukp = user_key_payload(keyring_key);
197198
if (ukp->datalen != sizeof(struct f2fs_encryption_key)) {
198199
res = -EINVAL;
200+
up_read(&keyring_key->sem);
199201
goto out;
200202
}
201203
master_key = (struct f2fs_encryption_key *)ukp->data;
@@ -206,10 +208,12 @@ int f2fs_get_encryption_info(struct inode *inode)
206208
"f2fs: key size incorrect: %d\n",
207209
master_key->size);
208210
res = -ENOKEY;
211+
up_read(&keyring_key->sem);
209212
goto out;
210213
}
211214
res = f2fs_derive_key_aes(ctx.nonce, master_key->raw,
212215
raw_key);
216+
up_read(&keyring_key->sem);
213217
if (res)
214218
goto out;
215219

0 commit comments

Comments
 (0)