| Message ID | 20220623193540.2851799-1-edumazet@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 97a4d46b1516250d640c1ae0c9e7129d160d6a1c |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] raw: fix a typo in raw_icmp_error() | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 23 Jun 2022 19:35:40 +0000 you wrote: > I accidentally broke IPv4 traceroute, by swaping iph->saddr and iph->daddr. > > Probably because raw_icmp_error() and raw_v4_input() > use different order for iph->saddr and iph->daddr. > > Fixes: ba44f8182ec2 ("raw: use more conventional iterators") > Reported-by: John Sperbeck<jsperbeck@google.com> > Signed-off-by: Eric Dumazet <edumazet@google.com> > > [...] Here is the summary with links: - [net-next] raw: fix a typo in raw_icmp_error() https://git.kernel.org/netdev/net-next/c/97a4d46b1516 You are awesome, thank you!
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 027389969915e456b0009e2a0b4ad81afb836e9d..006c1f0ed8b4731a8c64de282409e4bb03a6c1a6 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -278,7 +278,7 @@ void raw_icmp_error(struct sk_buff *skb, int protocol, u32 info) sk_nulls_for_each(sk, hnode, hlist) { iph = (const struct iphdr *)skb->data; if (!raw_v4_match(net, sk, iph->protocol, - iph->saddr, iph->daddr, dif, sdif)) + iph->daddr, iph->saddr, dif, sdif)) continue; raw_err(sk, skb, info); }
I accidentally broke IPv4 traceroute, by swaping iph->saddr and iph->daddr. Probably because raw_icmp_error() and raw_v4_input() use different order for iph->saddr and iph->daddr. Fixes: ba44f8182ec2 ("raw: use more conventional iterators") Reported-by: John Sperbeck<jsperbeck@google.com> Signed-off-by: Eric Dumazet <edumazet@google.com> --- net/ipv4/raw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)