summaryrefslogtreecommitdiffstats
path: root/net/strparser
diff options
context:
space:
mode:
authorDave Watson <davejwatson@fb.com>2016-08-22 12:27:04 -0700
committerDavid S. Miller <davem@davemloft.net>2016-08-22 22:43:16 -0700
commita01512dbe3ec1e7dc58b00161d61ead359f5ac08 (patch)
treee67a875f3f1c314d822dd80d49888b81da1f5ad2 /net/strparser
parentf1ff8666ed87b0013e45ce2d335085407bb38a60 (diff)
downloadlinux-stable-a01512dbe3ec1e7dc58b00161d61ead359f5ac08.tar.gz
linux-stable-a01512dbe3ec1e7dc58b00161d61ead359f5ac08.tar.bz2
linux-stable-a01512dbe3ec1e7dc58b00161d61ead359f5ac08.zip
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@fb.com> Acked-by: Tom Herbert <tom@herbertland.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/strparser')
-rw-r--r--net/strparser/strparser.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c
index fd688c0a7744..68334b56db1e 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;