| Message ID | 20210710183807.5792-1-davis@mosenkovs.lv (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | [4.14] mac80211: fix memory corruption in EAPOL handling | expand |
On Sat, Jul 10, 2021 at 09:38:07PM +0300, Davis Mosenkovs wrote: > Commit 557bb37533a3 ("mac80211: do not accept/forward invalid EAPOL > frames") uses skb_mac_header() before eth_type_trans() is called > leading to incorrect pointer, the pointer gets written to. This issue > has appeared during backporting to 4.4, 4.9 and 4.14. > > Fixes: 557bb37533a3 ("mac80211: do not accept/forward invalid EAPOL frames") > Link: https://lore.kernel.org/r/CAHQn7pKcyC_jYmGyTcPCdk9xxATwW5QPNph=bsZV8d-HPwNsyA@mail.gmail.com > Cc: <stable@vger.kernel.org> # 4.14.x > Signed-off-by: Davis Mosenkovs <davis@mosenkovs.lv> > --- > net/mac80211/rx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Ah, see your other backports now, nice, all now is good. greg k-h
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index ac2c52709e1c..87926c6fe0bf 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2404,7 +2404,7 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx) #endif if (skb) { - struct ethhdr *ehdr = (void *)skb_mac_header(skb); + struct ethhdr *ehdr = (struct ethhdr *)skb->data; /* deliver to local stack */ skb->protocol = eth_type_trans(skb, dev);
Commit 557bb37533a3 ("mac80211: do not accept/forward invalid EAPOL frames") uses skb_mac_header() before eth_type_trans() is called leading to incorrect pointer, the pointer gets written to. This issue has appeared during backporting to 4.4, 4.9 and 4.14. Fixes: 557bb37533a3 ("mac80211: do not accept/forward invalid EAPOL frames") Link: https://lore.kernel.org/r/CAHQn7pKcyC_jYmGyTcPCdk9xxATwW5QPNph=bsZV8d-HPwNsyA@mail.gmail.com Cc: <stable@vger.kernel.org> # 4.14.x Signed-off-by: Davis Mosenkovs <davis@mosenkovs.lv> --- net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)