From: Cong Wang <cong.wang@bytedance.com>
Date: Wed, 31 Mar 2021 02:32:22 +0000 (-0700)
Subject: skmsg: Lock ingress_skb when purging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=37f0e514db660f03f8982b8f4fbbd4b2740abe7d;p=linux.git

skmsg: Lock ingress_skb when purging

Currently we purge the ingress_skb queue only when psock
refcnt goes down to 0, so locking the queue is not necessary,
but in order to be called during ->close, we have to lock it
here.

Signed-off-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20210331023237.41094-2-xiyou.wangcong@gmail.com
---

diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index 07f54015238a6..bebf84ed4e30a 100644
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -634,7 +634,7 @@ static void sk_psock_zap_ingress(struct sk_psock *psock)
 {
 	struct sk_buff *skb;
 
-	while ((skb = __skb_dequeue(&psock->ingress_skb)) != NULL) {
+	while ((skb = skb_dequeue(&psock->ingress_skb)) != NULL) {
 		skb_bpf_redirect_clear(skb);
 		kfree_skb(skb);
 	}