From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZrtTvGof7Xje7IC4R4M9nc/7F1ozyLYtV/7EgaPPMhcrEw6BnWNEVRIGc5xjqZE66cAxI9b ARC-Seal: i=1; a=rsa-sha256; t=1526631434; cv=none; d=google.com; s=arc-20160816; b=O6cgzAq1X9d5G4Jx5hFRTjlsLHhyC91fKA3+ElPGdw99nnWy2jGgPhH8V8eJb1nwyG GQ+ooS5DPVYEdknXH3fUUJ4aRUJekck22Zb7TQuyvP29A/UmHnBy92lBFoxRdqePZuLT LdrMrFEN5gVDGMR/sqLLppaYzGYTd9u+m1cKZj/gaQmbHmtRcb8M42fjQq+kyYwZJ39S OQI8P6H1xOumkXDCuxhRDMp6IGlqowMQ6TMwUVDpnKskJLugBPMlPII42xBlHS0n9XRx nmwHhYR054fsL70dBW35462TJbciUEFLHPIgGYfafnVwLd/In2TiCyf+ahmS0C4Wl6wa SIfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=UbJX4PIf0AuyrbJBv1OEY11eQCqyvAxv3Mo8bRpZZo8=; b=ZrN2uaFaKTx2cejltsntxPnYW3ucvFfed5ohoBe1JeCnLRiJXYOXwTTeBQ3K3ko67i EhfhTTiO24u20Wp6I5/pNnFc112WWLfLj7HRrrU8uKe7Io5vQjbbL/BN52bazyFHjhS1 kiaKVfBd8kGgOBxSg62r650Hf4LM+iGk64M6yPHJgbfrzmt9DdF+fssxbJHoKaMwaa5v jnO7ML9EL0N/KJqD1K5vWQoGp0YQwrokGxMMRLQTmUyMTjpkyXdKumn4RhhX5/bgU/99 eWF8LuX1IuRhG/eQV2WqXahGhFpmEKaxrt6tD5qDh3Jrjc8GEPYslinD+MUVPTMRZqs8 uPUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jrlBLIuC; spf=pass (google.com: domain of srs0=xuy6=if=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=XuY6=IF=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jrlBLIuC; spf=pass (google.com: domain of srs0=xuy6=if=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=XuY6=IF=linuxfoundation.org=gregkh@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Grygorii Strashko , "David S. Miller" Subject: [PATCH 4.16 08/55] net: ethernet: ti: cpsw: fix packet leaking in dual_mac mode Date: Fri, 18 May 2018 10:15:04 +0200 Message-Id: <20180518081457.782849746@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518081457.428920292@linuxfoundation.org> References: <20180518081457.428920292@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1600789083638521342?= X-GMAIL-MSGID: =?utf-8?q?1600789083638521342?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Grygorii Strashko [ Upstream commit 5e5add172ea81152d518b161ec5706503ad3d799 ] In dual_mac mode packets arrived on one port should not be forwarded by switch hw to another port. Only Linux Host can forward packets between ports. The below test case (reported in [1]) shows that packet arrived on one port can be leaked to anoter (reproducible with dual port evms): - connect port 1 (eth0) to linux Host 0 and run tcpdump or Wireshark - connect port 2 (eth1) to linux Host 1 with vlan 1 configured - ping from Host 1 through vlan 1 interface. ARP packets will be seen on Host 0. Issue happens because dual_mac mode is implemnted using two vlans: 1 (Port 1+Port 0) and 2 (Port 2+Port 0), so there are vlan records created for for each vlan. By default, the ALE will find valid vlan record in its table when vlan 1 tagged packet arrived on Port 2 and so forwards packet to all ports which are vlan 1 members (like Port. To avoid such behaviorr the ALE VLAN ID Ingress Check need to be enabled for each external CPSW port (ALE_PORTCTLn.VID_INGRESS_CHECK) so ALE will drop ingress packets if Rx port is not VLAN member. Signed-off-by: Grygorii Strashko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/ti/cpsw.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1278,6 +1278,8 @@ static inline void cpsw_add_dual_emac_de cpsw_ale_add_ucast(cpsw->ale, priv->mac_addr, HOST_PORT_NUM, ALE_VLAN | ALE_SECURE, slave->port_vlan); + cpsw_ale_control_set(cpsw->ale, slave_port, + ALE_PORT_DROP_UNKNOWN_VLAN, 1); } static void soft_reset_slave(struct cpsw_slave *slave)