[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAPshTCiNcSPbC7uCzo5MV2tGuZyoCwyE_XKcGb9smknZ8Rqb2w@mail.gmail.com>
Date: Mon, 14 Jan 2013 00:26:26 -0800
From: Jerry Chu <hkchu@...gle.com>
To: Eric Dumazet <eric.dumazet@...il.com>
Cc: David Miller <davem@...emloft.net>,
netdev <netdev@...r.kernel.org>,
Ketan Kulkarni <ketkulka@...il.com>,
Yuchung Cheng <ycheng@...gle.com>
Subject: Re: [PATCH] tcp: fix a panic on UP machines in reqsk_fastopen_remove
On Sun, Jan 13, 2013 at 8:21 PM, Eric Dumazet <eric.dumazet@...il.com> wrote:
> From: Eric Dumazet <edumazet@...gle.com>
>
> spin_is_locked() on a non !SMP build is kind of useless.
>
> BUG_ON(!spin_is_locked(xx)) is guaranteed to crash.
>
> Just remove this check in reqsk_fastopen_remove() as
> the callers do hold the socket lock.
>
> Reported-by: Ketan Kulkarni <ketkulka@...il.com>
> Signed-off-by: Eric Dumazet <edumazet@...gle.com>
> Cc: Jerry Chu <hkchu@...gle.com>
> Cc: Yuchung Cheng <ycheng@...gle.com>
> Cc: Dave Taht <dave.taht@...il.com>
> ---
> net/core/request_sock.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/net/core/request_sock.c b/net/core/request_sock.c
> index c31d9e8..4425148 100644
> --- a/net/core/request_sock.c
> +++ b/net/core/request_sock.c
> @@ -186,8 +186,6 @@ void reqsk_fastopen_remove(struct sock *sk, struct request_sock *req,
> struct fastopen_queue *fastopenq =
> inet_csk(lsk)->icsk_accept_queue.fastopenq;
>
> - BUG_ON(!spin_is_locked(&sk->sk_lock.slock) && !sock_owned_by_user(sk));
> -
> tcp_sk(sk)->fastopen_rsk = NULL;
> spin_lock_bh(&fastopenq->lock);
> fastopenq->qlen--;
>
>
Thanks, Eric. (I thought the assertion would be transparent to UP...)
Acked-by: H.K. Jerry Chu <hkchu@...gle.com>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists