From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt0-f193.google.com ([209.85.216.193]:35054 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752615AbeB1OrI (ORCPT ); Wed, 28 Feb 2018 09:47:08 -0500 Received: by mail-qt0-f193.google.com with SMTP id z14so3246978qti.2 for ; Wed, 28 Feb 2018 06:47:07 -0800 (PST) From: Stephen Suryaputra To: netdev@vger.kernel.org Cc: Stephen Suryaputra Subject: [PATCH net,v2] vrf: check forwarding on the original netdevice when generating ICMP dest unreachable Date: Wed, 28 Feb 2018 09:46:59 -0500 Message-Id: <1519829219-29623-1-git-send-email-ssuryaextr@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: When ip_error() is called the device is the l3mdev master instead of the original device. So the forwarding check should be on the original one. Changes from v1: - Only need to reset the device on which __in_dev_get_rcu() is done (per David Ahern). Signed-off-by: Stephen Suryaputra --- net/ipv4/route.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index a4f44d8..89c020f 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -930,19 +930,26 @@ void ip_rt_send_redirect(struct sk_buff *skb) static int ip_error(struct sk_buff *skb) { - struct in_device *in_dev = __in_dev_get_rcu(skb->dev); struct rtable *rt = skb_rtable(skb); + struct net_device *dev = skb->dev; + struct in_device *in_dev; struct inet_peer *peer; unsigned long now; struct net *net; bool send; int code; + net = dev_net(rt->dst.dev); + + if (netif_is_l3_master(skb->dev)) + dev = __dev_get_by_index(net, IPCB(skb)->iif); + + in_dev = __in_dev_get_rcu(dev); + /* IP on this device is disabled. */ if (!in_dev) goto out; - net = dev_net(rt->dst.dev); if (!IN_DEV_FORWARD(in_dev)) { switch (rt->dst.error) { case EHOSTUNREACH: -- 2.7.4