mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
be0639063a
Merged upstream: bcm27xx/patches-5.4/950-1014-Revert-mailbox-avoid-timer-start-from-callback.patch generic/backport-5.4/080-wireguard-0021-crypto-blake2s-generic-C-library-implementation-and-.patch Manually adapted: layerscape/patches-5.4/801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch oxnas/patches-5.4/100-oxnas-clk-plla-pllb.patch Compile-tested: lantiq/xrx200 Run-tested: lantiq/xrx200 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
83 lines
2.2 KiB
Diff
83 lines
2.2 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
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 <nbd@nbd.name>
|
|
[add disable_eap_hack sysfs attribute]
|
|
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
|
|
---
|
|
|
|
--- a/net/bridge/br_input.c
|
|
+++ b/net/bridge/br_input.c
|
|
@@ -110,10 +110,14 @@ int br_handle_frame_finish(struct net *n
|
|
}
|
|
}
|
|
|
|
+ BR_INPUT_SKB_CB(skb)->brdev = br->dev;
|
|
+
|
|
+ if (skb->protocol == htons(ETH_P_PAE) && !br->disable_eap_hack)
|
|
+ return br_pass_frame_up(skb);
|
|
+
|
|
if (p->state == BR_STATE_LEARNING)
|
|
goto drop;
|
|
|
|
- BR_INPUT_SKB_CB(skb)->brdev = br->dev;
|
|
BR_INPUT_SKB_CB(skb)->src_port_isolated = !!(p->flags & BR_ISOLATED);
|
|
|
|
if (IS_ENABLED(CONFIG_INET) &&
|
|
--- a/net/bridge/br_private.h
|
|
+++ b/net/bridge/br_private.h
|
|
@@ -345,6 +345,8 @@ struct net_bridge {
|
|
u16 group_fwd_mask;
|
|
u16 group_fwd_mask_required;
|
|
|
|
+ bool disable_eap_hack;
|
|
+
|
|
/* STP */
|
|
bridge_id designated_root;
|
|
bridge_id bridge_id;
|
|
--- a/net/bridge/br_sysfs_br.c
|
|
+++ b/net/bridge/br_sysfs_br.c
|
|
@@ -166,6 +166,30 @@ static ssize_t group_fwd_mask_store(stru
|
|
}
|
|
static DEVICE_ATTR_RW(group_fwd_mask);
|
|
|
|
+static ssize_t disable_eap_hack_show(struct device *d,
|
|
+ struct device_attribute *attr,
|
|
+ char *buf)
|
|
+{
|
|
+ struct net_bridge *br = to_bridge(d);
|
|
+ return sprintf(buf, "%u\n", br->disable_eap_hack);
|
|
+}
|
|
+
|
|
+static int set_disable_eap_hack(struct net_bridge *br, unsigned long val)
|
|
+{
|
|
+ br->disable_eap_hack = !!val;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static ssize_t disable_eap_hack_store(struct device *d,
|
|
+ struct device_attribute *attr,
|
|
+ const char *buf,
|
|
+ size_t len)
|
|
+{
|
|
+ return store_bridge_parm(d, buf, len, set_disable_eap_hack);
|
|
+}
|
|
+static DEVICE_ATTR_RW(disable_eap_hack);
|
|
+
|
|
static ssize_t priority_show(struct device *d, struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
@@ -851,6 +875,7 @@ static struct attribute *bridge_attrs[]
|
|
&dev_attr_ageing_time.attr,
|
|
&dev_attr_stp_state.attr,
|
|
&dev_attr_group_fwd_mask.attr,
|
|
+ &dev_attr_disable_eap_hack.attr,
|
|
&dev_attr_priority.attr,
|
|
&dev_attr_bridge_id.attr,
|
|
&dev_attr_root_id.attr,
|