tcp: tcp_v4_err() icmp skb is named icmp_skb
Subsystems (3)
PATCH 1/1 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 4d1a2d9ec1c1 ("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 45af29ca761c ("tcp: allow traceroute -Mtcp for unpriv users")
Signed-off-by Eric Dumazet <[email protected]>
--- net/ipv4/tcp_ipv4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp_ipv4.c +1 -1
@@ -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;
Signature · 1 line
2.27.0.rc0.183.gde8f92d652-goog
From: Eric Dumazet <[email protected]>
Date: Mon, 25 May 2020 20:15:24 -0700
Quoted 10 lines
I missed the fact that
tcp_v4_err()differs fromtcp_v6_err().After commit
4d1a2d9ec1c1("Rename skb toicmp_skbintcp_v4_err()") the skb argument has been renamed toicmp_skbonly in one function.I will in a future patch reconciliate these functions to avoid this kind of confusion.
Fixes 45af29ca761c ("tcp: allow traceroute -Mtcp for unpriv users")Signed-off-by Eric Dumazet <[email protected]>
Applied.