Skip to content

Commit fb4ec6e

Browse files
committed
smb: client: fix UAF in async decryption
JIRA: https://issues.redhat.com/browse/RHEL-63909 CVE: CVE-2024-50047 commit b0abcd6 Author: Enzo Matsumiya <ematsumiya@suse.de> Date: Thu Sep 26 14:46:13 2024 -0300 smb: client: fix UAF in async decryption 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 ctrliq#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 <ematsumiya@suse.de> Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Paulo Alcantara <paalcant@redhat.com>
1 parent cd58e17 commit fb4ec6e

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
@@ -4225,7 +4225,7 @@ smb2_get_enc_key(struct TCP_Server_Info *server, __u64 ses_id, int enc, u8 *key)
42254225
*/
42264226
static int
42274227
crypt_message(struct TCP_Server_Info *server, int num_rqst,
4228-
struct smb_rqst *rqst, int enc)
4228+
struct smb_rqst *rqst, int enc, struct crypto_aead *tfm)
42294229
{
42304230
struct smb2_transform_hdr *tr_hdr =
42314231
(struct smb2_transform_hdr *)rqst[0].rq_iov[0].iov_base;
@@ -4236,8 +4236,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
42364236
u8 key[SMB3_ENC_DEC_KEY_SIZE];
42374237
struct aead_request *req;
42384238
u8 *iv;
4239-
DECLARE_CRYPTO_WAIT(wait);
4240-
struct crypto_aead *tfm;
42414239
unsigned int crypt_len = le32_to_cpu(tr_hdr->OriginalMessageSize);
42424240
void *creq;
42434241

@@ -4248,14 +4246,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
42484246
return rc;
42494247
}
42504248

4251-
rc = smb3_crypto_aead_allocate(server);
4252-
if (rc) {
4253-
cifs_server_dbg(VFS, "%s: crypto alloc failed\n", __func__);
4254-
return rc;
4255-
}
4256-
4257-
tfm = enc ? server->secmech.enc : server->secmech.dec;
4258-
42594249
if ((server->cipher_type == SMB2_ENCRYPTION_AES256_CCM) ||
42604250
(server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
42614251
rc = crypto_aead_setkey(tfm, key, SMB3_GCM256_CRYPTKEY_SIZE);
@@ -4294,11 +4284,7 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
42944284
aead_request_set_crypt(req, sg, sg, crypt_len, iv);
42954285
aead_request_set_ad(req, assoc_data_len);
42964286

4297-
aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
4298-
crypto_req_done, &wait);
4299-
4300-
rc = crypto_wait_req(enc ? crypto_aead_encrypt(req)
4301-
: crypto_aead_decrypt(req), &wait);
4287+
rc = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req);
43024288

43034289
if (!rc && enc)
43044290
memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);
@@ -4388,7 +4374,7 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, int num_rqst,
43884374
/* fill the 1st iov with a transform header */
43894375
fill_transform_hdr(tr_hdr, orig_len, old_rq, server->cipher_type);
43904376

4391-
rc = crypt_message(server, num_rqst, new_rq, 1);
4377+
rc = crypt_message(server, num_rqst, new_rq, 1, server->secmech.enc);
43924378
cifs_dbg(FYI, "Encrypt message returned %d\n", rc);
43934379
if (rc)
43944380
goto err_free;
@@ -4414,8 +4400,9 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
44144400
unsigned int npages, unsigned int page_data_size,
44154401
bool is_offloaded)
44164402
{
4417-
struct kvec iov[2];
4403+
struct crypto_aead *tfm;
44184404
struct smb_rqst rqst = {NULL};
4405+
struct kvec iov[2];
44194406
int rc;
44204407

44214408
iov[0].iov_base = buf;
@@ -4430,9 +4417,31 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
44304417
rqst.rq_pagesz = PAGE_SIZE;
44314418
rqst.rq_tailsz = (page_data_size % PAGE_SIZE) ? : PAGE_SIZE;
44324419

4433-
rc = crypt_message(server, 1, &rqst, 0);
4420+
if (is_offloaded) {
4421+
if ((server->cipher_type == SMB2_ENCRYPTION_AES128_GCM) ||
4422+
(server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
4423+
tfm = crypto_alloc_aead("gcm(aes)", 0, 0);
4424+
else
4425+
tfm = crypto_alloc_aead("ccm(aes)", 0, 0);
4426+
if (IS_ERR(tfm)) {
4427+
rc = PTR_ERR(tfm);
4428+
cifs_server_dbg(VFS, "%s: Failed alloc decrypt TFM, rc=%d\n", __func__, rc);
4429+
4430+
return rc;
4431+
}
4432+
} else {
4433+
if (unlikely(!server->secmech.dec))
4434+
return -EIO;
4435+
4436+
tfm = server->secmech.dec;
4437+
}
4438+
4439+
rc = crypt_message(server, 1, &rqst, 0, tfm);
44344440
cifs_dbg(FYI, "Decrypt message returned %d\n", rc);
44354441

4442+
if (is_offloaded)
4443+
crypto_free_aead(tfm);
4444+
44364445
if (rc)
44374446
return rc;
44384447

fs/smb/client/smb2pdu.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,6 +1263,12 @@ SMB2_negotiate(const unsigned int xid,
12631263
else
12641264
cifs_server_dbg(VFS, "Missing expected negotiate contexts\n");
12651265
}
1266+
1267+
if (server->cipher_type && !rc) {
1268+
rc = smb3_crypto_aead_allocate(server);
1269+
if (rc)
1270+
cifs_server_dbg(VFS, "%s: crypto alloc failed, rc=%d\n", __func__, rc);
1271+
}
12661272
neg_exit:
12671273
free_rsp_buf(resp_buftype, rsp);
12681274
return rc;

0 commit comments

Comments
 (0)