mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 02:29:01 +00:00
2d02a4f5bd
Refresh patches. Adapt 704-phy-no-genphy-soft-reset.patch. Remove brcm2708/950-0005-mm-Remove-the-PFN-busy-warning.patch. Compile-tested on brcm2708/bcm2708 and x86/64. Runtime-tested on brcm2708/bcm2708 and x86/64. Fixes the following vulnerabilities: - CVE-2017-7533 - CVE-2017-1000111 - CVE-2017-1000112 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
33 lines
880 B
Diff
33 lines
880 B
Diff
From c6905cfdeb31a5c049db3da434b10fa0d3e83569 Mon Sep 17 00:00:00 2001
|
|
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>
|
|
---
|
|
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);
|
|
|