diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-10-19 15:36:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-04-26 11:21:53 +0200 |
| commit | b165119e6cc96ceaeea061ecca0750f0052aa2c8 (patch) | |
| tree | cdd43565defc8d1fd1fffec6ac48ebcefbaeee07 /net/dccp/proto.c | |
| parent | e1820a934398d35a5925bcf61316983c90857f7d (diff) | |
| download | linux-stable-b165119e6cc96ceaeea061ecca0750f0052aa2c8.tar.gz linux-stable-b165119e6cc96ceaeea061ecca0750f0052aa2c8.tar.bz2 linux-stable-b165119e6cc96ceaeea061ecca0750f0052aa2c8.zip | |
dccp: Call inet6_destroy_sock() via sk->sk_destruct().
commit 1651951ebea54970e0bda60c638fc2eee7a6218f upstream.
After commit d38afeec26ed ("tcp/udp: Call inet6_destroy_sock()
in IPv6 sk->sk_destruct()."), we call inet6_destroy_sock() in
sk->sk_destruct() by setting inet6_sock_destruct() to it to make
sure we do not leak inet6-specific resources.
DCCP sets its own sk->sk_destruct() in the dccp_init_sock(), and
DCCPv6 socket shares it by calling the same init function via
dccp_v6_init_sock().
To call inet6_sock_destruct() from DCCPv6 sk->sk_destruct(), we
export it and set dccp_v6_sk_destruct() in the init function.
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/dccp/proto.c')
| -rw-r--r-- | net/dccp/proto.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index dbbcf50aea35..673502779933 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -174,12 +174,18 @@ const char *dccp_packet_name(const int type) EXPORT_SYMBOL_GPL(dccp_packet_name); -static void dccp_sk_destruct(struct sock *sk) +void dccp_destruct_common(struct sock *sk) { struct dccp_sock *dp = dccp_sk(sk); ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk); dp->dccps_hc_tx_ccid = NULL; +} +EXPORT_SYMBOL_GPL(dccp_destruct_common); + +static void dccp_sk_destruct(struct sock *sk) +{ + dccp_destruct_common(sk); inet_sock_destruct(sk); } |