summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMiguel Fadon Perlines <mfadon@teldat.com>2018-04-05 10:25:38 +0200
committerDavid S. Miller <davem@davemloft.net>2018-04-05 22:05:03 -0400
commit58b35f27689b5eb514fc293c332966c226b1b6e4 (patch)
tree6295726be33da14559afceabb1547cd1fca24b19 /net
parentd68a19f89bcfa53cc2aaa3153d7243226df08456 (diff)
downloadlinux-58b35f27689b5eb514fc293c332966c226b1b6e4.tar.bz2
arp: fix arp_filter on l3slave devices
arp_filter performs an ip_route_output search for arp source address and checks if output device is the same where the arp request was received, if it is not, the arp request is not answered. This route lookup is always done on main route table so l3slave devices never find the proper route and arp is not answered. Passing l3mdev_master_ifindex_rcu(dev) return value as oif fixes the lookup for l3slave devices while maintaining same behavior for non l3slave devices as this function returns 0 in that case. Fixes: 613d09b30f8b ("net: Use VRF device index for lookups on TX") Signed-off-by: Miguel Fadon Perlines <mfadon@teldat.com> Acked-by: David Ahern <dsa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/arp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index be4c595edccb..bf6c2d4d4fdc 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -437,7 +437,7 @@ static int arp_filter(__be32 sip, __be32 tip, struct net_device *dev)
/*unsigned long now; */
struct net *net = dev_net(dev);
- rt = ip_route_output(net, sip, tip, 0, 0);
+ rt = ip_route_output(net, sip, tip, 0, l3mdev_master_ifindex_rcu(dev));
if (IS_ERR(rt))
return 1;
if (rt->dst.dev != dev) {