net: strparser: fix strparser sk_user_data check
authorDave Watson <davejwatson@fb.com>
Mon, 22 Aug 2016 19:27:04 +0000 (12:27 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Aug 2016 05:43:16 +0000 (22:43 -0700)
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>
net/strparser/strparser.c

index fd688c0a774486001ecb0bfb2280a7fd7bd5204c..68334b56db1e47a3a1ec8f3f2dc7fa4229f57769 100644 (file)
@@ -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;