[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CALx6S35w4oe9ds-cWadKmT_n__3-NKFZ6hw=KFzKFNBx+Dj=2g@mail.gmail.com>
Date: Mon, 22 Aug 2016 12:35:38 -0700
From: Tom Herbert <tom@...bertland.com>
To: Dave Watson <davejwatson@...com>
Cc: netdev <netdev@...r.kernel.org>, David Miller <davem@...emloft.net>
Subject: Re: [PATCH net-next] net: strparser: fix strparser sk_user_data check
On Mon, Aug 22, 2016 at 12:27 PM, Dave Watson <davejwatson@...com> wrote:
> 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;
> -
Acked-by: Tom Herbert <tom@...bertland.com>
> if (unlikely(strp->rx_stopped))
> goto out;
>
> --
> 2.8.0.rc2
>
Powered by blists - more mailing lists