74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
25 lines
830 B
Diff
25 lines
830 B
Diff
From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
|
|
Date: Mon, 20 Apr 2015 21:07:48 +0200
|
|
Subject: [PATCH] pppoe: Lacks DST MAC address check
|
|
|
|
A pppoe session is identified by its session ID and MAC address.
|
|
Currently pppoe does not check if the received pkg has the correct
|
|
MAC address. This is a problem when the eth I/F is in promisc mode
|
|
as then any DST MAC address is accepted.
|
|
|
|
Signed-off-by: Joakim Tjernlund <joakim.tjernlund@transmode.se>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
|
|
--- a/drivers/net/ppp/pppoe.c
|
|
+++ b/drivers/net/ppp/pppoe.c
|
|
@@ -379,6 +379,9 @@ static int pppoe_rcv_core(struct sock *s
|
|
* can't change.
|
|
*/
|
|
|
|
+ if (skb->pkt_type == PACKET_OTHERHOST)
|
|
+ goto abort_kfree;
|
|
+
|
|
if (sk->sk_state & PPPOX_BOUND) {
|
|
ppp_input(&po->chan, skb);
|
|
} else if (sk->sk_state & PPPOX_RELAY) {
|