[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20160822192704.GA34359@davejwatson-mba.dhcp.thefacebook.com>
Date: Mon, 22 Aug 2016 12:27:04 -0700
From: Dave Watson <davejwatson@...com>
To: netdev <netdev@...r.kernel.org>, Tom Herbert <tom@...bertland.com>
CC: David Miller <davem@...emloft.net>
Subject: [PATCH net-next] net: strparser: fix strparser sk_user_data check
sk_user_data mismatch between what kcm expects (psock) and what strparser expects (strparser).
Queued rx_work, for example calling strp_check_rcv after socket buffer changes, will never complete.
sk_user_data is unused in strparser, so just remove the check.
Signed-off-by: Dave Watson <davejwatson@...com>
---
net/strparser/strparser.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c
index fd688c0..68334b5 100644
--- a/net/strparser/strparser.c
+++ b/net/strparser/strparser.c
@@ -390,9 +390,6 @@ static void do_strp_rx_work(struct strparser *strp)
*/
lock_sock(csk);
- if (unlikely(csk->sk_user_data != strp))
- goto out;
-
if (unlikely(strp->rx_stopped))
goto out;
--
2.8.0.rc2
Powered by blists - more mailing lists