From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1211789-1520117900-2-3511879344286007811 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.249, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1520117899; b=DrdNkax3E5/3qAl3K1+Acgc7Xjyau3q/IcGujUaDVXd0dL1 ZBgijBc7c1AYP6+UaP3aplCz9EfdsUmhxCLO98Eeaf39oAtb4APfj+crELsaVL2h Wy1wNnSLEUfCzLCh+yfaWQICVRxOsdKdR23sYl3IwiXnDAxw6jmj3+6YLKlG6w9E K2oEP5VprBqRbfBpViMEajbi03mdyAmQyaHAcw16ki98IZV8gZPcCjIkJeFZLNjL FrKFP+Y82lB86HWXNNopAg9hfed+iKBHercSdvPS5EHGXLGX+Zhem/vQcvXhkJk8 yp0Bdpn/5zilgipfgYb2N7QUfAYANaAiwLJdo3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1520117899; bh=6Jty69 X6xbpw7LWlkqNonxsyNAElVRQTQ4UZSH1EZcY=; b=dpO3jzpRD23NdJfgO+nFJu k4WlHZcqKyZVYaBsV6VMC+LqZdNZ7yWpqG5CFlBt4Q01NpPsoIIshru2driehsVW S3POWPLNFYw+o5HFON2n48cBt5Kc4PyJcmVBlhRidNtGsA2qSaEsIXF1ek7v9iCC dBq7ERM6GuBb+9ke+MG4xLOQelaeoysR5TE00vBj2z5KSBT3Dt5nt8IH9LMQfd2p 3soYJj0squuW9GudXFIQykzq5h8g11imAejuhMNMMrJs5fTQeLGTrO2gdYsH9mPl pdFAPZZQZwHPJ00C7n8aOFTNk6nOQ+Ug3liThTIbGVEk/GJpm4g22wJXABzm7WOQ == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=NHbSErm8 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=NHbSErm8 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934394AbeCCW5s (ORCPT ); Sat, 3 Mar 2018 17:57:48 -0500 Received: from mail-cys01nam02on0109.outbound.protection.outlook.com ([104.47.37.109]:30112 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935343AbeCCWk4 (ORCPT ); Sat, 3 Mar 2018 17:40:56 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Mahesh Bandewar , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 113/115] ipvlan: add L2 check for packets arriving via virtual devices Thread-Topic: [PATCH AUTOSEL for 4.4 113/115] ipvlan: add L2 check for packets arriving via virtual devices Thread-Index: AQHTsz9wv3x2oDnM1E6mBSt9NKUR3g== Date: Sat, 3 Mar 2018 22:31:57 +0000 Message-ID: <20180303223010.27106-113-alexander.levin@microsoft.com> References: <20180303223010.27106-1-alexander.levin@microsoft.com> In-Reply-To: <20180303223010.27106-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MWHSPR01MB344;6:YkWJN3bmtAr+jhgpZEUeqD5rmp30JHC8oZmysNGN0MfD2aVuTOkRUY1n4u0FGgQQ/Y+QkpV4Ci3fxbmjEiAGVN2ll17Gcx3QxGOCtCswSqUb8ulkhIMT9HKfKrZltYkPyoovOdfLxTSnPdIlTAdu5k4w6CN223A1K+mC6sY1SSAi/2kqRs/1GUq36QdXfF2KXGMgNa8O9rT6LlckkpN6RwMsMPQlX+ALv5BBohsezx2a0oucpp9NN5VVK0mkynw6rqjIAzZ8Ko+WUm8SDKjqLF1Q77wotUY19GfgTfIDYS/LKMbkEl8QCewmIwrV7b7B4PtDU9IHQIDddXPzuTJkt29Kud+q1fElLbnWAHaCEcPFSj+OYFQbNriuIJaU4x9H;5:3QgHF4TDoQyMH47JXgu008tgsmTWrpd8zaZLv2aC6ExPm6RUiSDHZryB7RnfUxtlkq/xhQJEQZcnxQQef57LIWG5sFvsN4DbL3eWz7i6G7PV3LuS5Nazj2Nu3dBlONIbcP7O0hwYmOyg1EZ1I2D4VcExZL92JL2st/Ld662WBY8=;24:BxlRe+7n7XlIJ0pDVeNp1uW7TEciMbZdB8eYg3SSelFz6h18s4k6WhEmiJsWod9tFJ9TFbyT1uE6xKQfymz7eSf8P8lYJn2M1H5N6MaO5Jc=;7:KWkEi6oMANnmyx/0vGXjvAREzdtzZT/Pf42JkM/1+LiZTfgrY25W4Xpl3DErzVvjBXBnJvtlMSGOGkeZkykS+18kxgbcGoUHwKzRbSyK3NExGIBhpe+D5WLKcg9YdhH61iFCe0MRGSDAry/TUeCPyGsCBCQsNrsSfx2gDSvmRLyCWquscaHMgdXEZ225SZyrmpzR4J3gG1pFq3NXZgbhA6TvO0jg8AF6NLDtQ9NvKs8/+KZ/tPXw5FqGEX8g6WRK x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 672e2bf5-9aab-4ad8-c25f-08d58157d239 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MWHSPR01MB344; x-ms-traffictypediagnostic: MWHSPR01MB344: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(37575265505322)(28532068793085)(89211679590171)(211936372134217)(153496737603132); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3231220)(944501244)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011);SRVR:MWHSPR01MB344;BCL:0;PCL:0;RULEID:;SRVR:MWHSPR01MB344; x-forefront-prvs: 0600F93FE1 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(376002)(346002)(39860400002)(366004)(39380400002)(189003)(199004)(8676002)(5660300001)(5250100002)(2501003)(6506007)(575784001)(7736002)(36756003)(25786009)(3846002)(6116002)(97736004)(305945005)(2900100001)(76176011)(6436002)(10090500001)(26005)(8936002)(186003)(81166006)(102836004)(81156014)(106356001)(86362001)(10290500003)(3660700001)(2906002)(99286004)(14454004)(86612001)(105586002)(478600001)(4326008)(6486002)(53936002)(107886003)(68736007)(316002)(54906003)(110136005)(6512007)(72206003)(3280700002)(22452003)(2950100002)(1076002)(66066001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHSPR01MB344;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: bI43fRJQTmeADte/qIz2vPwsJVrYsWivPy7MjFAYTY0lNiGmaJoURVm7yaINA3qsAoh7ejtsw0+Nimgh7Nsm4lww8uyxwUIKl7h9QbXk6XHj8N6xdhMo8AzUd4PXTnyI/RC/XsfuunJcuGd20Amn+Py6b9QVs9ABX3O8Qb3Eoek= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 672e2bf5-9aab-4ad8-c25f-08d58157d239 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:31:57.1520 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHSPR01MB344 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Mahesh Bandewar [ Upstream commit 92ff42645028fa6f9b8aa767718457b9264316b4 ] Packets that don't have dest mac as the mac of the master device should not be entertained by the IPvlan rx-handler. This is mostly true as the packet path mostly takes care of that, except when the master device is a virtual device. As demonstrated in the following case - ip netns add ns1 ip link add ve1 type veth peer name ve2 ip link add link ve2 name iv1 type ipvlan mode l2 ip link set dev iv1 netns ns1 ip link set ve1 up ip link set ve2 up ip -n ns1 link set iv1 up ip addr add 192.168.10.1/24 dev ve1 ip -n ns1 addr 192.168.10.2/24 dev iv1 ping -c2 192.168.10.2 ip neigh show dev ve1 ip neigh show 192.168.10.2 lladdr dev ve1 ping -c2 192.168.10.2 This patch adds that missing check in the IPvlan rx-handler. Reported-by: Amit Sikka Signed-off-by: Mahesh Bandewar Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ipvlan/ipvlan_core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_c= ore.c index 8aecea0d5dbf..142015af43db 100644 --- a/drivers/net/ipvlan/ipvlan_core.c +++ b/drivers/net/ipvlan/ipvlan_core.c @@ -282,6 +282,10 @@ static int ipvlan_rcv_frame(struct ipvl_addr *addr, st= ruct sk_buff **pskb, if (dev_forward_skb(ipvlan->dev, skb) =3D=3D NET_RX_SUCCESS) success =3D true; } else { + if (!ether_addr_equal_64bits(eth_hdr(skb)->h_dest, + ipvlan->phy_dev->dev_addr)) + skb->pkt_type =3D PACKET_OTHERHOST; + ret =3D RX_HANDLER_ANOTHER; success =3D true; } --=20 2.14.1