[PATCH v5 net 0/5] tcp/udp: Fix memory leaks and data races around IPV6_ADDRFORM.

Kuniyuki Iwashima posted 5 patches 3 years, 6 months ago
include/net/ipv6.h       |  2 ++
include/net/udp.h        |  2 +-
include/net/udplite.h    |  8 --------
net/core/sock.c          |  6 ++++--
net/ipv4/af_inet.c       | 23 ++++++++++++++++-------
net/ipv4/tcp.c           | 10 ++++++----
net/ipv4/udp.c           |  9 ++++++---
net/ipv4/udplite.c       |  8 ++++++++
net/ipv6/af_inet6.c      | 14 +++++++++++++-
net/ipv6/ipv6_sockglue.c | 34 +++++++++++++++++++---------------
net/ipv6/tcp_ipv6.c      |  6 ++++--
net/ipv6/udp.c           | 15 ++++++++++++++-
net/ipv6/udp_impl.h      |  1 +
net/ipv6/udplite.c       |  9 ++++++++-
14 files changed, 102 insertions(+), 45 deletions(-)
[PATCH v5 net 0/5] tcp/udp: Fix memory leaks and data races around IPV6_ADDRFORM.
Posted by Kuniyuki Iwashima 3 years, 6 months ago
This series fixes some memory leaks and data races caused in the
same scenario where one thread converts an IPv6 socket into IPv4
with IPV6_ADDRFORM and another accesses the socket concurrently.


Changes:
  v5:
    * Patch 1 & 5
      * Rebase and resolve conflicts with 24426654ed3a and 34704ef024ae

    * Patch 3:
      * Remove 'inline' from udplite_sk_init()
      * Remove EXPORT_SYMBOL_GPL(inet6_sock_destruct)

  v4: https://lore.kernel.org/netdev/20221004171802.40968-1-kuniyu@amazon.com/
    * Patch 3:
      * Change UDPv6 Lite's sk->sk_prot->init() and sk->destruct() as well.
      * Move udplite_sk_init() from udplite.h to udplite.c.

  v3 (Resend): https://lore.kernel.org/netdev/20221003154425.49458-1-kuniyu@amazon.com/
    * CC blamed commits' EHOSTUNREACH authors to make patchwork happy

  v3: https://lore.kernel.org/netdev/20220929012542.55424-1-kuniyu@amazon.com/
    * Patch 2:
      * Add comment for np->rxopt.all = 0
      * Add inet6_cleanup_sock()
    * Patch 3:
      * Call inet6_cleanup_sock() instead of inet6_destroy_sock()

  v2: https://lore.kernel.org/netdev/20220928002741.64237-1-kuniyu@amazon.com/
    * Patch 3:
      * Move inet6_destroy_sock() from sk_prot->destroy()
        to sk->sk_destruct() and fix CONFIG_IPV6=m build failure
    * Patch 5:
      * Add WRITE_ONCE()s in tcp_v6_connect()
      * Add Reported-by tags and KCSAN log in changelog

  v1: https://lore.kernel.org/netdev/20220927161209.32939-1-kuniyu@amazon.com/


Kuniyuki Iwashima (5):
  tcp/udp: Fix memory leak in ipv6_renew_options().
  udp: Call inet6_destroy_sock() in setsockopt(IPV6_ADDRFORM).
  tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().
  ipv6: Fix data races around sk->sk_prot.
  tcp: Fix data races around icsk->icsk_af_ops.

 include/net/ipv6.h       |  2 ++
 include/net/udp.h        |  2 +-
 include/net/udplite.h    |  8 --------
 net/core/sock.c          |  6 ++++--
 net/ipv4/af_inet.c       | 23 ++++++++++++++++-------
 net/ipv4/tcp.c           | 10 ++++++----
 net/ipv4/udp.c           |  9 ++++++---
 net/ipv4/udplite.c       |  8 ++++++++
 net/ipv6/af_inet6.c      | 14 +++++++++++++-
 net/ipv6/ipv6_sockglue.c | 34 +++++++++++++++++++---------------
 net/ipv6/tcp_ipv6.c      |  6 ++++--
 net/ipv6/udp.c           | 15 ++++++++++++++-
 net/ipv6/udp_impl.h      |  1 +
 net/ipv6/udplite.c       |  9 ++++++++-
 14 files changed, 102 insertions(+), 45 deletions(-)

-- 
2.30.2
Re: [PATCH v5 net 0/5] tcp/udp: Fix memory leaks and data races around IPV6_ADDRFORM.
Posted by patchwork-bot+netdevbpf@kernel.org 3 years, 5 months ago
Hello:

This series was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Thu, 6 Oct 2022 11:53:44 -0700 you wrote:
> This series fixes some memory leaks and data races caused in the
> same scenario where one thread converts an IPv6 socket into IPv4
> with IPV6_ADDRFORM and another accesses the socket concurrently.
> 
> 
> Changes:
>   v5:
>     * Patch 1 & 5
>       * Rebase and resolve conflicts with 24426654ed3a and 34704ef024ae
> 
> [...]

Here is the summary with links:
  - [v5,net,1/5] tcp/udp: Fix memory leak in ipv6_renew_options().
    https://git.kernel.org/netdev/net/c/3c52c6bb831f
  - [v5,net,2/5] udp: Call inet6_destroy_sock() in setsockopt(IPV6_ADDRFORM).
    https://git.kernel.org/netdev/net/c/21985f43376c
  - [v5,net,3/5] tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().
    https://git.kernel.org/netdev/net/c/d38afeec26ed
  - [v5,net,4/5] ipv6: Fix data races around sk->sk_prot.
    https://git.kernel.org/netdev/net/c/364f997b5cfe
  - [v5,net,5/5] tcp: Fix data races around icsk->icsk_af_ops.
    https://git.kernel.org/netdev/net/c/f49cd2f4d617

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html