Commit 8eba65fa authored by Menglong Dong's avatar Menglong Dong Committed by David S. Miller
Browse files

net: tcp: use kfree_skb_reason() for tcp_v{4,6}_do_rcv() 



Replace kfree_skb() used in tcp_v4_do_rcv() and tcp_v6_do_rcv() with
kfree_skb_reason().

Reviewed-by: default avatarMengen Sun <mengensun@tencent.com>
Reviewed-by: default avatarHao Peng <flyingpeng@tencent.com>
Signed-off-by: default avatarMenglong Dong <imagedong@tencent.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7a26dc9e

net/ipv4/tcp_ipv4.c

+4 −1
Original line number Diff line number Diff line
@@ -1708,6 +1708,7 @@ INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *, 
 */

int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)

{

	enum skb_drop_reason reason;

	struct sock *rsk;



	if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */
@@ -1730,6 +1731,7 @@ 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;
@@ -1757,7 +1759,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) 
reset:

	tcp_v4_send_reset(rsk, skb);

discard:

	kfree_skb(skb);

	kfree_skb_reason(skb, reason);

	/* Be careful here. If this function gets more complicated and

	 * gcc suffers from register pressure on the x86, sk (in %ebx)

	 * might be destroyed here. This current version compiles correctly,
@@ -1766,6 +1768,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) 
	return 0;



csum_err:

	reason = SKB_DROP_REASON_TCP_CSUM;

	trace_tcp_bad_csum(skb);

	TCP_INC_STATS(sock_net(sk), TCP_MIB_CSUMERRORS);

	TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);

net/ipv6/tcp_ipv6.c

+4 −1
Original line number Diff line number Diff line
@@ -1476,6 +1476,7 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
{

	struct ipv6_pinfo *np = tcp_inet6_sk(sk);

	struct sk_buff *opt_skb = NULL;

	enum skb_drop_reason reason;

	struct tcp_sock *tp;



	/* Imagine: socket is IPv6. IPv4 packet arrives,
@@ -1510,6 +1511,7 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
	if (np->rxopt.all)

		opt_skb = skb_clone(skb, sk_gfp_mask(sk, GFP_ATOMIC));



	reason = SKB_DROP_REASON_NOT_SPECIFIED;

	if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */

		struct dst_entry *dst;
@@ -1563,9 +1565,10 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
discard:

	if (opt_skb)

		__kfree_skb(opt_skb);

	kfree_skb(skb);

	kfree_skb_reason(skb, reason);

	return 0;

csum_err:

	reason = SKB_DROP_REASON_TCP_CSUM;

	trace_tcp_bad_csum(skb);

	TCP_INC_STATS(sock_net(sk), TCP_MIB_CSUMERRORS);

	TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);