Commit 23917494 authored May 25, 2020 by Eric Dumazet Committed by David S. Miller May 26, 2020

tcp: tcp_v4_err() icmp skb is named icmp_skb



I missed the fact that tcp_v4_err() differs from tcp_v6_err().

After commit 4d1a2d9e ("Rename skb to icmp_skb in tcp_v4_err()")
the skb argument has been renamed to icmp_skb only in one function.

I will in a future patch reconciliate these functions to avoid
this kind of confusion.

Fixes: 45af29ca ("tcp: allow traceroute -Mtcp for unpriv users")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d52caf04

net/ipv4/tcp_ipv4.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -573,7 +573,7 @@ int tcp_v4_err(struct sk_buff *icmp_skb, u32 info)
		if (fastopen && !fastopen->sk)
		break;

		ip_icmp_error(sk, skb, err, th->dest, info, (u8 *)th);
		ip_icmp_error(sk, icmp_skb, err, th->dest, info, (u8 *)th);

		if (!sock_owned_by_user(sk)) {
		sk->sk_err = err;

Admin message