]> git.baikalelectronics.ru Git - kernel.git/commitdiff
raw: fix a typo in raw_icmp_error()
authorEric Dumazet <edumazet@google.com>
Thu, 23 Jun 2022 19:35:40 +0000 (19:35 +0000)
committerJakub Kicinski <kuba@kernel.org>
Sat, 25 Jun 2022 05:48:33 +0000 (22:48 -0700)
I accidentally broke IPv4 traceroute, by swapping iph->saddr
and iph->daddr.

Probably because raw_icmp_error() and raw_v4_input()
use different order for iph->saddr and iph->daddr.

Fixes: d83bf44ec1ae ("raw: use more conventional iterators")
Reported-by: John Sperbeck <jsperbeck@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20220623193540.2851799-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv4/raw.c

index 027389969915e456b0009e2a0b4ad81afb836e9d..006c1f0ed8b4731a8c64de282409e4bb03a6c1a6 100644 (file)
@@ -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);
        }