Willem de Bruijn ff5cb6a4f0 llc: verify mac len before reading mac header ... [ Upstream commit 7b3ba18703 ] LLC reads the mac header with eth_hdr without verifying that the skb has an Ethernet header. Syzbot was able to enter llc_rcv on a tun device. Tun can insert packets without mac len and with user configurable skb->protocol (passing a tun_pi header when not configuring IFF_NO_PI). BUG: KMSAN: uninit-value in llc_station_ac_send_test_r net/llc/llc_station.c:81 [inline] BUG: KMSAN: uninit-value in llc_station_rcv+0x6fb/0x1290 net/llc/llc_station.c:111 llc_station_ac_send_test_r net/llc/llc_station.c:81 [inline] llc_station_rcv+0x6fb/0x1290 net/llc/llc_station.c:111 llc_rcv+0xc5d/0x14a0 net/llc/llc_input.c:218 __netif_receive_skb_one_core net/core/dev.c:5523 [inline] __netif_receive_skb+0x1a6/0x5a0 net/core/dev.c:5637 netif_receive_skb_internal net/core/dev.c:5723 [inline] netif_receive_skb+0x58/0x660 net/core/dev.c:5782 tun_rx_batched+0x3ee/0x980 drivers/net/tun.c:1555 tun_get_user+0x54c5/0x69c0 drivers/net/tun.c:2002 Add a mac_len test before all three eth_hdr(skb) calls under net/llc. There are further uses in include/net/llc_pdu.h. All these are protected by a test skb->protocol == ETH_P_802_2. Which does not protect against this tun scenario. But the mac_len test added in this patch in llc_fixup_skb will indirectly protect those too. That is called from llc_rcv before any other LLC code. It is tempting to just add a blanket mac_len check in llc_rcv, but not sure whether that could break valid LLC paths that do not assume an Ethernet header. 802.2 LLC may be used on top of non-802.3 protocols in principle. The below referenced commit shows that used to, on top of Token Ring. At least one of the three eth_hdr uses goes back to before the start of git history. But the one that syzbot exercises is introduced in this commit. That commit is old enough (2008), that effectively all stable kernels should receive this. Fixes: f83f1768f8 ("[LLC]: skb allocation size for responses") Reported-by: syzbot+a8c7be6dee0de1b669cc@syzkaller.appspotmail.com Signed-off-by: Willem de Bruijn <willemb@google.com> Link: https://lore.kernel.org/r/20231025234251.3796495-1-willemdebruijn.kernel@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>		2023-11-20 11:59:34 +01:00
..
af_llc.c	llc: Check netns in llc_estab_match() and llc_listener_match().	2023-07-20 10:46:28 +02:00
Kconfig	net: remove redundant 'depends on NET'	2021-01-27 17:04:12 -08:00
llc_c_ac.c	llc/snap: constify dev_addr passing	2021-10-13 09:40:46 -07:00
llc_c_ev.c	net: llc: Correct some function names in header	2021-03-26 15:24:14 -07:00
llc_c_st.c
llc_conn.c	net/llc/llc_conn.c: fix 4 instances of -Wmissing-variable-declarations	2023-08-09 15:34:28 -07:00
llc_core.c	llc: llc_core.c: COuple of typo fixes	2021-03-28 17:31:13 -07:00
llc_if.c	llc: Check netns in llc_estab_match() and llc_listener_match().	2023-07-20 10:46:28 +02:00
llc_input.c	llc: verify mac len before reading mac header	2023-11-20 11:59:34 +01:00
llc_output.c	llc/snap: constify dev_addr passing	2021-10-13 09:40:46 -07:00
llc_pdu.c	net: llc: Correct function name llc_pdu_set_pf_bit() in header	2021-03-26 15:24:14 -07:00
llc_proc.c	sock: Use sock_owned_by_user_nocheck() instead of sk_lock.owned.	2021-12-10 19:43:00 -08:00
llc_s_ac.c	llc: verify mac len before reading mac header	2023-11-20 11:59:34 +01:00
llc_s_ev.c
llc_s_st.c
llc_sap.c	llc: Check netns in llc_dgram_match().	2023-07-20 10:46:28 +02:00
llc_station.c	llc: verify mac len before reading mac header	2023-11-20 11:59:34 +01:00
Makefile	llc: fix whitespace issues	2018-07-24 14:10:42 -07:00
sysctl_net_llc.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00