Eric Dumazet
17af420545
erspan: make sure erspan_base_hdr is present in skb->head
...
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>
2024-03-29 12:42:55 -07:00
..
2024-02-09 14:12:01 -08:00
2023-12-13 05:44:30 +09:00
2023-10-28 11:29:28 +01:00
2024-02-26 11:46:12 +00:00
2023-12-26 20:31:01 +00:00
2024-02-09 14:12:01 -08:00
2024-02-02 12:44:16 +00:00
2024-03-08 11:06:14 -05:00
2024-03-11 18:06:04 -07:00
2024-03-14 18:03:09 -07:00
2024-01-05 08:06:35 -08:00
2024-02-20 15:32:45 +01:00
2024-03-06 12:43:01 +01:00
2024-03-29 12:27:05 -07:00
2024-03-21 14:41:00 -07:00
2024-03-19 19:37:57 -07:00
2024-01-11 10:07:29 -08:00
2024-03-07 20:37:13 -08:00
2024-03-06 20:40:20 -08:00
2024-02-08 18:32:29 -08:00
2024-03-29 10:42:21 +00:00
2024-03-08 20:35:33 -08:00
2023-12-15 10:50:18 +00:00
2024-03-29 12:42:55 -07:00
2024-03-29 12:42:55 -07:00
2024-03-19 11:38:27 -07:00
2024-03-11 09:53:22 +00:00
2024-02-09 14:12:01 -08:00
2024-03-11 09:53:22 +00:00
2024-01-30 13:49:09 +01:00
2024-03-25 15:23:07 +01:00
2024-03-06 21:01:26 +01:00
2024-02-29 14:24:56 -08:00
2024-03-14 18:03:09 -07:00
2024-03-11 10:37:40 +00:00
2023-11-18 15:00:51 +00:00
2024-03-28 03:54:01 +01:00
2024-02-28 19:37:34 -08:00
2024-03-11 15:48:34 -07:00
2024-03-07 10:36:58 +01:00
2024-03-22 09:41:39 +00:00
2024-02-09 12:54:38 -08:00
2024-03-18 12:29:53 +00:00
2024-02-22 09:05:50 +01:00
2023-12-29 08:43:59 +00:00
2024-01-01 18:41:29 +00:00
2024-03-29 12:04:09 -07:00
2023-12-21 22:17:23 +01:00
2023-12-15 11:59:53 +00:00
2024-03-14 13:09:53 +01:00
2024-03-19 15:33:25 +01:00
2024-03-07 21:12:43 -08:00
2024-03-05 15:49:35 +01:00
2024-03-16 11:44:00 -07:00
2024-02-16 09:36:37 +00:00
2024-02-15 13:18:19 +01:00
2024-03-26 20:48:24 -07:00
2024-02-22 15:29:26 -08:00
2024-01-23 15:13:54 +01:00
2024-03-25 15:23:06 +01:00
2024-03-11 09:53:22 +00:00
2024-03-02 20:50:59 -08:00
2024-03-18 11:56:11 +01:00
2023-12-12 14:24:14 +01:00
2024-02-18 10:19:21 +00:00
2024-01-31 16:41:16 -08:00
2024-03-14 16:48:53 -07:00