Skip to content

Commit b0abcd6

Browse files
ematsumiyaSteve French
authored and
Steve French
committed
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 #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]>
1 parent df9b455 commit b0abcd6

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
@@ -4309,7 +4309,7 @@ smb2_get_enc_key(struct TCP_Server_Info *server, __u64 ses_id, int enc, u8 *key)
43094309
*/
43104310
static int
43114311
crypt_message(struct TCP_Server_Info *server, int num_rqst,
4312-
struct smb_rqst *rqst, int enc)
4312+
struct smb_rqst *rqst, int enc, struct crypto_aead *tfm)
43134313
{
43144314
struct smb2_transform_hdr *tr_hdr =
43154315
(struct smb2_transform_hdr *)rqst[0].rq_iov[0].iov_base;
@@ -4320,8 +4320,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
43204320
u8 key[SMB3_ENC_DEC_KEY_SIZE];
43214321
struct aead_request *req;
43224322
u8 *iv;
4323-
DECLARE_CRYPTO_WAIT(wait);
4324-
struct crypto_aead *tfm;
43254323
unsigned int crypt_len = le32_to_cpu(tr_hdr->OriginalMessageSize);
43264324
void *creq;
43274325
size_t sensitive_size;
@@ -4333,14 +4331,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
43334331
return rc;
43344332
}
43354333

4336-
rc = smb3_crypto_aead_allocate(server);
4337-
if (rc) {
4338-
cifs_server_dbg(VFS, "%s: crypto alloc failed\n", __func__);
4339-
return rc;
4340-
}
4341-
4342-
tfm = enc ? server->secmech.enc : server->secmech.dec;
4343-
43444334
if ((server->cipher_type == SMB2_ENCRYPTION_AES256_CCM) ||
43454335
(server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
43464336
rc = crypto_aead_setkey(tfm, key, SMB3_GCM256_CRYPTKEY_SIZE);
@@ -4380,11 +4370,7 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
43804370
aead_request_set_crypt(req, sg, sg, crypt_len, iv);
43814371
aead_request_set_ad(req, assoc_data_len);
43824372

4383-
aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
4384-
crypto_req_done, &wait);
4385-
4386-
rc = crypto_wait_req(enc ? crypto_aead_encrypt(req)
4387-
: crypto_aead_decrypt(req), &wait);
4373+
rc = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req);
43884374

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

4529-
rc = crypt_message(server, num_rqst, new_rq, 1);
4515+
rc = crypt_message(server, num_rqst, new_rq, 1, server->secmech.enc);
45304516
cifs_dbg(FYI, "Encrypt message returned %d\n", rc);
45314517
if (rc)
45324518
goto err_free;
@@ -4551,8 +4537,9 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
45514537
unsigned int buf_data_size, struct iov_iter *iter,
45524538
bool is_offloaded)
45534539
{
4554-
struct kvec iov[2];
4540+
struct crypto_aead *tfm;
45554541
struct smb_rqst rqst = {NULL};
4542+
struct kvec iov[2];
45564543
size_t iter_size = 0;
45574544
int rc;
45584545

@@ -4568,9 +4555,31 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
45684555
iter_size = iov_iter_count(iter);
45694556
}
45704557

4571-
rc = crypt_message(server, 1, &rqst, 0);
4558+
if (is_offloaded) {
4559+
if ((server->cipher_type == SMB2_ENCRYPTION_AES128_GCM) ||
4560+
(server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
4561+
tfm = crypto_alloc_aead("gcm(aes)", 0, 0);
4562+
else
4563+
tfm = crypto_alloc_aead("ccm(aes)", 0, 0);
4564+
if (IS_ERR(tfm)) {
4565+
rc = PTR_ERR(tfm);
4566+
cifs_server_dbg(VFS, "%s: Failed alloc decrypt TFM, rc=%d\n", __func__, rc);
4567+
4568+
return rc;
4569+
}
4570+
} else {
4571+
if (unlikely(!server->secmech.dec))
4572+
return -EIO;
4573+
4574+
tfm = server->secmech.dec;
4575+
}
4576+
4577+
rc = crypt_message(server, 1, &rqst, 0, tfm);
45724578
cifs_dbg(FYI, "Decrypt message returned %d\n", rc);
45734579

4580+
if (is_offloaded)
4581+
crypto_free_aead(tfm);
4582+
45744583
if (rc)
45754584
return rc;
45764585

fs/smb/client/smb2pdu.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,6 +1266,12 @@ SMB2_negotiate(const unsigned int xid,
12661266
else
12671267
cifs_server_dbg(VFS, "Missing expected negotiate contexts\n");
12681268
}
1269+
1270+
if (server->cipher_type && !rc) {
1271+
rc = smb3_crypto_aead_allocate(server);
1272+
if (rc)
1273+
cifs_server_dbg(VFS, "%s: crypto alloc failed, rc=%d\n", __func__, rc);
1274+
}
12691275
neg_exit:
12701276
free_rsp_buf(resp_buftype, rsp);
12711277
return rc;

0 commit comments

Comments
 (0)