[PATCH net-next] net: strparser: fix strparser sk_user_data check

Subsystems: networking [general], the rest

STALE3665d

3 messages, 3 authors, 2016-08-23 · open the first message on its own page

[PATCH net-next] net: strparser: fix strparser sk_user_data check

From: Dave Watson <hidden>
Date: 2016-08-22 19:27:15

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 <redacted>
---
 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

Re: [PATCH net-next] net: strparser: fix strparser sk_user_data check

From: Tom Herbert <hidden>
Date: 2016-08-22 19:35:39

On Mon, Aug 22, 2016 at 12:27 PM, Dave Watson [off-list ref] wrote:
quoted hunk
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 <redacted>
---
 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;
-
Acked-by: Tom Herbert <redacted>
        if (unlikely(strp->rx_stopped))
                goto out;

--
2.8.0.rc2

Re: [PATCH net-next] net: strparser: fix strparser sk_user_data check

From: David Miller <davem@davemloft.net>
Date: 2016-08-23 05:43:39

From: Dave Watson <redacted>
Date: Mon, 22 Aug 2016 12:27:04 -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 <redacted>
Applied, thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help