Skip to content

inet6: Remove inet6_destroy_sock() calls.

Kuniyuki Iwashima linux-sctp mptcp netdev 2 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest5 patches 1 replyApplied 5/5
  2. v15 patches 2 repliesSuperseded

Changes in v2 from the cover letter

* patch 1
* Fix build failure for CONFIG_MPTCP_IPV6=y

Patches in v2 All 5 applied

#Subject and filesSizeRepliesApplied
1/5inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy().net/ipv6/ping.c net/ipv6/raw.c net/ipv6/tcp_ipv6.c +3 more+1 -261 replyApplied
2/5dccp: Call inet6_destroy_sock() via sk->sk_destruct().net/dccp/dccp.h net/dccp/ipv6.c net/dccp/proto.c +1 more+17 -80 repliesApplied
3/5sctp: Call inet6_destroy_sock() via sk->sk_destruct().net/sctp/socket.c+21 -80 repliesApplied
4/5inet6: Remove inet6_destroy_sock().include/net/transp_v6.h net/ipv6/af_inet6.c+1 -90 repliesApplied
5/5inet6: Clean up failure path in do_ipv6_setsockopt().net/ipv6/ipv6_sockglue.c+2 -40 repliesApplied

Reviews trailers per patch

1 of 5 patches has a Reviewed-by or Acked-by.

PatchMatthieu Baerts
1/5R-b
2/5
3/5
4/5
5/5

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 net-next 0/5] inet6: Remove inet6_destroy_sock() calls.

This is a follow-up series for commit d38afeec26ed ("tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().").

This series cleans up unnecessary inet6_destory_sock() calls in sk->sk_prot->destroy() and call it from sk->sk_destruct() to make sure we do not leak memory related to IPv6 specific-resources.

Changes:
v2:
* patch 1
* Fix build failure for CONFIG_MPTCP_IPV6=y

v1: https://lore.kernel.org/netdev/[email protected]/

Kuniyuki Iwashima (5):
inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy().
dccp: Call inet6_destroy_sock() via sk->sk_destruct().
sctp: Call inet6_destroy_sock() via sk->sk_destruct().
inet6: Remove inet6_destroy_sock().
inet6: Clean up failure path in do_ipv6_setsockopt().

 include/net/transp_v6.h  |  2 --
 net/dccp/dccp.h          |  1 +
 net/dccp/ipv6.c          | 15 ++++++++-------
 net/dccp/proto.c         |  8 +++++++-
 net/ipv6/af_inet6.c      |  9 ++-------
 net/ipv6/ipv6_sockglue.c |  6 ++----
 net/ipv6/ping.c          |  6 ------
 net/ipv6/raw.c           |  2 --
 net/ipv6/tcp_ipv6.c      |  8 +-------
 net/ipv6/udp.c           |  2 --
 net/l2tp/l2tp_ip6.c      |  2 --
 net/mptcp/protocol.c     |  7 -------
 net/sctp/socket.c        | 29 +++++++++++++++++++++--------
 13 files changed, 42 insertions(+), 55 deletions(-)
Signature · 1 line
2.30.2