From patchwork Wed Mar 27 19:58:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Suryaputra X-Patchwork-Id: 1067449 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oX0krloR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44V1KY3Zx5z9sPZ for ; Thu, 28 Mar 2019 08:26:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727358AbfC0V04 (ORCPT ); Wed, 27 Mar 2019 17:26:56 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:45287 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726275AbfC0V0z (ORCPT ); Wed, 27 Mar 2019 17:26:55 -0400 Received: by mail-qk1-f195.google.com with SMTP id z76so10847379qkb.12 for ; Wed, 27 Mar 2019 14:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=xOiacIJgXzSfhWJn1QyKmO3ZBpJvpfxCdaMXI4EjmDc=; b=oX0krloR5qhNY6qskH9lSTvHZjYGcVtbU4H7Vf8vUYNDTVDVEI08oH3Ka2NMzr5gB0 x+VOB8M+741RxpLr5BPDgiaMeef6BLjL7Lx25otCo9ZV0GFUanTwtGWNW3B2xru5w+l+ xvH8u/ulaGYyYkwM3MhzjCc5d+dTUiCcMbhFEvs41NA1QblDSHHYfId5/5umNKEi7bn8 eqjEMwgzFnHgbu3YkJVubIB/gyZB70Tg26KFqDRzn2qxli3w0kVkDHDtXmP+E/3rox0U PgO4tG7QS1IKjMeH7VyQKwlFmDhS40G/tMLJ4C+M7kTO8pqdtpC/3LDzDzQc9ZM2adPf I0EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xOiacIJgXzSfhWJn1QyKmO3ZBpJvpfxCdaMXI4EjmDc=; b=Tt+LD6UCEXqCjbuYB/bxnSikXX/Kw029YFfwHyopt/XBbIRFaUNSB5joHhOAxp4ey8 nI1aC9p3Wpqt/Tg8ahqO1Fr9/P7B3sg5fNKokbkIdj2YwRFPfB6rVIZBQgAamMdYG8fY Q5IJ4t2MnZRDEuC52MPAZHf4H3Uh3+nR1vHV7WAkDl0Sq083nfiE8u6coMYxCYodEWcF N4B2Y0/+vV/Wjl89QIYJVFYdfGMzdILMgjSysm8gN0QtzK5IIOVQSddXKEaT/N88I4ju AEm7fyDGXeM1beM6uGucTmxsUIaKKd+b1d0UfedgD2lRf6B//08kl8LzVNMqSq2rApia vrag== X-Gm-Message-State: APjAAAWOOjJiKAXqTxazUvBikgD7QV2Jifxgdgj2RbaW3w3VSQy4sWBj AGiOTNOaKIyA5HmyKlVPJ/IF9Qo= X-Google-Smtp-Source: APXvYqzx8SbfjS0AptWtcG768pWh+l9CtfagZhg+SQCQqzx8YIJNTvdpdo2qLfeYsUU/ENtqhBM8cg== X-Received: by 2002:a37:c203:: with SMTP id i3mr29895781qkm.295.1553722014606; Wed, 27 Mar 2019 14:26:54 -0700 (PDT) Received: from ubuntu.extremenetworks.com ([12.38.14.8]) by smtp.gmail.com with ESMTPSA id q51sm16120949qte.29.2019.03.27.14.26.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 14:26:54 -0700 (PDT) From: Stephen Suryaputra To: netdev@vger.kernel.org Cc: Stephen Suryaputra Subject: [PATCH net, v2] vrf: check accept_source_route on the original netdevice Date: Wed, 27 Mar 2019 15:58:48 -0400 Message-Id: <20190327195848.7080-1-ssuryaextr@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Configuration check to accept source route IP options should be made on the incoming netdevice when the skb->dev is an l3mdev master. The route lookup for the source route next hop also needs the incoming netdev. Signed-off-by: Stephen Suryaputra --- net/ipv4/ip_input.c | 3 +++ net/ipv4/ip_options.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index ecce2dc78f17..754176222ef6 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c @@ -263,6 +263,9 @@ static inline bool ip_rcv_options(struct sk_buff *skb) const struct iphdr *iph; struct net_device *dev = skb->dev; + if (netif_is_l3_master(dev)) + dev = __dev_get_by_index(dev_net(dev), IPCB(skb)->iif); + /* It looks as overkill, because not all IP options require packet mangling. But it is the easiest for now, especially taking diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index 32a35043c9f5..99f37591d7c1 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -620,6 +620,7 @@ int ip_options_rcv_srr(struct sk_buff *skb) struct iphdr *iph = ip_hdr(skb); unsigned char *optptr = skb_network_header(skb) + opt->srr; struct rtable *rt = skb_rtable(skb); + struct net_device *dev = skb->dev; struct rtable *rt2; unsigned long orefdst; int err; @@ -638,6 +639,9 @@ int ip_options_rcv_srr(struct sk_buff *skb) if (rt->rt_type != RTN_LOCAL) return -EINVAL; + if (netif_is_l3_master(dev)) + dev = __dev_get_by_index(dev_net(dev), IPCB(skb)->iif); + for (srrptr = optptr[2], srrspace = optptr[1]; srrptr <= srrspace; srrptr += 4) { if (srrptr + 3 > srrspace) { icmp_send(skb, ICMP_PARAMETERPROB, 0, htonl((opt->srr+2)<<24)); @@ -647,7 +651,7 @@ int ip_options_rcv_srr(struct sk_buff *skb) orefdst = skb->_skb_refdst; skb_dst_set(skb, NULL); - err = ip_route_input(skb, nexthop, iph->saddr, iph->tos, skb->dev); + err = ip_route_input(skb, nexthop, iph->saddr, iph->tos, dev); rt2 = skb_rtable(skb); if (err || (rt2->rt_type != RTN_UNICAST && rt2->rt_type != RTN_LOCAL)) { skb_dst_drop(skb);