net: ipv4: dst for local input routes should use l3mdev if relevant

David Ahern · davem330 · commit f5a0aab84b74 · 2016-12-29T22:27:23.000-05:00
IPv4 output routes already use l3mdev device instead of loopback for dst's if it is applicable. Change local input routes to do the same. This fixes icmp responses for unreachable UDP ports which are directed to the wrong table after commit 9d1a6c4 because local_input routes use the loopback device. Moving from ingress device to loopback loses the L3 domain causing responses based on the dst to get to lost. Fixes: 9d1a6c4 ("net: icmp_route_lookup should use rt dev to determine L3 domain") Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
@@ -1914,7 +1914,8 @@ out:	return err;
 		}
 	}
 
-	rth = rt_dst_alloc(net->loopback_dev, flags | RTCF_LOCAL, res.type,
+	rth = rt_dst_alloc(l3mdev_master_dev_rcu(dev) ? : net->loopback_dev,
+			   flags | RTCF_LOCAL, res.type,
 			   IN_DEV_CONF_GET(in_dev, NOPOLICY), false, do_cache);
 	if (!rth)
 		goto e_nobufs;

Original file line number	Diff line number	Diff line change
`@@ -1914,7 +1914,8 @@ out: return err;`
`1914`	`1914`	`}`
`1915`	`1915`	`}`
`1916`	`1916`
`1917`		`- rth = rt_dst_alloc(net->loopback_dev, flags \| RTCF_LOCAL, res.type,`
	`1917`	`+ rth = rt_dst_alloc(l3mdev_master_dev_rcu(dev) ? : net->loopback_dev,`
	`1918`	`+ flags \| RTCF_LOCAL, res.type,`
`1918`	`1919`	`IN_DEV_CONF_GET(in_dev, NOPOLICY), false, do_cache);`
`1919`	`1920`	`if (!rth)`
`1920`	`1921`	`goto e_nobufs;`