Eric Dumazet
e54a0c79cd
erspan: make sure erspan_base_hdr is present in skb->head
...
[ Upstream commit 17af420545a750f763025149fa7b833a4fc8b8f0 ]
syzbot reported a problem in ip6erspan_rcv() [1]
Issue is that ip6erspan_rcv() (and erspan_rcv()) no longer make
sure erspan_base_hdr is present in skb linear part (skb->head)
before getting @ver field from it.
Add the missing pskb_may_pull() calls.
v2: Reload iph pointer in erspan_rcv() after pskb_may_pull()
because skb->head might have changed.
[1]
BUG: KMSAN: uninit-value in pskb_may_pull_reason include/linux/skbuff.h:2742 [inline]
BUG: KMSAN: uninit-value in pskb_may_pull include/linux/skbuff.h:2756 [inline]
BUG: KMSAN: uninit-value in ip6erspan_rcv net/ipv6/ip6_gre.c:541 [inline]
BUG: KMSAN: uninit-value in gre_rcv+0x11f8/0x1930 net/ipv6/ip6_gre.c:610
pskb_may_pull_reason include/linux/skbuff.h:2742 [inline]
pskb_may_pull include/linux/skbuff.h:2756 [inline]
ip6erspan_rcv net/ipv6/ip6_gre.c:541 [inline]
gre_rcv+0x11f8/0x1930 net/ipv6/ip6_gre.c:610
ip6_protocol_deliver_rcu+0x1d4c/0x2ca0 net/ipv6/ip6_input.c:438
ip6_input_finish net/ipv6/ip6_input.c:483 [inline]
NF_HOOK include/linux/netfilter.h:314 [inline]
ip6_input+0x15d/0x430 net/ipv6/ip6_input.c:492
ip6_mc_input+0xa7e/0xc80 net/ipv6/ip6_input.c:586
dst_input include/net/dst.h:460 [inline]
ip6_rcv_finish+0x955/0x970 net/ipv6/ip6_input.c:79
NF_HOOK include/linux/netfilter.h:314 [inline]
ipv6_rcv+0xde/0x390 net/ipv6/ip6_input.c:310
__netif_receive_skb_one_core net/core/dev.c:5538 [inline]
__netif_receive_skb+0x1da/0xa00 net/core/dev.c:5652
netif_receive_skb_internal net/core/dev.c:5738 [inline]
netif_receive_skb+0x58/0x660 net/core/dev.c:5798
tun_rx_batched+0x3ee/0x980 drivers/net/tun.c:1549
tun_get_user+0x5566/0x69e0 drivers/net/tun.c:2002
tun_chr_write_iter+0x3af/0x5d0 drivers/net/tun.c:2048
call_write_iter include/linux/fs.h:2108 [inline]
new_sync_write fs/read_write.c:497 [inline]
vfs_write+0xb63/0x1520 fs/read_write.c:590
ksys_write+0x20f/0x4c0 fs/read_write.c:643
__do_sys_write fs/read_write.c:655 [inline]
__se_sys_write fs/read_write.c:652 [inline]
__x64_sys_write+0x93/0xe0 fs/read_write.c:652
do_syscall_64+0xd5/0x1f0
entry_SYSCALL_64_after_hwframe+0x6d/0x75
Uninit was created at:
slab_post_alloc_hook mm/slub.c:3804 [inline]
slab_alloc_node mm/slub.c:3845 [inline]
kmem_cache_alloc_node+0x613/0xc50 mm/slub.c:3888
kmalloc_reserve+0x13d/0x4a0 net/core/skbuff.c:577
__alloc_skb+0x35b/0x7a0 net/core/skbuff.c:668
alloc_skb include/linux/skbuff.h:1318 [inline]
alloc_skb_with_frags+0xc8/0xbf0 net/core/skbuff.c:6504
sock_alloc_send_pskb+0xa81/0xbf0 net/core/sock.c:2795
tun_alloc_skb drivers/net/tun.c:1525 [inline]
tun_get_user+0x209a/0x69e0 drivers/net/tun.c:1846
tun_chr_write_iter+0x3af/0x5d0 drivers/net/tun.c:2048
call_write_iter include/linux/fs.h:2108 [inline]
new_sync_write fs/read_write.c:497 [inline]
vfs_write+0xb63/0x1520 fs/read_write.c:590
ksys_write+0x20f/0x4c0 fs/read_write.c:643
__do_sys_write fs/read_write.c:655 [inline]
__se_sys_write fs/read_write.c:652 [inline]
__x64_sys_write+0x93/0xe0 fs/read_write.c:652
do_syscall_64+0xd5/0x1f0
entry_SYSCALL_64_after_hwframe+0x6d/0x75
CPU: 1 PID: 5045 Comm: syz-executor114 Not tainted 6.9.0-rc1-syzkaller-00021-g962490525cff #0
Fixes: cb73ee40b1b3 ("net: ip_gre: use erspan key field for tunnel lookup")
Reported-by: syzbot+1c1cf138518bf0c53d68@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/netdev/000000000000772f2c0614b66ef7@google.com/
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://lore.kernel.org/r/20240328112248.1101491-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-04-13 12:51:36 +02:00
..
2021-09-15 09:47:31 +02:00
2024-01-08 11:29:47 +01:00
2023-01-18 11:41:37 +01:00
2024-02-23 08:24:50 +01:00
2023-12-20 15:41:18 +01:00
2023-12-20 15:41:15 +01:00
2022-04-20 09:19:40 +02:00
2023-08-30 16:27:25 +02:00
2024-04-13 12:51:33 +02:00
2023-01-18 11:41:04 +01:00
2021-07-14 16:53:33 +02:00
2024-03-01 13:13:35 +01:00
2023-03-17 08:32:51 +01:00
2024-02-23 08:25:13 +01:00
2023-10-25 11:53:19 +02:00
2024-04-13 12:51:34 +02:00
2023-08-11 11:53:57 +02:00
2023-11-20 10:30:15 +01:00
2023-06-21 15:44:10 +02:00
2023-07-27 08:37:24 +02:00
2024-03-26 18:22:25 -04:00
2022-11-03 23:56:54 +09:00
2024-01-08 11:29:44 +01:00
2024-04-13 12:51:36 +02:00
2024-04-13 12:51:36 +02:00
2024-03-26 18:22:12 -04:00
2024-03-26 18:22:18 -04:00
2023-08-30 16:27:16 +02:00
2024-03-26 18:22:17 -04:00
2022-04-27 13:50:47 +02:00
2021-02-10 09:25:28 +01:00
2024-02-23 08:25:04 +01:00
2024-04-13 12:51:31 +02:00
2022-12-14 11:30:45 +01:00
2023-02-22 12:50:41 +01:00
2024-01-25 14:34:25 -08:00
2024-04-13 12:51:34 +02:00
2024-01-25 14:34:23 -08:00
2024-03-06 14:36:08 +00:00
2024-03-15 10:48:16 -04:00
2024-04-13 12:51:33 +02:00
2023-05-30 12:44:05 +01:00
2023-02-22 12:50:25 +01:00
2024-03-26 18:22:25 -04:00
2022-01-11 15:23:33 +01:00
2023-12-13 18:18:17 +01:00
2021-09-03 10:08:12 +02:00
2024-04-13 12:51:33 +02:00
2024-01-08 11:29:47 +01:00
2024-01-08 11:29:44 +01:00
2024-02-23 08:25:07 +01:00
2024-04-13 12:51:34 +02:00
2023-10-10 21:46:45 +02:00
2024-02-23 08:24:50 +01:00
2021-11-17 09:48:48 +01:00
2024-03-26 18:22:23 -04:00
2021-10-27 09:54:24 +02:00
2024-02-23 08:25:07 +01:00
2024-03-01 13:13:37 +01:00
2024-03-26 18:22:15 -04:00
2024-01-25 14:34:25 -08:00
2024-03-06 14:36:09 +00:00
2024-03-26 18:22:18 -04:00
2023-07-27 08:37:23 +02:00
2024-04-13 12:51:28 +02:00
2021-06-18 09:59:00 +02:00
2023-06-21 15:44:10 +02:00
2023-06-21 15:44:10 +02:00
2024-01-15 18:25:26 +01:00