Skip to content

Commit 86098ce

Browse files
ematsumiyamehmetb0
authored andcommitted
smb: client: fix UAF in async decryption
BugLink: https://bugs.launchpad.net/bugs/2097301 [ Upstream commit b0abcd6 ] 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: Sasha Levin <[email protected]> CVE-2024-50047 Signed-off-by: Manuel Diewald <[email protected]> Signed-off-by: Koichiro Den <[email protected]>
1 parent a342c26 commit 86098ce

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
@@ -4254,7 +4254,7 @@ smb2_get_enc_key(struct TCP_Server_Info *server, __u64 ses_id, int enc, u8 *key)
42544254
*/
42554255
static int
42564256
crypt_message(struct TCP_Server_Info *server, int num_rqst,
4257-
struct smb_rqst *rqst, int enc)
4257+
struct smb_rqst *rqst, int enc, struct crypto_aead *tfm)
42584258
{
42594259
struct smb2_transform_hdr *tr_hdr =
42604260
(struct smb2_transform_hdr *)rqst[0].rq_iov[0].iov_base;
@@ -4265,8 +4265,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
42654265
u8 key[SMB3_ENC_DEC_KEY_SIZE];
42664266
struct aead_request *req;
42674267
u8 *iv;
4268-
DECLARE_CRYPTO_WAIT(wait);
4269-
struct crypto_aead *tfm;
42704268
unsigned int crypt_len = le32_to_cpu(tr_hdr->OriginalMessageSize);
42714269
void *creq;
42724270
size_t sensitive_size;
@@ -4278,14 +4276,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
42784276
return rc;
42794277
}
42804278

4281-
rc = smb3_crypto_aead_allocate(server);
4282-
if (rc) {
4283-
cifs_server_dbg(VFS, "%s: crypto alloc failed\n", __func__);
4284-
return rc;
4285-
}
4286-
4287-
tfm = enc ? server->secmech.enc : server->secmech.dec;
4288-
42894279
if ((server->cipher_type == SMB2_ENCRYPTION_AES256_CCM) ||
42904280
(server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
42914281
rc = crypto_aead_setkey(tfm, key, SMB3_GCM256_CRYPTKEY_SIZE);
@@ -4325,11 +4315,7 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
43254315
aead_request_set_crypt(req, sg, sg, crypt_len, iv);
43264316
aead_request_set_ad(req, assoc_data_len);
43274317

4328-
aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
4329-
crypto_req_done, &wait);
4330-
4331-
rc = crypto_wait_req(enc ? crypto_aead_encrypt(req)
4332-
: crypto_aead_decrypt(req), &wait);
4318+
rc = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req);
43334319

43344320
if (!rc && enc)
43354321
memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);
@@ -4436,7 +4422,7 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, int num_rqst,
44364422
/* fill the 1st iov with a transform header */
44374423
fill_transform_hdr(tr_hdr, orig_len, old_rq, server->cipher_type);
44384424

4439-
rc = crypt_message(server, num_rqst, new_rq, 1);
4425+
rc = crypt_message(server, num_rqst, new_rq, 1, server->secmech.enc);
44404426
cifs_dbg(FYI, "Encrypt message returned %d\n", rc);
44414427
if (rc)
44424428
goto err_free;
@@ -4461,8 +4447,9 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
44614447
unsigned int buf_data_size, struct iov_iter *iter,
44624448
bool is_offloaded)
44634449
{
4464-
struct kvec iov[2];
4450+
struct crypto_aead *tfm;
44654451
struct smb_rqst rqst = {NULL};
4452+
struct kvec iov[2];
44664453
size_t iter_size = 0;
44674454
int rc;
44684455

@@ -4479,9 +4466,31 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
44794466
iter_size = iov_iter_count(iter);
44804467
}
44814468

4482-
rc = crypt_message(server, 1, &rqst, 0);
4469+
if (is_offloaded) {
4470+
if ((server->cipher_type == SMB2_ENCRYPTION_AES128_GCM) ||
4471+
(server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
4472+
tfm = crypto_alloc_aead("gcm(aes)", 0, 0);
4473+
else
4474+
tfm = crypto_alloc_aead("ccm(aes)", 0, 0);
4475+
if (IS_ERR(tfm)) {
4476+
rc = PTR_ERR(tfm);
4477+
cifs_server_dbg(VFS, "%s: Failed alloc decrypt TFM, rc=%d\n", __func__, rc);
4478+
4479+
return rc;
4480+
}
4481+
} else {
4482+
if (unlikely(!server->secmech.dec))
4483+
return -EIO;
4484+
4485+
tfm = server->secmech.dec;
4486+
}
4487+
4488+
rc = crypt_message(server, 1, &rqst, 0, tfm);
44834489
cifs_dbg(FYI, "Decrypt message returned %d\n", rc);
44844490

4491+
if (is_offloaded)
4492+
crypto_free_aead(tfm);
4493+
44854494
if (rc)
44864495
return rc;
44874496

fs/smb/client/smb2pdu.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,6 +1253,12 @@ SMB2_negotiate(const unsigned int xid,
12531253
else
12541254
cifs_server_dbg(VFS, "Missing expected negotiate contexts\n");
12551255
}
1256+
1257+
if (server->cipher_type && !rc) {
1258+
rc = smb3_crypto_aead_allocate(server);
1259+
if (rc)
1260+
cifs_server_dbg(VFS, "%s: crypto alloc failed, rc=%d\n", __func__, rc);
1261+
}
12561262
neg_exit:
12571263
free_rsp_buf(resp_buftype, rsp);
12581264
return rc;

0 commit comments

Comments
 (0)