tcp: make dropreason in tcp_child_process() work

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>

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index c79e2554997272efb9104a0d0d2d77d5e32e65ec..a22ee58387518ac5ea602d0f66be41dfa0f4c1ee 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -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;
                }

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 4f8464e04b7f1b9c8312cd4550c9843b2eb3dd4b..f677f0fa51968d00c3571d55ae7850742387f2d1 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -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;
                }