Skip to content

Commit a924d04

Browse files
committed
net/tls: fix slab-out-of-bounds bug in decrypt_internal
jira LE-1907 Rebuild_History Non-Buildable kernel-4.18.0-394.el8 commit-author Ziyang Xuan <[email protected]> commit 9381fe8 The memory size of tls_ctx->rx.iv for AES128-CCM is 12 setting in tls_set_sw_offload(). The return value of crypto_aead_ivsize() for "ccm(aes)" is 16. So memcpy() require 16 bytes from 12 bytes memory space will trigger slab-out-of-bounds bug as following: ================================================================== BUG: KASAN: slab-out-of-bounds in decrypt_internal+0x385/0xc40 [tls] Read of size 16 at addr ffff888114e84e60 by task tls/10911 Call Trace: <TASK> dump_stack_lvl+0x34/0x44 print_report.cold+0x5e/0x5db ? decrypt_internal+0x385/0xc40 [tls] kasan_report+0xab/0x120 ? decrypt_internal+0x385/0xc40 [tls] kasan_check_range+0xf9/0x1e0 memcpy+0x20/0x60 decrypt_internal+0x385/0xc40 [tls] ? tls_get_rec+0x2e0/0x2e0 [tls] ? process_rx_list+0x1a5/0x420 [tls] ? tls_setup_from_iter.constprop.0+0x2e0/0x2e0 [tls] decrypt_skb_update+0x9d/0x400 [tls] tls_sw_recvmsg+0x3c8/0xb50 [tls] Allocated by task 10911: kasan_save_stack+0x1e/0x40 __kasan_kmalloc+0x81/0xa0 tls_set_sw_offload+0x2eb/0xa20 [tls] tls_setsockopt+0x68c/0x700 [tls] __sys_setsockopt+0xfe/0x1b0 Replace the crypto_aead_ivsize() with prot->iv_size + prot->salt_size when memcpy() iv value in TLS_1_3_VERSION scenario. Fixes: f295b3a ("net/tls: Add support of AES128-CCM based ciphers") Signed-off-by: Ziyang Xuan <[email protected]> Reviewed-by: Jakub Kicinski <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 9381fe8) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 267c77f commit a924d04

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/tls/tls_sw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1483,7 +1483,7 @@ static int decrypt_internal(struct sock *sk, struct sk_buff *skb,
14831483
}
14841484
if (prot->version == TLS_1_3_VERSION)
14851485
memcpy(iv + iv_offset, tls_ctx->rx.iv,
1486-
crypto_aead_ivsize(ctx->aead_recv));
1486+
prot->iv_size + prot->salt_size);
14871487
else
14881488
memcpy(iv + iv_offset, tls_ctx->rx.iv, prot->salt_size);
14891489

0 commit comments

Comments
 (0)