iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net/ipv4
History
Kuniyuki Iwashima ad42a35bdf udplite: Fix NULL pointer dereference in __sk_mem_raise_allocated(). 
syzbot reported [0] a null-ptr-deref in sk_get_rmem0() while using
IPPROTO_UDPLITE (0x88):

  14:25:52 executing program 1:
  r0 = socket$inet6(0xa, 0x80002, 0x88)

We had a similar report [1] for probably sk_memory_allocated_add()
in __sk_mem_raise_allocated(), and commit c915fe13cbaa ("udplite: fix
NULL pointer dereference") fixed it by setting .memory_allocated for
udplite_prot and udplitev6_prot.

To fix the variant, we need to set either .sysctl_wmem_offset or
.sysctl_rmem.

Now UDP and UDPLITE share the same value for .memory_allocated, so we
use the same .sysctl_wmem_offset for UDP and UDPLITE.

[0]:
general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN
KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007]
CPU: 0 PID: 6829 Comm: syz-executor.1 Not tainted 6.4.0-rc2-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/28/2023
RIP: 0010:sk_get_rmem0 include/net/sock.h:2907 [inline]
RIP: 0010:__sk_mem_raise_allocated+0x806/0x17a0 net/core/sock.c:3006
Code: c1 ea 03 80 3c 02 00 0f 85 23 0f 00 00 48 8b 44 24 08 48 8b 98 38 01 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 da 48 c1 ea 03 <0f> b6 14 02 48 89 d8 83 e0 07 83 c0 03 38 d0 0f 8d 6f 0a 00 00 8b
RSP: 0018:ffffc90005d7f450 EFLAGS: 00010246
RAX: dffffc0000000000 RBX: 0000000000000000 RCX: ffffc90004d92000
RDX: 0000000000000000 RSI: ffffffff88066482 RDI: ffffffff8e2ccbb8
RBP: ffff8880173f7000 R08: 0000000000000005 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000030000
R13: 0000000000000001 R14: 0000000000000340 R15: 0000000000000001
FS:  0000000000000000(0000) GS:ffff8880b9800000(0063) knlGS:00000000f7f1cb40
CS:  0010 DS: 002b ES: 002b CR0: 0000000080050033
CR2: 000000002e82f000 CR3: 0000000034ff0000 CR4: 00000000003506f0
Call Trace:
 <TASK>
 __sk_mem_schedule+0x6c/0xe0 net/core/sock.c:3077
 udp_rmem_schedule net/ipv4/udp.c:1539 [inline]
 __udp_enqueue_schedule_skb+0x776/0xb30 net/ipv4/udp.c:1581
 __udpv6_queue_rcv_skb net/ipv6/udp.c:666 [inline]
 udpv6_queue_rcv_one_skb+0xc39/0x16c0 net/ipv6/udp.c:775
 udpv6_queue_rcv_skb+0x194/0xa10 net/ipv6/udp.c:793
 __udp6_lib_mcast_deliver net/ipv6/udp.c:906 [inline]
 __udp6_lib_rcv+0x1bda/0x2bd0 net/ipv6/udp.c:1013
 ip6_protocol_deliver_rcu+0x2e7/0x1250 net/ipv6/ip6_input.c:437
 ip6_input_finish+0x150/0x2f0 net/ipv6/ip6_input.c:482
 NF_HOOK include/linux/netfilter.h:303 [inline]
 NF_HOOK include/linux/netfilter.h:297 [inline]
 ip6_input+0xa0/0xd0 net/ipv6/ip6_input.c:491
 ip6_mc_input+0x40b/0xf50 net/ipv6/ip6_input.c:585
 dst_input include/net/dst.h:468 [inline]
 ip6_rcv_finish net/ipv6/ip6_input.c:79 [inline]
 NF_HOOK include/linux/netfilter.h:303 [inline]
 NF_HOOK include/linux/netfilter.h:297 [inline]
 ipv6_rcv+0x250/0x380 net/ipv6/ip6_input.c:309
 __netif_receive_skb_one_core+0x114/0x180 net/core/dev.c:5491
 __netif_receive_skb+0x1f/0x1c0 net/core/dev.c:5605
 netif_receive_skb_internal net/core/dev.c:5691 [inline]
 netif_receive_skb+0x133/0x7a0 net/core/dev.c:5750
 tun_rx_batched+0x4b3/0x7a0 drivers/net/tun.c:1553
 tun_get_user+0x2452/0x39c0 drivers/net/tun.c:1989
 tun_chr_write_iter+0xdf/0x200 drivers/net/tun.c:2035
 call_write_iter include/linux/fs.h:1868 [inline]
 new_sync_write fs/read_write.c:491 [inline]
 vfs_write+0x945/0xd50 fs/read_write.c:584
 ksys_write+0x12b/0x250 fs/read_write.c:637
 do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline]
 __do_fast_syscall_32+0x65/0xf0 arch/x86/entry/common.c:178
 do_fast_syscall_32+0x33/0x70 arch/x86/entry/common.c:203
 entry_SYSENTER_compat_after_hwframe+0x70/0x82
RIP: 0023:0xf7f21579
Code: b8 01 10 06 03 74 b4 01 10 07 03 74 b0 01 10 08 03 74 d8 01 00 00 00 00 00 00 00 00 00 00 00 00 00 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 8d b4 26 00 00 00 00 8d b4 26 00 00 00 00
RSP: 002b:00000000f7f1c590 EFLAGS: 00000282 ORIG_RAX: 0000000000000004
RAX: ffffffffffffffda RBX: 00000000000000c8 RCX: 0000000020000040
RDX: 0000000000000083 RSI: 00000000f734e000 RDI: 0000000000000000
RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000296 R12: 0000000000000000
R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
 </TASK>
Modules linked in:

Link: https://lore.kernel.org/netdev/CANaxB-yCk8hhP68L4Q2nFOJht8sqgXGGQO2AftpHs0u1xyGG5A@mail.gmail.com/ [1]
Fixes: 850cbaddb52d ("udp: use it's own memory accounting schema")
Reported-by: syzbot+444ca0907e96f7c5e48b@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=444ca0907e96f7c5e48b
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20230523163305.66466-1-kuniyu@amazon.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2023-05-25 10:51:58 +02:00
..
bpfilter
…
netfilter
xtables: move icmp/icmpv6 logic to xt_tcpudp
2023-03-22 21:48:59 +01:00
af_inet.c
tcp: add annotations around sk->sk_shutdown accesses
2023-05-10 10:27:31 +01:00
ah4.c
net: ipv4: Remove completion function scaffolding
2023-02-13 18:35:15 +08:00
arp.c
neighbour: annotate lockless accesses to n->nud_state
2023-03-15 00:37:32 -07:00
bpf_tcp_ca.c
bpf: Remove unused arguments from btf_struct_access().
2023-04-04 16:57:10 -07:00
cipso_ipv4.c
cipso_ipv4: use iph_set_totlen in skbuff_setattr
2023-02-01 20:54:27 -08:00
datagram.c
Networking fixes for 6.1-rc2, including fixes from netfilter
2022-10-20 17:24:59 -07:00
devinet.c
net: ipv4: Allow changing IPv4 address protocol
2023-03-23 08:32:52 +00:00
esp4_offload.c
xfrm: replay: Fix ESN wrap around for GSO
2022-10-19 09:00:53 +02:00
esp4.c
net: ipv4: Remove completion function scaffolding
2023-02-13 18:35:15 +08:00
fib_frontend.c
ipv4: Fix incorrect table ID in IOCTL path
2023-03-16 17:26:31 -07:00
fib_lookup.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2022-02-17 11:44:20 -08:00
fib_notifier.c
net: ipv4: remove superfluous header files from fib_notifier.c
2021-09-28 17:32:56 -07:00
fib_rules.c
ipv4: remove unnecessary type castings
2022-04-30 15:12:58 +01:00
fib_semantics.c
neighbour: switch to standard rcu, instead of rcu_bh
2023-03-21 21:32:18 -07:00
fib_trie.c
ipv4: Fix error return code in fib_table_insert()
2022-11-22 20:18:20 -08:00
fou_bpf.c
bpf,fou: Add bpf_skb_{set,get}_fou_encap kfuncs
2023-04-12 16:40:39 -07:00
fou_core.c
bpf,fou: Add bpf_skb_{set,get}_fou_encap kfuncs
2023-04-12 16:40:39 -07:00
fou_nl.c
ynl: broaden the license even more
2023-03-16 21:20:32 -07:00
fou_nl.h
ynl: broaden the license even more
2023-03-16 21:20:32 -07:00
gre_demux.c
net: Remove the member netns_ok
2021-05-17 15:29:35 -07:00
gre_offload.c
net: gro: skb_gro_header helper function
2022-08-25 10:33:21 +02:00
icmp.c
icmp: guard against too small mtu
2023-03-31 21:37:06 -07:00
igmp.c
ipv4: constify ip_mc_sf_allow() socket argument
2023-03-17 08:56:37 +00:00
inet_connection_sock.c
net/ulp: Remove redundant ->clone() test in inet_clone_ulp().
2023-02-20 16:31:49 -08:00
inet_diag.c
net: inet: Retire port only listening_hash
2022-05-12 16:52:18 -07:00
inet_fragment.c
net: dropreason: add SKB_DROP_REASON_FRAG_REASM_TIMEOUT
2022-10-31 20:14:27 -07:00
inet_hashtables.c
ipv6: Remove in6addr_any alternatives.
2023-03-29 08:22:52 +01:00
inet_timewait_sock.c
net: no longer support SOCK_REFCNT_DEBUG feature
2023-02-15 10:25:21 +00:00
inetpeer.c
inetpeer: Fix data-races around sysctl.
2022-07-08 12:10:33 +01:00
ip_forward.c
ip: Fix data-races around sysctl_ip_fwd_update_priority.
2022-07-15 11:49:55 +01:00
ip_fragment.c
net: dropreason: add SKB_DROP_REASON_FRAG_TOO_FAR
2022-10-31 20:14:27 -07:00
ip_gre.c
erspan: do not use skb_mac_header() in ndo_start_xmit()
2023-03-21 21:16:26 -07:00
ip_input.c
net: add support for ipv4 big tcp
2023-02-01 20:54:27 -08:00
ip_options.c
ipv4: drop fragmentation code from ip_options_build()
2022-01-29 17:53:07 +00:00
ip_output.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2023-04-26 10:17:46 +02:00
ip_sockglue.c
ipv{4,6}/raw: fix output xfrm lookup wrt protocol
2023-05-23 15:38:59 +02:00
ip_tunnel_core.c
net: Add helper function to parse netlink msg of ip_tunnel_parm
2022-10-03 07:59:06 +01:00
ip_tunnel.c
bpf-next-for-netdev
2023-04-13 16:43:38 -07:00
ip_vti.c
ipv4: tunnels: use DEV_STATS_INC()
2022-11-16 12:48:44 +00:00
ipcomp.c
xfrm: ipcomp: add extack to ipcomp{4,6}_init_state
2022-09-29 07:18:00 +02:00
ipconfig.c
Driver core / kernfs changes for 6.0-rc1
2022-08-04 11:31:20 -07:00
ipip.c
ipip,ip_tunnel,sit: Add FOU support for externally controlled ipip devices
2023-04-12 16:40:39 -07:00
ipmr_base.c
ipmr: adopt rcu_read_lock() in mr_dump()
2022-06-24 11:34:38 +01:00
ipmr.c
treewide: Convert del_timer*() to timer_shutdown*()
2022-12-25 13:38:09 -08:00
Kconfig
tcp: configurable source port perturb table size
2022-11-16 13:02:04 +00:00
Makefile
bpf,fou: Add bpf_skb_{set,get}_fou_encap kfuncs
2023-04-12 16:40:39 -07:00
metrics.c
ipv4: prevent potential spectre v1 gadget in ip_metrics_convert()
2023-01-23 21:37:25 -08:00
netfilter.c
netfilter: Use l3mdev flow key when re-routing mangled packets
2022-05-16 13:03:29 +02:00
netlink.c
…
nexthop.c
neighbour: switch to standard rcu, instead of rcu_bh
2023-03-21 21:32:18 -07:00
ping.c
ping: Fix potentail NULL deref for /proc/net/icmp.
2023-04-04 18:56:58 -07:00
proc.c
icmp: Add counters for rate limits
2023-01-26 10:52:18 +01:00
protocol.c
net: Remove the member netns_ok
2021-05-17 15:29:35 -07:00
raw_diag.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2023-04-06 12:01:20 -07:00
raw.c
ipv{4,6}/raw: fix output xfrm lookup wrt protocol
2023-05-23 15:38:59 +02:00
route.c
net: dst: fix missing initialization of rt_uncached
2023-04-21 20:26:56 -07:00
syncookies.c
mptcp: remove MPTCP 'ifdef' in TCP SYN cookies
2022-12-12 13:11:24 -08:00
sysctl_net_ipv4.c
tcp: restrict net.ipv4.tcp_app_win
2023-04-07 08:19:11 +01:00
tcp_bbr.c
bpf: Add __bpf_kfunc tag to all kfuncs
2023-02-02 00:25:14 +01:00
tcp_bic.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_bpf.c
bpf, sockmap: Incorrectly handling copied_seq
2023-05-23 16:10:42 +02:00
tcp_cdg.c
Random number generator fixes for Linux 6.1-rc1.
2022-10-16 15:27:07 -07:00
tcp_cong.c
net: Update an existing TCP congestion control algorithm.
2023-03-22 22:53:00 -07:00
tcp_cubic.c
bpf: Add __bpf_kfunc tag to all kfuncs
2023-02-02 00:25:14 +01:00
tcp_dctcp.c
bpf: Add __bpf_kfunc tag to all kfuncs
2023-02-02 00:25:14 +01:00
tcp_dctcp.h
…
tcp_diag.c
tcp: Access &tcp_hashinfo via net.
2022-09-20 10:21:49 -07:00
tcp_fastopen.c
tcp: Make SYN ACK RTO tunable by BPF programs with TFO
2022-08-17 10:19:22 +01:00
tcp_highspeed.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_htcp.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_hybla.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_illinois.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_input.c
tcp: add annotations around sk->sk_shutdown accesses
2023-05-10 10:27:31 +01:00
tcp_ipv4.c
tcp: fix possible sk_priority leak in tcp_v4_send_reset()
2023-05-12 10:05:50 +01:00
tcp_lp.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_metrics.c
genetlink: start to validate reserved header bytes
2022-08-29 12:47:15 +01:00
tcp_minisocks.c
tcp: preserve const qualifier in tcp_sk()
2023-03-18 12:23:34 +00:00
tcp_nv.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_offload.c
gro: add support of (hw)gro packets to gro stack
2022-10-03 12:38:34 +01:00
tcp_output.c
tcp: preserve const qualifier in tcp_sk()
2023-03-18 12:23:34 +00:00
tcp_plb.c
prandom: remove prandom_u32_max()
2022-12-20 03:13:45 +01:00
tcp_rate.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2022-04-28 13:02:01 -07:00
tcp_recovery.c
tcp: preserve const qualifier in tcp_sk()
2023-03-18 12:23:34 +00:00
tcp_scalable.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_timer.c
tcp: annotate lockless access to sk->sk_err
2023-03-17 08:25:05 +00:00
tcp_ulp.c
net/ulp: use consistent error code when blocking ULP
2023-01-19 09:26:16 -08:00
tcp_vegas.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_vegas.h
…
tcp_veno.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_westwood.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_yeah.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp.c
bpf, sockmap: Incorrectly handling copied_seq
2023-05-23 16:10:42 +02:00
tunnel4.c
net: Remove the member netns_ok
2021-05-17 15:29:35 -07:00
udp_bpf.c
bpf, sockmap: Fix an infinite loop error when len is 0 in tcp_bpf_recvmsg_parser()
2023-03-03 17:25:15 +01:00
udp_diag.c
udp: Access &udp_table via net.
2022-11-16 09:43:35 +00:00
udp_impl.h
net: remove noblock parameter from recvmsg() entities
2022-04-12 15:00:25 +02:00
udp_offload.c
udp: allow header check for dodgy GSO_UDP_L4 packets.
2022-12-12 09:29:56 +00:00
udp_tunnel_core.c
net/tunnel: wait until all sk_user_data reader finish before releasing the sock
2022-12-12 09:51:52 +00:00
udp_tunnel_nic.c
udp_tunnel: Add checks for nla_nest_start() in __udp_tunnel_nic_dump_write()
2022-11-29 08:44:24 -08:00
udp_tunnel_stub.c
…
udp.c
bpf, sockmap: Pass skb ownership through read_skb
2023-05-23 16:09:47 +02:00
udplite.c
udplite: Fix NULL pointer dereference in __sk_mem_raise_allocated().
2023-05-25 10:51:58 +02:00
xfrm4_input.c
…
xfrm4_output.c
…
xfrm4_policy.c
net: dst: fix missing initialization of rt_uncached
2023-04-21 20:26:56 -07:00
xfrm4_protocol.c
net: xfrm: unexport __init-annotated xfrm4_protocol_init()
2022-06-08 10:10:13 -07:00
xfrm4_state.c
…
xfrm4_tunnel.c
xfrm: tunnel: add extack to ipip_init_state, xfrm6_tunnel_init_state
2022-09-29 07:18:00 +02:00