From patchwork Wed Mar 27 18:27: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: 1067381 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="qsWevJj0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44TzJ35yhJz9sNt for ; Thu, 28 Mar 2019 06:55:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728732AbfC0Tza (ORCPT ); Wed, 27 Mar 2019 15:55:30 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:35365 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727436AbfC0Tza (ORCPT ); Wed, 27 Mar 2019 15:55:30 -0400 Received: by mail-qt1-f195.google.com with SMTP id h39so20426390qte.2 for ; Wed, 27 Mar 2019 12:55:29 -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=RhtBrClFaXiN9/PwgrusWBmqqQKzgO0VTd019/kF81g=; b=qsWevJj0PFMmGhlMcez9/qRbkTdhbVNtN/odZSijF0+Zjuxuqd5xIT3pYgzxlLjY5n PqVsuc2r9FfNHRsOzIztHI//G2eeHU9dOAXdDFBz5oBSdz+Tif+TRCF6wdbmcy9OffnV 48sxScAUAjTAtrcdb5SuX9H9cswmu9zR0J8fdybluZstOvW3fDseAFYd2Vx/UpoDcQf9 w7QRMuxwOUkWrzB6aIWN+dbig4jAgEoRGWPaEU1m6YejQDswuEtm/F7mEMZll6GL9F3t amvT+3mKM0c3jn7QdBc43aHJ6rt/Tnbw6R+d+nlsE0HtWnW6N9uHLZdtM9nhOlHJbpmH nOfg== 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=RhtBrClFaXiN9/PwgrusWBmqqQKzgO0VTd019/kF81g=; b=UDrlEPH7fIRgRfm8U1Wk9pW90DCsuj1rJXwg996bNv/iGfWcJLzdLe1KVIfr2l3Yju cBP7BUupDEQDlXSDdV/JZ200DIyJv74X3zNfLOvk+iyWTGZYlavD1byzFOMMhc6BExUT 5Wn16JSkKHaV5hCkwk9aN/A5i2QOci12meO9YsKIPgT4gUhBjxsYO8Uz68PSwfTgYopJ cP8+59c7PWthoBUJRJ0h9o67FDoW3HnNAic3oscf5UjBDDxe7/FQIU83tkmGw0A39A+u pwzY0r1ZBIlJ93trEqGrIU6J9har0QvFU2nvt2umTxS7k4yBKZxKNKMlA6/MOlS3fBZc zMig== X-Gm-Message-State: APjAAAUWifX4aouOm6ZzJr51NFiMOz/mrXj57sPc2DSdiS9iL5Sd1Iua 6B0IYA4zP7yRTBeB7m1VKD/1USI= X-Google-Smtp-Source: APXvYqzsjX856zFyQi77P8ZjVuPXucysaUkEvyoGTlPw3mJovReKaBnu8Sf4UB50WkKI+9utpaxWCA== X-Received: by 2002:ac8:1091:: with SMTP id a17mr31249305qtj.135.1553716529190; Wed, 27 Mar 2019 12:55:29 -0700 (PDT) Received: from ubuntu.extremenetworks.com ([12.38.14.8]) by smtp.gmail.com with ESMTPSA id q51sm4971558qtc.38.2019.03.27.12.55.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 12:55:28 -0700 (PDT) From: Stephen Suryaputra To: netdev@vger.kernel.org Cc: Stephen Suryaputra Subject: [PATCH net] vrf: check accept_source_route on the original netdevice Date: Wed, 27 Mar 2019 14:27:48 -0400 Message-Id: <20190327182748.17501-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. Signed-off-by: Stephen Suryaputra --- net/ipv4/ip_input.c | 3 +++ 1 file changed, 3 insertions(+) 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