1 From: Felix Fietkau <nbd@nbd.name>
2 Date: Fri, 7 Jul 2017 17:18:54 +0200
3 Subject: bridge: only accept EAP locally
5 When bridging, do not forward EAP frames to other ports, only deliver
6 them locally, regardless of the state.
8 Signed-off-by: Felix Fietkau <nbd@nbd.name>
9 [add disable_eap_hack sysfs attribute]
10 Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
13 --- a/net/bridge/br_input.c
14 +++ b/net/bridge/br_input.c
15 @@ -164,11 +164,14 @@ int br_handle_frame_finish(struct net *n
19 + BR_INPUT_SKB_CB(skb)->brdev = br->dev;
21 + if (skb->protocol == htons(ETH_P_PAE) && !br->disable_eap_hack)
22 + return br_pass_frame_up(skb);
24 if (p->state == BR_STATE_LEARNING)
27 - BR_INPUT_SKB_CB(skb)->brdev = br->dev;
29 if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP))
30 br_do_proxy_arp(skb, br, vid, p);
32 --- a/net/bridge/br_private.h
33 +++ b/net/bridge/br_private.h
34 @@ -295,6 +295,8 @@ struct net_bridge
36 u16 group_fwd_mask_required;
38 + bool disable_eap_hack;
41 bridge_id designated_root;
43 --- a/net/bridge/br_sysfs_br.c
44 +++ b/net/bridge/br_sysfs_br.c
45 @@ -169,6 +169,30 @@ static ssize_t group_fwd_mask_store(stru
47 static DEVICE_ATTR_RW(group_fwd_mask);
49 +static ssize_t disable_eap_hack_show(struct device *d,
50 + struct device_attribute *attr,
53 + struct net_bridge *br = to_bridge(d);
54 + return sprintf(buf, "%u\n", br->disable_eap_hack);
57 +static int set_disable_eap_hack(struct net_bridge *br, unsigned long val)
59 + br->disable_eap_hack = !!val;
64 +static ssize_t disable_eap_hack_store(struct device *d,
65 + struct device_attribute *attr,
69 + return store_bridge_parm(d, buf, len, set_disable_eap_hack);
71 +static DEVICE_ATTR_RW(disable_eap_hack);
73 static ssize_t priority_show(struct device *d, struct device_attribute *attr,
76 @@ -780,6 +804,7 @@ static struct attribute *bridge_attrs[]
77 &dev_attr_ageing_time.attr,
78 &dev_attr_stp_state.attr,
79 &dev_attr_group_fwd_mask.attr,
80 + &dev_attr_disable_eap_hack.attr,
81 &dev_attr_priority.attr,
82 &dev_attr_bridge_id.attr,
83 &dev_attr_root_id.attr,