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

tcp: fix possible deadlock in TCP stack vs BPF filter

Filtering the ACK packet was not put at the right place.

At this place, we already allocated a child and put it
into accept queue.

We absolutely need to call tcp_child_process() to release
its spinlock, or we will deadlock at accept() or close() time.

Found by syzkaller team (Thanks a lot !)

Fixes: 8fac365f ("tcp: Add a tcp_filter hook before handle ack packet")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
Cc: Chenbo Feng <fengc@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7749d4ff
...@@ -1722,6 +1722,8 @@ int tcp_v4_rcv(struct sk_buff *skb) ...@@ -1722,6 +1722,8 @@ int tcp_v4_rcv(struct sk_buff *skb)
*/ */
sock_hold(sk); sock_hold(sk);
refcounted = true; refcounted = true;
if (tcp_filter(sk, skb))
goto discard_and_relse;
nsk = tcp_check_req(sk, skb, req, false); nsk = tcp_check_req(sk, skb, req, false);
if (!nsk) { if (!nsk) {
reqsk_put(req); reqsk_put(req);
...@@ -1729,8 +1731,6 @@ int tcp_v4_rcv(struct sk_buff *skb) ...@@ -1729,8 +1731,6 @@ int tcp_v4_rcv(struct sk_buff *skb)
} }
if (nsk == sk) { if (nsk == sk) {
reqsk_put(req); reqsk_put(req);
} else if (tcp_filter(sk, skb)) {
goto discard_and_relse;
} else if (tcp_child_process(sk, nsk, skb)) { } else if (tcp_child_process(sk, nsk, skb)) {
tcp_v4_send_reset(nsk, skb); tcp_v4_send_reset(nsk, skb);
goto discard_and_relse; goto discard_and_relse;
......
...@@ -1456,6 +1456,8 @@ static int tcp_v6_rcv(struct sk_buff *skb) ...@@ -1456,6 +1456,8 @@ static int tcp_v6_rcv(struct sk_buff *skb)
} }
sock_hold(sk); sock_hold(sk);
refcounted = true; refcounted = true;
if (tcp_filter(sk, skb))
goto discard_and_relse;
nsk = tcp_check_req(sk, skb, req, false); nsk = tcp_check_req(sk, skb, req, false);
if (!nsk) { if (!nsk) {
reqsk_put(req); reqsk_put(req);
...@@ -1464,8 +1466,6 @@ static int tcp_v6_rcv(struct sk_buff *skb) ...@@ -1464,8 +1466,6 @@ static int tcp_v6_rcv(struct sk_buff *skb)
if (nsk == sk) { if (nsk == sk) {
reqsk_put(req); reqsk_put(req);
tcp_v6_restore_cb(skb); tcp_v6_restore_cb(skb);
} else if (tcp_filter(sk, skb)) {
goto discard_and_relse;
} else if (tcp_child_process(sk, nsk, skb)) { } else if (tcp_child_process(sk, nsk, skb)) {
tcp_v6_send_reset(nsk, skb); tcp_v6_send_reset(nsk, skb);
goto discard_and_relse; goto discard_and_relse;
......
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