Skip to content

Commit b220bed

Browse files
Wang Zhaolongsmfrench
authored andcommitted
smb: client: fix use-after-free in crypt_message when using async crypto
The CVE-2024-50047 fix removed asynchronous crypto handling from crypt_message(), assuming all crypto operations are synchronous. However, when hardware crypto accelerators are used, this can cause use-after-free crashes: crypt_message() // Allocate the creq buffer containing the req creq = smb2_get_aead_req(..., &req); // Async encryption returns -EINPROGRESS immediately rc = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req); // Free creq while async operation is still in progress kvfree_sensitive(creq, ...); Hardware crypto modules often implement async AEAD operations for performance. When crypto_aead_encrypt/decrypt() returns -EINPROGRESS, the operation completes asynchronously. Without crypto_wait_req(), the function immediately frees the request buffer, leading to crashes when the driver later accesses the freed memory. This results in a use-after-free condition when the hardware crypto driver later accesses the freed request structure, leading to kernel crashes with NULL pointer dereferences. The issue occurs because crypto_alloc_aead() with mask=0 doesn't guarantee synchronous operation. Even without CRYPTO_ALG_ASYNC in the mask, async implementations can be selected. Fix by restoring the async crypto handling: - DECLARE_CRYPTO_WAIT(wait) for completion tracking - aead_request_set_callback() for async completion notification - crypto_wait_req() to wait for operation completion This ensures the request buffer isn't freed until the crypto operation completes, whether synchronous or asynchronous, while preserving the CVE-2024-50047 fix. Fixes: b0abcd6 ("smb: client: fix UAF in async decryption") Link: https://lore.kernel.org/all/[email protected]/ Cc: [email protected] Reviewed-by: Paulo Alcantara (Red Hat) <[email protected]> Signed-off-by: Wang Zhaolong <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 705c791 commit b220bed

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

fs/smb/client/smb2ops.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4316,6 +4316,7 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
43164316
u8 key[SMB3_ENC_DEC_KEY_SIZE];
43174317
struct aead_request *req;
43184318
u8 *iv;
4319+
DECLARE_CRYPTO_WAIT(wait);
43194320
unsigned int crypt_len = le32_to_cpu(tr_hdr->OriginalMessageSize);
43204321
void *creq;
43214322
size_t sensitive_size;
@@ -4366,7 +4367,11 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
43664367
aead_request_set_crypt(req, sg, sg, crypt_len, iv);
43674368
aead_request_set_ad(req, assoc_data_len);
43684369

4369-
rc = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req);
4370+
aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
4371+
crypto_req_done, &wait);
4372+
4373+
rc = crypto_wait_req(enc ? crypto_aead_encrypt(req)
4374+
: crypto_aead_decrypt(req), &wait);
43704375

43714376
if (!rc && enc)
43724377
memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);

0 commit comments

Comments
 (0)