projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
046de74
)
net: mctp: purge receive queues on sk destruction
author
Jeremy Kerr
<jk@codeconstruct.com.au>
Thu, 26 Jan 2023 06:45:51 +0000
(14:45 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 6 Feb 2023 06:59:02 +0000
(07:59 +0100)
commit
60bd1d9008a50cc78c4033a16a6f5d78210d481c
upstream.
We may have pending skbs in the receive queue when the sk is being
destroyed; add a destructor to purge the queue.
MCTP doesn't use the error queue, so only the receive_queue is purged.
Fixes:
833ef3b91de6
("mctp: Populate socket implementation")
Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Link:
https://lore.kernel.org/r/20230126064551.464468-1-jk@codeconstruct.com.au
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/mctp/af_mctp.c
patch
|
blob
|
history
diff --git
a/net/mctp/af_mctp.c
b/net/mctp/af_mctp.c
index
a77fafb
..
77137a8
100644
(file)
--- a/
net/mctp/af_mctp.c
+++ b/
net/mctp/af_mctp.c
@@
-294,6
+294,11
@@
static void mctp_sk_unhash(struct sock *sk)
synchronize_rcu();
}
synchronize_rcu();
}
+static void mctp_sk_destruct(struct sock *sk)
+{
+ skb_queue_purge(&sk->sk_receive_queue);
+}
+
static struct proto mctp_proto = {
.name = "MCTP",
.owner = THIS_MODULE,
static struct proto mctp_proto = {
.name = "MCTP",
.owner = THIS_MODULE,
@@
-330,6
+335,7
@@
static int mctp_pf_create(struct net *net, struct socket *sock,
return -ENOMEM;
sock_init_data(sock, sk);
return -ENOMEM;
sock_init_data(sock, sk);
+ sk->sk_destruct = mctp_sk_destruct;
rc = 0;
if (sk->sk_prot->init)
rc = 0;
if (sk->sk_prot->init)