inet: fix potential deadlock in reqsk_queue_unlink()
authorEric Dumazet <edumazet@google.com>
Thu, 13 Aug 2015 22:44:51 +0000 (15:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Aug 2015 05:46:22 +0000 (22:46 -0700)
commit83fccfc3940c4a2db90fd7e7079f5b465cd8c6af
tree054fec600d1a1b77d1ea73289423dd07db1b18a3
parent2a4eebf0c485d8e90bdd2e33e75c4b3b1e1673ac
inet: fix potential deadlock in reqsk_queue_unlink()

When replacing del_timer() with del_timer_sync(), I introduced
a deadlock condition :

reqsk_queue_unlink() is called from inet_csk_reqsk_queue_drop()

inet_csk_reqsk_queue_drop() can be called from many contexts,
one being the timer handler itself (reqsk_timer_handler()).

In this case, del_timer_sync() loops forever.

Simple fix is to test if timer is pending.

Fixes: 2235f2ac75fd ("inet: fix races with reqsk timers")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/inet_connection_sock.c