Skip to content

Commit bce9665

Browse files
ematsumiyagregkh
authored andcommitted
smb: client: fix UAF in async decryption
commit b0abcd65ec545701b8793e12bc27dc98042b151a upstream. Doing an async decryption (large read) crashes with a slab-use-after-free way down in the crypto API. Reproducer: # mount.cifs -o ...,seal,esize=1 //srv/share /mnt # dd if=/mnt/largefile of=/dev/null ... [ 194.196391] ================================================================== [ 194.196844] BUG: KASAN: slab-use-after-free in gf128mul_4k_lle+0xc1/0x110 [ 194.197269] Read of size 8 at addr ffff888112bd0448 by task kworker/u77:2/899 [ 194.197707] [ 194.197818] CPU: 12 UID: 0 PID: 899 Comm: kworker/u77:2 Not tainted 6.11.0-lku-00028-gfca3ca14a17a-dirty #43 [ 194.198400] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.2-3-gd478f380-prebuilt.qemu.org 04/01/2014 [ 194.199046] Workqueue: smb3decryptd smb2_decrypt_offload [cifs] [ 194.200032] Call Trace: [ 194.200191] <TASK> [ 194.200327] dump_stack_lvl+0x4e/0x70 [ 194.200558] ? gf128mul_4k_lle+0xc1/0x110 [ 194.200809] print_report+0x174/0x505 [ 194.201040] ? __pfx__raw_spin_lock_irqsave+0x10/0x10 [ 194.201352] ? srso_return_thunk+0x5/0x5f [ 194.201604] ? __virt_addr_valid+0xdf/0x1c0 [ 194.201868] ? gf128mul_4k_lle+0xc1/0x110 [ 194.202128] kasan_report+0xc8/0x150 [ 194.202361] ? gf128mul_4k_lle+0xc1/0x110 [ 194.202616] gf128mul_4k_lle+0xc1/0x110 [ 194.202863] ghash_update+0x184/0x210 [ 194.203103] shash_ahash_update+0x184/0x2a0 [ 194.203377] ? __pfx_shash_ahash_update+0x10/0x10 [ 194.203651] ? srso_return_thunk+0x5/0x5f [ 194.203877] ? crypto_gcm_init_common+0x1ba/0x340 [ 194.204142] gcm_hash_assoc_remain_continue+0x10a/0x140 [ 194.204434] crypt_message+0xec1/0x10a0 [cifs] [ 194.206489] ? __pfx_crypt_message+0x10/0x10 [cifs] [ 194.208507] ? srso_return_thunk+0x5/0x5f [ 194.209205] ? srso_return_thunk+0x5/0x5f [ 194.209925] ? srso_return_thunk+0x5/0x5f [ 194.210443] ? srso_return_thunk+0x5/0x5f [ 194.211037] decrypt_raw_data+0x15f/0x250 [cifs] [ 194.212906] ? __pfx_decrypt_raw_data+0x10/0x10 [cifs] [ 194.214670] ? srso_return_thunk+0x5/0x5f [ 194.215193] smb2_decrypt_offload+0x12a/0x6c0 [cifs] This is because TFM is being used in parallel. Fix this by allocating a new AEAD TFM for async decryption, but keep the existing one for synchronous READ cases (similar to what is done in smb3_calc_signature()). Also remove the calls to aead_request_set_callback() and crypto_wait_req() since it's always going to be a synchronous operation. Signed-off-by: Enzo Matsumiya <[email protected]> Signed-off-by: Steve French <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 49a27ee commit bce9665

File tree

2 files changed

+34
-19
lines changed

2 files changed

+34
-19
lines changed

fs/smb/client/smb2ops.c

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4488,7 +4488,7 @@ smb2_get_enc_key(struct TCP_Server_Info *server, __u64 ses_id, int enc, u8 *key)
44884488
*/
44894489
static int
44904490
crypt_message(struct TCP_Server_Info *server, int num_rqst,
4491-
struct smb_rqst *rqst, int enc)
4491+
struct smb_rqst *rqst, int enc, struct crypto_aead *tfm)
44924492
{
44934493
struct smb2_transform_hdr *tr_hdr =
44944494
(struct smb2_transform_hdr *)rqst[0].rq_iov[0].iov_base;
@@ -4499,8 +4499,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
44994499
u8 key[SMB3_ENC_DEC_KEY_SIZE];
45004500
struct aead_request *req;
45014501
u8 *iv;
4502-
DECLARE_CRYPTO_WAIT(wait);
4503-
struct crypto_aead *tfm;
45044502
unsigned int crypt_len = le32_to_cpu(tr_hdr->OriginalMessageSize);
45054503
void *creq;
45064504

@@ -4511,14 +4509,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
45114509
return rc;
45124510
}
45134511

4514-
rc = smb3_crypto_aead_allocate(server);
4515-
if (rc) {
4516-
cifs_server_dbg(VFS, "%s: crypto alloc failed\n", __func__);
4517-
return rc;
4518-
}
4519-
4520-
tfm = enc ? server->secmech.enc : server->secmech.dec;
4521-
45224512
if ((server->cipher_type == SMB2_ENCRYPTION_AES256_CCM) ||
45234513
(server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
45244514
rc = crypto_aead_setkey(tfm, key, SMB3_GCM256_CRYPTKEY_SIZE);
@@ -4557,11 +4547,7 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
45574547
aead_request_set_crypt(req, sg, sg, crypt_len, iv);
45584548
aead_request_set_ad(req, assoc_data_len);
45594549

4560-
aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
4561-
crypto_req_done, &wait);
4562-
4563-
rc = crypto_wait_req(enc ? crypto_aead_encrypt(req)
4564-
: crypto_aead_decrypt(req), &wait);
4550+
rc = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req);
45654551

45664552
if (!rc && enc)
45674553
memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);
@@ -4650,7 +4636,7 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, int num_rqst,
46504636
/* fill the 1st iov with a transform header */
46514637
fill_transform_hdr(tr_hdr, orig_len, old_rq, server->cipher_type);
46524638

4653-
rc = crypt_message(server, num_rqst, new_rq, 1);
4639+
rc = crypt_message(server, num_rqst, new_rq, 1, server->secmech.enc);
46544640
cifs_dbg(FYI, "Encrypt message returned %d\n", rc);
46554641
if (rc)
46564642
goto err_free;
@@ -4676,8 +4662,9 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
46764662
unsigned int npages, unsigned int page_data_size,
46774663
bool is_offloaded)
46784664
{
4679-
struct kvec iov[2];
4665+
struct crypto_aead *tfm;
46804666
struct smb_rqst rqst = {NULL};
4667+
struct kvec iov[2];
46814668
int rc;
46824669

46834670
iov[0].iov_base = buf;
@@ -4692,9 +4679,31 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
46924679
rqst.rq_pagesz = PAGE_SIZE;
46934680
rqst.rq_tailsz = (page_data_size % PAGE_SIZE) ? : PAGE_SIZE;
46944681

4695-
rc = crypt_message(server, 1, &rqst, 0);
4682+
if (is_offloaded) {
4683+
if ((server->cipher_type == SMB2_ENCRYPTION_AES128_GCM) ||
4684+
(server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
4685+
tfm = crypto_alloc_aead("gcm(aes)", 0, 0);
4686+
else
4687+
tfm = crypto_alloc_aead("ccm(aes)", 0, 0);
4688+
if (IS_ERR(tfm)) {
4689+
rc = PTR_ERR(tfm);
4690+
cifs_server_dbg(VFS, "%s: Failed alloc decrypt TFM, rc=%d\n", __func__, rc);
4691+
4692+
return rc;
4693+
}
4694+
} else {
4695+
if (unlikely(!server->secmech.dec))
4696+
return -EIO;
4697+
4698+
tfm = server->secmech.dec;
4699+
}
4700+
4701+
rc = crypt_message(server, 1, &rqst, 0, tfm);
46964702
cifs_dbg(FYI, "Decrypt message returned %d\n", rc);
46974703

4704+
if (is_offloaded)
4705+
crypto_free_aead(tfm);
4706+
46984707
if (rc)
46994708
return rc;
47004709

fs/smb/client/smb2pdu.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,6 +1105,12 @@ SMB2_negotiate(const unsigned int xid,
11051105
else
11061106
cifs_server_dbg(VFS, "Missing expected negotiate contexts\n");
11071107
}
1108+
1109+
if (server->cipher_type && !rc) {
1110+
rc = smb3_crypto_aead_allocate(server);
1111+
if (rc)
1112+
cifs_server_dbg(VFS, "%s: crypto alloc failed, rc=%d\n", __func__, rc);
1113+
}
11081114
neg_exit:
11091115
free_rsp_buf(resp_buftype, rsp);
11101116
return rc;

0 commit comments

Comments
 (0)