| Message ID | cover.1681954729.git.william.xuanziyang@huawei.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | inet6: Backport complete patchset for inet6_destroy_sock() call modificatioin | expand |
On Thu, Apr 20, 2023 at 12:39:46PM +0800, Ziyang Xuan wrote: > 6.1 LTS has backported commit ca43ccf41224 ("dccp/tcp: Avoid negative > sk_forward_alloc by ipv6_pinfo.pktoptions.") and commit 62ec33b44e0f ("net: > Remove WARN_ON_ONCE(sk->sk_forward_alloc) from sk_stream_kill_queues()."), > but these are incomplete. There are some patches that have not been > backported including key pre-patch commit b5fc29233d28 ("inet6: Remove > inet6_destroy_sock() in sk->sk_prot->destroy()."). > > Backport complete patchset for inet6_destroy_sock() call modificatioin. > > Kuniyuki Iwashima (3): > 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(). > > net/dccp/dccp.h | 1 + > net/dccp/ipv6.c | 15 ++++++++------- > net/dccp/proto.c | 8 +++++++- > net/ipv6/af_inet6.c | 1 + > 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 +++++++++++++++++++++-------- > 11 files changed, 39 insertions(+), 42 deletions(-) > > -- > 2.25.1 > All now queued up, thanks. greg k-h
6.1 LTS has backported commit ca43ccf41224 ("dccp/tcp: Avoid negative sk_forward_alloc by ipv6_pinfo.pktoptions.") and commit 62ec33b44e0f ("net: Remove WARN_ON_ONCE(sk->sk_forward_alloc) from sk_stream_kill_queues()."), but these are incomplete. There are some patches that have not been backported including key pre-patch commit b5fc29233d28 ("inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy()."). Backport complete patchset for inet6_destroy_sock() call modificatioin. Kuniyuki Iwashima (3): 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(). net/dccp/dccp.h | 1 + net/dccp/ipv6.c | 15 ++++++++------- net/dccp/proto.c | 8 +++++++- net/ipv6/af_inet6.c | 1 + 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 +++++++++++++++++++++-------- 11 files changed, 39 insertions(+), 42 deletions(-)