[PATCH 3.12 72/86] net: ipv4: fix multipath RTM_GETROUTE behavior when iif is given

From: Jiri Slaby
Date: Thu May 04 2017 - 05:11:58 EST

From: Florian Larysch <fl@xxxxxxx>

3.12-stable review patch. If anyone has any objections, please let me know.


[ Upstream commit a8801799c6975601fd58ae62f48964caec2eb83f ]

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@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
net/ipv4/route.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 1b180691086c..778b3e9316db 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2492,7 +2492,7 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh)

/* 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_be32(tb[RTA_SRC]) : 0;