tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: make dropreason in tcp_child_process() work

Browse Source 
It's time to let it work right now. We've already prepared for this:)

Signed-off-by: Jason Xing <kernelxing@tencent.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jason Xing
2024-02-26 11:22:27 +08:00
committed by David S. Miller
parent b982569593
commit ee01defe25
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/ipv4/tcp_ipv4.c
+7 -5
View File
@@ -1907,7 +1907,6 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
return 0;
}
reason = SKB_DROP_REASON_NOT_SPECIFIED;
if (tcp_checksum_complete(skb))
goto csum_err;
@@ -1917,7 +1916,8 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
if (!nsk)
return 0;
if (nsk != sk) {
if (tcp_child_process(sk, nsk, skb)) {
reason = tcp_child_process(sk, nsk, skb);
if (reason) {
rsk = nsk;
goto reset;
}
@@ -2276,10 +2276,12 @@ process:
if (nsk == sk) {
reqsk_put(req);
tcp_v4_restore_cb(skb);
} else if (tcp_child_process(sk, nsk, skb)) {
tcp_v4_send_reset(nsk, skb);
goto discard_and_relse;
} else {
drop_reason = tcp_child_process(sk, nsk, skb);
if (drop_reason) {
tcp_v4_send_reset(nsk, skb);
goto discard_and_relse;
}
sock_put(sk);
return 0;
}
net/ipv6/tcp_ipv6.c
+10 -6
View File
@@ -1623,7 +1623,6 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
if (np->rxopt.all)
opt_skb = skb_clone_and_charge_r(skb, sk);
reason = SKB_DROP_REASON_NOT_SPECIFIED;
if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */
struct dst_entry *dst;
@@ -1654,8 +1653,11 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
struct sock *nsk = tcp_v6_cookie_check(sk, skb);
if (nsk != sk) {
if (nsk && tcp_child_process(sk, nsk, skb))
goto reset;
if (nsk) {
reason = tcp_child_process(sk, nsk, skb);
if (reason)
goto reset;
}
if (opt_skb)
__kfree_skb(opt_skb);
return 0;
@@ -1854,10 +1856,12 @@ process:
if (nsk == sk) {
reqsk_put(req);
tcp_v6_restore_cb(skb);
} else if (tcp_child_process(sk, nsk, skb)) {
tcp_v6_send_reset(nsk, skb);
goto discard_and_relse;
} else {
drop_reason = tcp_child_process(sk, nsk, skb);
if (drop_reason) {
tcp_v6_send_reset(nsk, skb);
goto discard_and_relse;
}
sock_put(sk);
return 0;
}