diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 6d416a4c7f6cb5401704ce28a03fbe3907032e29..f8699ecbece21a2f6bb92ac3ae43b18d498a8f84 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -108,10 +108,14 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb } } + 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) && diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 33b8222db75c43046d41f182011a8cbcfa8b12bd..5690a29f8af7dd188a0e3d580f15a42cd8053b11 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -337,6 +337,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; diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index 0318a69888d48ea3119ca7cfef677e303a84e7d0..47c515afd03a0fec1c75c1b6ab7300686d572a76 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c @@ -170,6 +170,30 @@ static ssize_t group_fwd_mask_store(struct device *d, } 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) { @@ -810,6 +834,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,