]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
net: ipv4: fix multipath RTM_GETROUTE behavior when iif is given
authorFlorian Larysch <fl@n621.de>
Mon, 3 Apr 2017 14:46:09 +0000 (16:46 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Apr 2017 19:18:56 +0000 (12:18 -0700)
inet_rtm_getroute synthesizes a skeletal ICMP skb, which is passed to
ip_route_input when iif is given. If a multipath route is present for
the designated destination, ip_multipath_icmp_hash ends up being called,
which uses the source/destination addresses within the skb to calculate
a hash. However, those are not set in the synthetic skb, causing it to
return an arbitrary and incorrect result.

Instead, use UDP, which gets no such special treatment.

Signed-off-by: Florian Larysch <fl@n621.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/route.c

index 8471dd116771462d149e1da2807e446b69b74bcc..acd69cfe2951ed89213403b3e9556da6ddd50ba8 100644 (file)
@@ -2620,7 +2620,7 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh)
        skb_reset_network_header(skb);
 
        /* Bugfix: need to give ip_route_input enough of an IP header to not gag. */
-       ip_hdr(skb)->protocol = IPPROTO_ICMP;
+       ip_hdr(skb)->protocol = IPPROTO_UDP;
        skb_reserve(skb, MAX_HEADER + sizeof(struct iphdr));
 
        src = tb[RTA_SRC] ? nla_get_in_addr(tb[RTA_SRC]) : 0;