Commit ee01defe authored by Jason Xing's avatar Jason Xing Committed by David S. Miller
Browse files

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: default avatarJason Xing <kernelxing@tencent.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b9825695

net/ipv4/tcp_ipv4.c

+7 −5
Original line number Diff line number Diff line
@@ -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 @@ int tcp_v4_rcv(struct sk_buff *skb) 
		if (nsk == sk) {

			reqsk_put(req);

			tcp_v4_restore_cb(skb);

		} else if (tcp_child_process(sk, nsk, skb)) {

		} else {

			drop_reason = tcp_child_process(sk, nsk, skb);

			if (drop_reason) {

				tcp_v4_send_reset(nsk, skb);

				goto discard_and_relse;

		} else {

			}

			sock_put(sk);

			return 0;

		}

net/ipv6/tcp_ipv6.c

+10 −6
Original line number Diff line number Diff line
@@ -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))

			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 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) 
		if (nsk == sk) {

			reqsk_put(req);

			tcp_v6_restore_cb(skb);

		} else if (tcp_child_process(sk, nsk, skb)) {

		} else {

			drop_reason = tcp_child_process(sk, nsk, skb);

			if (drop_reason) {

				tcp_v6_send_reset(nsk, skb);

				goto discard_and_relse;

		} else {

			}

			sock_put(sk);

			return 0;

		}