From patchwork Mon Mar 12 13:56:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 884518 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ICUaqslk"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iB0xM+e4"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 400KLC5fZpz9sSk for ; Tue, 13 Mar 2018 00:57:23 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=c2bUhL9bI7V99IfMjTZgOccrlAgytUHEueXJE9atjFw=; b=ICUaqslk/MQjun 6v95HCU9lfPIPDiewK9i8/SuR5FVBo5XZHqY53EQgx5sKWDuZ5cK/+siUW8nsxvpBttQTlwfwBCcy vVK8A34g5rK08wT5EkJOEQFnPOga6x2oy2Fcl6e3BGOQ9fMbP5dh4AxW1xxKDMDh3kgxJ8uAPKXHh Y/IXW1+qLs2FP3MAZFMv/k8bFkXTFzwL87kmemNNJr3m2RTPlQ4dh4tfS7HyTrTQePiiYxin0DyvU HQEI9DYtDQzVPcMh9oEUJ9Vml8fbPQKBI1vsOShV5xy2OVxmbBugVe0XqvBb7Zzg+0Fh7+9lVaY4t iz1w5ngT00wsMoSQocRQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1evNwh-0007G1-Qn; Mon, 12 Mar 2018 13:56:59 +0000 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1evNwb-0007Dp-BL for lede-dev@lists.infradead.org; Mon, 12 Mar 2018 13:56:57 +0000 Received: by mail-lf0-x241.google.com with SMTP id m69-v6so23348246lfe.8 for ; Mon, 12 Mar 2018 06:56:42 -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:mime-version :content-transfer-encoding; bh=GD2Rp+vcVswJpplz6PX1NoidCLjiSw2IrR3g0xkKzfk=; b=iB0xM+e4V03xUej4gB6VSH+efr7VZkzABMTQA2tdIvPAaCY8u9sXaUgLYC0k1vem2A SThxc6BgzaiQIVhUQ2rxy0ifAZc+jyqbMSKvJnQUfOU9QPX2GpzOP4ydIVFX6wT2CHSW ZYeVCS22qtXhGdCO3H4Sw4MkrkqUpJNnC7s3CXyMm71yi/vtpkFyyPywExCXx+D3QgwT 86TZRgJ+t2FszkJribgnZd88DSXNf3FrYXIBPJq6bpnzI+8HwpOZdeAoEBQPZa3cDmd1 eRk4j3++4zwg4o1nkExHxwmokUStxjbW24P4R5oK54RizPcCokP/yP1EXPV1ComJhPXD CvyQ== 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:mime-version :content-transfer-encoding; bh=GD2Rp+vcVswJpplz6PX1NoidCLjiSw2IrR3g0xkKzfk=; b=cEobm7zZUnbj0PTezGg6sMSSpBNJpel1pL1FBXPwftaYLRH9JC2O0oaWyBQiXZaxj5 +J8aKx1w5gfBh6+66vf2NBJ6UCGKTrCBoBbto5vqf8L5Yg2VHFzNgavlVpZqaMqYA6RT 019fRZnD2+6qDar1uVVAd+al5YxPV8UhFvuec74r43bvao5JvJ5pncvPrGjCaFfRNJ9P MnGBzvXfMKVis1TErysuIK0W+ss25BxG5/YSM0xxq8Ok0KsncEqzfv2iGxBxpKT7ydey R/jKQsgBiDnYS0rvjhSaTA/LQAxmOMkueCza4aZbE9rej/rMXPLL820w11E/SXyZ+kDN rhkA== X-Gm-Message-State: AElRT7GU4UUmBZzCh6+lCk/ZfIIlQxdBuz9gJKo/vMgaTcM5bwk7da06 DvlP+vuD81pwsrTGn++FHEY= X-Google-Smtp-Source: AG47ELunbIn+1hzSA4sHJQpA3602DxTSxE5dRB+xTZGNzr0kFGyMA+UluxPpSW6nH2gp0lFGwamaWg== X-Received: by 2002:a19:3b4f:: with SMTP id i76-v6mr5030013lfa.28.1520863000882; Mon, 12 Mar 2018 06:56:40 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id e123-v6sm1782351lfg.47.2018.03.12.06.56.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Mar 2018 06:56:40 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Felix Fietkau , lede-dev@lists.infradead.org Date: Mon, 12 Mar 2018 14:56:28 +0100 Message-Id: <20180312135628.7864-1-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180312_065653_593929_78DD853E X-CRM114-Status: GOOD ( 14.62 ) X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4010:c07:0:0:0:241 listed in] [list.dnswl.org] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH] kernel: drop patch hacking bridge to accept EAP only locally X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Rafał Miłecki EAPOL frames have wireless interface address specified as destination. That makes "dst->is_local" condition true for them and results in upstream code processing frames the same way as OpenWrt/LEDE's hack. This code could be needed years ago but currently it seems redundant. Signed-off-by: Rafał Miłecki --- .../640-bridge-only-accept-EAP-locally.patch | 32 ---------------------- .../hack-4.14/641-bridge_port_isolate.patch | 2 +- .../640-bridge-only-accept-EAP-locally.patch | 32 ---------------------- .../generic/hack-4.9/641-bridge_port_isolate.patch | 2 +- .../pending-4.4/640-bridge_no_eap_forward.patch | 23 ---------------- .../pending-4.4/642-bridge_port_isolate.patch | 2 +- 6 files changed, 3 insertions(+), 90 deletions(-) delete mode 100644 target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch delete mode 100644 target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch delete mode 100644 target/linux/generic/pending-4.4/640-bridge_no_eap_forward.patch diff --git a/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch b/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch deleted file mode 100644 index 83c9cf739f..0000000000 --- a/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c6905cfdeb31a5c049db3da434b10fa0d3e83569 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:18:54 +0200 -Subject: bridge: only accept EAP locally - -When bridging, do not forward EAP frames to other ports, only deliver -them locally, regardless of the state. - -Signed-off-by: Felix Fietkau ---- - net/bridge/br_input.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/net/bridge/br_input.c -+++ b/net/bridge/br_input.c -@@ -166,11 +166,14 @@ int br_handle_frame_finish(struct net *n - } - } - -+ BR_INPUT_SKB_CB(skb)->brdev = br->dev; -+ -+ if (skb->protocol == htons(ETH_P_PAE)) -+ return br_pass_frame_up(skb); -+ - if (p->state == BR_STATE_LEARNING) - goto drop; - -- BR_INPUT_SKB_CB(skb)->brdev = br->dev; -- - if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP)) - br_do_proxy_arp(skb, br, vid, p); - diff --git a/target/linux/generic/hack-4.14/641-bridge_port_isolate.patch b/target/linux/generic/hack-4.14/641-bridge_port_isolate.patch index 538dbd16b0..8f3e0219b0 100644 --- a/target/linux/generic/hack-4.14/641-bridge_port_isolate.patch +++ b/target/linux/generic/hack-4.14/641-bridge_port_isolate.patch @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau */ --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -177,6 +177,9 @@ int br_handle_frame_finish(struct net *n +@@ -174,6 +174,9 @@ int br_handle_frame_finish(struct net *n if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP)) br_do_proxy_arp(skb, br, vid, p); diff --git a/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch b/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch deleted file mode 100644 index ba87420b32..0000000000 --- a/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c6905cfdeb31a5c049db3da434b10fa0d3e83569 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:18:54 +0200 -Subject: bridge: only accept EAP locally - -When bridging, do not forward EAP frames to other ports, only deliver -them locally, regardless of the state. - -Signed-off-by: Felix Fietkau ---- - net/bridge/br_input.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/net/bridge/br_input.c -+++ b/net/bridge/br_input.c -@@ -164,11 +164,14 @@ int br_handle_frame_finish(struct net *n - } - } - -+ BR_INPUT_SKB_CB(skb)->brdev = br->dev; -+ -+ if (skb->protocol == htons(ETH_P_PAE)) -+ return br_pass_frame_up(skb); -+ - if (p->state == BR_STATE_LEARNING) - goto drop; - -- BR_INPUT_SKB_CB(skb)->brdev = br->dev; -- - if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP)) - br_do_proxy_arp(skb, br, vid, p); - diff --git a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch index 0d0b2c73ff..9c797f5a4d 100644 --- a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch +++ b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau continue; --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -175,6 +175,9 @@ int br_handle_frame_finish(struct net *n +@@ -172,6 +172,9 @@ int br_handle_frame_finish(struct net *n if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP)) br_do_proxy_arp(skb, br, vid, p); diff --git a/target/linux/generic/pending-4.4/640-bridge_no_eap_forward.patch b/target/linux/generic/pending-4.4/640-bridge_no_eap_forward.patch deleted file mode 100644 index a6dfb4ee59..0000000000 --- a/target/linux/generic/pending-4.4/640-bridge_no_eap_forward.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Felix Fietkau -Subject: [PATCH] bridge: no EAP forward - -When bridging, do not forward EAP frames to other ports, only deliver -them locally. -Fixes WPA authentication issues with multiples APs that are connected to -each other via bridges. ---- ---- a/net/bridge/br_input.c -+++ b/net/bridge/br_input.c -@@ -169,7 +169,11 @@ int br_handle_frame_finish(struct net *n - if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP)) - br_do_proxy_arp(skb, br, vid, p); - -- if (is_broadcast_ether_addr(dest)) { -+ if (skb->protocol == htons(ETH_P_PAE)) { -+ skb2 = skb; -+ /* Do not forward 802.1x/EAP frames */ -+ skb = NULL; -+ } else if (is_broadcast_ether_addr(dest)) { - skb2 = skb; - unicast = false; - } else if (is_multicast_ether_addr(dest)) { diff --git a/target/linux/generic/pending-4.4/642-bridge_port_isolate.patch b/target/linux/generic/pending-4.4/642-bridge_port_isolate.patch index 02dfea4659..85632af8a6 100644 --- a/target/linux/generic/pending-4.4/642-bridge_port_isolate.patch +++ b/target/linux/generic/pending-4.4/642-bridge_port_isolate.patch @@ -48,7 +48,7 @@ Isolating individual bridge ports --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -192,8 +192,8 @@ int br_handle_frame_finish(struct net *n +@@ -188,8 +188,8 @@ int br_handle_frame_finish(struct net *n unicast = false; br->dev->stats.multicast++;