Commit 2306c704 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

inet: fix race in reqsk_queue_unlink()

reqsk_timer_handler() tests if icsk_accept_queue.listen_opt
is NULL at its beginning.

By the time it calls inet_csk_reqsk_queue_drop() and
reqsk_queue_unlink(), listener might have been closed and
inet_csk_listen_stop() had called reqsk_queue_yank_acceptq()
which sets icsk_accept_queue.listen_opt to NULL

We therefore need to correctly check listen_opt being NULL
after holding syn_wait_lock for proper synchronization.

Fixes: fa76ce73 ("inet: get rid of central tcp/dccp listener timer")
Fixes: b357a364 ("inet: fix possible panic in reqsk_queue_unlink()")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8695a144
...@@ -577,12 +577,13 @@ EXPORT_SYMBOL(inet_rtx_syn_ack); ...@@ -577,12 +577,13 @@ EXPORT_SYMBOL(inet_rtx_syn_ack);
static bool reqsk_queue_unlink(struct request_sock_queue *queue, static bool reqsk_queue_unlink(struct request_sock_queue *queue,
struct request_sock *req) struct request_sock *req)
{ {
struct listen_sock *lopt = queue->listen_opt;
struct request_sock **prev; struct request_sock **prev;
struct listen_sock *lopt;
bool found = false; bool found = false;
spin_lock(&queue->syn_wait_lock); spin_lock(&queue->syn_wait_lock);
lopt = queue->listen_opt;
if (lopt) {
for (prev = &lopt->syn_table[req->rsk_hash]; *prev != NULL; for (prev = &lopt->syn_table[req->rsk_hash]; *prev != NULL;
prev = &(*prev)->dl_next) { prev = &(*prev)->dl_next) {
if (*prev == req) { if (*prev == req) {
...@@ -591,7 +592,7 @@ static bool reqsk_queue_unlink(struct request_sock_queue *queue, ...@@ -591,7 +592,7 @@ static bool reqsk_queue_unlink(struct request_sock_queue *queue,
break; break;
} }
} }
}
spin_unlock(&queue->syn_wait_lock); spin_unlock(&queue->syn_wait_lock);
if (timer_pending(&req->rsk_timer) && del_timer_sync(&req->rsk_timer)) if (timer_pending(&req->rsk_timer) && del_timer_sync(&req->rsk_timer))
reqsk_put(req); reqsk_put(req);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment