Skip to content

Commit 0809fb8

Browse files
ematsumiyagregkh
authored andcommitted
smb: client: fix UAF in async decryption
[ 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 torvalds#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]>
1 parent f7fb5dd commit 0809fb8

File tree

2 files changed

+34
-19
lines changed

2 files changed

+34
-19
lines changed

fs/smb/client/smb2ops.c

+28-19
Original file line numberDiff line numberDiff line change
@@ -4250,7 +4250,7 @@ smb2_get_enc_key(struct TCP_Server_Info *server, __u64 ses_id, int enc, u8 *key)
42504250
*/
42514251
static int
42524252
crypt_message(struct TCP_Server_Info *server, int num_rqst,
4253-
struct smb_rqst *rqst, int enc)
4253+
struct smb_rqst *rqst, int enc, struct crypto_aead *tfm)
42544254
{
42554255
struct smb2_transform_hdr *tr_hdr =
42564256
(struct smb2_transform_hdr *)rqst[0].rq_iov[0].iov_base;
@@ -4261,8 +4261,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
42614261
u8 key[SMB3_ENC_DEC_KEY_SIZE];
42624262
struct aead_request *req;
42634263
u8 *iv;
4264-
DECLARE_CRYPTO_WAIT(wait);
4265-
struct crypto_aead *tfm;
42664264
unsigned int crypt_len = le32_to_cpu(tr_hdr->OriginalMessageSize);
42674265
void *creq;
42684266
size_t sensitive_size;
@@ -4274,14 +4272,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
42744272
return rc;
42754273
}
42764274

4277-
rc = smb3_crypto_aead_allocate(server);
4278-
if (rc) {
4279-
cifs_server_dbg(VFS, "%s: crypto alloc failed\n", __func__);
4280-
return rc;
4281-
}
4282-
4283-
tfm = enc ? server->secmech.enc : server->secmech.dec;
4284-
42854275
if ((server->cipher_type == SMB2_ENCRYPTION_AES256_CCM) ||
42864276
(server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
42874277
rc = crypto_aead_setkey(tfm, key, SMB3_GCM256_CRYPTKEY_SIZE);
@@ -4321,11 +4311,7 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
43214311
aead_request_set_crypt(req, sg, sg, crypt_len, iv);
43224312
aead_request_set_ad(req, assoc_data_len);
43234313

4324-
aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
4325-
crypto_req_done, &wait);
4326-
4327-
rc = crypto_wait_req(enc ? crypto_aead_encrypt(req)
4328-
: crypto_aead_decrypt(req), &wait);
4314+
rc = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req);
43294315

43304316
if (!rc && enc)
43314317
memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);
@@ -4432,7 +4418,7 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, int num_rqst,
44324418
/* fill the 1st iov with a transform header */
44334419
fill_transform_hdr(tr_hdr, orig_len, old_rq, server->cipher_type);
44344420

4435-
rc = crypt_message(server, num_rqst, new_rq, 1);
4421+
rc = crypt_message(server, num_rqst, new_rq, 1, server->secmech.enc);
44364422
cifs_dbg(FYI, "Encrypt message returned %d\n", rc);
44374423
if (rc)
44384424
goto err_free;
@@ -4457,8 +4443,9 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
44574443
unsigned int buf_data_size, struct iov_iter *iter,
44584444
bool is_offloaded)
44594445
{
4460-
struct kvec iov[2];
4446+
struct crypto_aead *tfm;
44614447
struct smb_rqst rqst = {NULL};
4448+
struct kvec iov[2];
44624449
size_t iter_size = 0;
44634450
int rc;
44644451

@@ -4475,9 +4462,31 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
44754462
iter_size = iov_iter_count(iter);
44764463
}
44774464

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

4487+
if (is_offloaded)
4488+
crypto_free_aead(tfm);
4489+
44814490
if (rc)
44824491
return rc;
44834492

fs/smb/client/smb2pdu.c

+6
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)