Skip to content

Commit 91bd72d

Browse files
ebiggersgregkh
authored andcommitted
fscrypt: lock mutex before checking for bounce page pool
commit a0b3bc855374c50b5ea85273553485af48caf2f7 upstream. fscrypt_initialize(), which allocates the global bounce page pool when an encrypted file is first accessed, uses "double-checked locking" to try to avoid locking fscrypt_init_mutex. However, it doesn't use any memory barriers, so it's theoretically possible for a thread to observe a bounce page pool which has not been fully initialized. This is a classic bug with "double-checked locking". While "only a theoretical issue" in the latest kernel, in pre-4.8 kernels the pointer that was checked was not even the last to be initialized, so it was easily possible for a crash (NULL pointer dereference) to happen. This was changed only incidentally by the large refactor to use fs/crypto/. Solve both problems in a trivial way that can easily be backported: just always take the mutex. It's theoretically less efficient, but it shouldn't be noticeable in practice as the mutex is only acquired very briefly once per encrypted file. Later I'd like to make this use a helper macro like DO_ONCE(). However, DO_ONCE() runs in atomic context, so we'd need to add a new macro that allows blocking. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent cb1831a commit 91bd72d

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

fs/ext4/crypto_key.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,9 @@ int ext4_get_encryption_info(struct inode *inode)
129129
if (ei->i_crypt_info)
130130
return 0;
131131

132-
if (!ext4_read_workqueue) {
133-
res = ext4_init_crypto();
134-
if (res)
135-
return res;
136-
}
132+
res = ext4_init_crypto();
133+
if (res)
134+
return res;
137135

138136
res = ext4_xattr_get(inode, EXT4_XATTR_INDEX_ENCRYPTION,
139137
EXT4_XATTR_NAME_ENCRYPTION_CONTEXT,

0 commit comments

Comments
 (0)