X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fnet%2Fcore%2Frequest_sock.c;h=b42f0e26f89e4cf2e37a8329da549eb5cd1200c5;hb=refs%2Fchanges%2F53%2F2653%2F1;hp=87b22c0bc08c2f33fa31948b8b2604f48b8009bc;hpb=342fa5dfa053559f47caad657132522496dcf1b3;p=kvmfornfv.git

diff --git a/kernel/net/core/request_sock.c b/kernel/net/core/request_sock.c
index 87b22c0bc..b42f0e26f 100644
--- a/kernel/net/core/request_sock.c
+++ b/kernel/net/core/request_sock.c
@@ -103,10 +103,16 @@ void reqsk_queue_destroy(struct request_sock_queue *queue)
 			spin_lock_bh(&queue->syn_wait_lock);
 			while ((req = lopt->syn_table[i]) != NULL) {
 				lopt->syn_table[i] = req->dl_next;
+				/* Because of following del_timer_sync(),
+				 * we must release the spinlock here
+				 * or risk a dead lock.
+				 */
+				spin_unlock_bh(&queue->syn_wait_lock);
 				atomic_inc(&lopt->qlen_dec);
-				if (del_timer(&req->rsk_timer))
+				if (del_timer_sync(&req->rsk_timer))
 					reqsk_put(req);
 				reqsk_put(req);
+				spin_lock_bh(&queue->syn_wait_lock);
 			}
 			spin_unlock_bh(&queue->syn_wait_lock);
 		}