-
- Downloads
tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().
Originally, inet6_sk(sk)->XXX were changed under lock_sock(), so we were able to clean them up by calling inet6_destroy_sock() during the IPv6 -> IPv4 conversion by IPV6_ADDRFORM. However, commit 03485f2a ("udpv6: Add lockless sendmsg() support") added a lockless memory allocation path, which could cause a memory leak: setsockopt(IPV6_ADDRFORM) sendmsg() +-----------------------+ +-------+ - do_ipv6_setsockopt(sk, ...) - udpv6_sendmsg(sk, ...) - sockopt_lock_sock(sk) ^._ called via udpv6_prot - lock_sock(sk) before WRITE_ONCE() - WRITE_ONCE(sk->sk_prot, &tcp_prot) - inet6_destroy_sock() - if (!corkreq) - sockopt_release_sock(sk) - ip6_make_skb(sk, ...) - release_sock(sk) ^._ lockless fast path for the non-corking case - __ip6_append_data(sk, ...) - ipv6_local_rxpmtu(sk, ...) - xchg(&np->rxpmtu, skb) ^._ rxpmtu is never freed. - goto out_no_dst; - lock_sock(sk) For now, rxpmtu is only the case, but not to miss the future change and a similar bug fixed in commit e2732600 ("net: ping6: Fix memleak in ipv6_renew_options()."), let's set a new function to IPv6 sk->sk_destruct() and call inet6_cleanup_sock() there. Since the conversion does not change sk->sk_destruct(), we can guarantee that we can clean up IPv6 resources finally. We can now remove all inet6_destroy_sock() calls from IPv6 protocol specific ->destroy() functions, but such changes are invasive to backport. So they can be posted as a follow-up later for net-next. Fixes: 03485f2a ("udpv6: Add lockless sendmsg() support") Signed-off-by:Kuniyuki Iwashima <kuniyu@amazon.com> Signed-off-by:
Jakub Kicinski <kuba@kernel.org>
Showing
- include/net/ipv6.h 1 addition, 0 deletionsinclude/net/ipv6.h
- include/net/udp.h 1 addition, 1 deletioninclude/net/udp.h
- include/net/udplite.h 0 additions, 8 deletionsinclude/net/udplite.h
- net/ipv4/udp.c 6 additions, 3 deletionsnet/ipv4/udp.c
- net/ipv4/udplite.c 8 additions, 0 deletionsnet/ipv4/udplite.c
- net/ipv6/af_inet6.c 7 additions, 1 deletionnet/ipv6/af_inet6.c
- net/ipv6/udp.c 14 additions, 1 deletionnet/ipv6/udp.c
- net/ipv6/udp_impl.h 1 addition, 0 deletionsnet/ipv6/udp_impl.h
- net/ipv6/udplite.c 8 additions, 1 deletionnet/ipv6/udplite.c
Loading
Please register or sign in to comment