mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
fscrypt: Initialize ->ci_master_key before publication
fscrypt_prepare_setflags() assumes that if the key for an inode with a
v2 encryption policy has been set up, then ->ci_master_key is non-NULL.
This is a reasonable assumption, but it does not take into account the
very short gap in fscrypt_setup_encryption_info() between the inode's
fscrypt_inode_info being set and ->ci_master_key being initialized.
Thus, a NULL pointer dereference was possible.
Fix this by closing the gap: make fscrypt_setup_encryption_info()
initialize ->ci_master_key before publication. If it loses the cmpxchg
race afterwards, set it back to NULL so that put_crypt_info() continues
to have the same behavior.
Fixes: b1c0ec3599 ("fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl")
Cc: [email protected]
Reported-by: Ada Smith <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Eric Biggers <[email protected]>
This commit is contained in:
+13
-1
@@ -621,6 +621,13 @@ fscrypt_setup_encryption_info(struct inode *inode,
|
||||
if (res)
|
||||
goto out;
|
||||
|
||||
/*
|
||||
* Preemptively initialize ->ci_master_key, even though we don't know
|
||||
* whether we'll win the race below yet, because if we do win the race
|
||||
* then other tasks can see it right away and need ->ci_master_key.
|
||||
*/
|
||||
crypt_info->ci_master_key = mk;
|
||||
|
||||
/*
|
||||
* For existing inodes, multiple tasks may race to set the inode's
|
||||
* fscrypt info pointer. So use cmpxchg_release(). This pairs with the
|
||||
@@ -634,7 +641,6 @@ fscrypt_setup_encryption_info(struct inode *inode,
|
||||
* crypt_info. Now link it into the master key's inode list.
|
||||
*/
|
||||
if (mk) {
|
||||
crypt_info->ci_master_key = mk;
|
||||
refcount_inc(&mk->mk_active_refs);
|
||||
spin_lock(&mk->mk_decrypted_inodes_lock);
|
||||
list_add(&crypt_info->ci_master_key_link,
|
||||
@@ -642,6 +648,12 @@ fscrypt_setup_encryption_info(struct inode *inode,
|
||||
spin_unlock(&mk->mk_decrypted_inodes_lock);
|
||||
}
|
||||
crypt_info = NULL;
|
||||
} else {
|
||||
/*
|
||||
* Lost the race, so we won't be taking an active reference to
|
||||
* the master key. Clear ->ci_master_key accordingly.
|
||||
*/
|
||||
crypt_info->ci_master_key = NULL;
|
||||
}
|
||||
res = 0;
|
||||
out:
|
||||
|
||||
Reference in New Issue
Block a user