summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-01-13 18:21:51 +0000
committerDavid S. Miller <davem@davemloft.net>2013-01-14 18:10:05 -0500
commitcce894bb824429fd312706c7012acae43e725865 (patch)
treee16ce5d07f76eab02bfdc424f521dd14d50a25e9
parent3152ba0f86428cebe8a9f8462d5be0a9aefa6289 (diff)
downloadop-kernel-dev-cce894bb824429fd312706c7012acae43e725865.zip
op-kernel-dev-cce894bb824429fd312706c7012acae43e725865.tar.gz
tcp: fix a panic on UP machines in reqsk_fastopen_remove
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@gmail.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Jerry Chu <hkchu@google.com> Cc: Yuchung Cheng <ycheng@google.com> Cc: Dave Taht <dave.taht@gmail.com> Acked-by: H.K. Jerry Chu <hkchu@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/request_sock.c2
1 files changed, 0 insertions, 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--;
OpenPOWER on IntegriCloud