Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mac80211: make sure data is accessible in EAPOL check

The code to allow EAPOL frames even when the station
isn't yet marked associated needs to check that the
incoming frame is long enough and due to paged RX it
also can't assume skb->data contains the right data,
it must use skb_copy_bits(). Fix this to avoid using
data that doesn't really exist.

Cc: stable@vger.kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

+9 -7
+9 -7
net/mac80211/rx.c
··· 888 888 */ 889 889 if (rx->sta && rx->sdata->vif.type == NL80211_IFTYPE_STATION && 890 890 ieee80211_is_data_present(hdr->frame_control)) { 891 - u16 ethertype; 892 - u8 *payload; 891 + unsigned int hdrlen; 892 + __be16 ethertype; 893 893 894 - payload = rx->skb->data + 895 - ieee80211_hdrlen(hdr->frame_control); 896 - ethertype = (payload[6] << 8) | payload[7]; 897 - if (cpu_to_be16(ethertype) == 898 - rx->sdata->control_port_protocol) 894 + hdrlen = ieee80211_hdrlen(hdr->frame_control); 895 + 896 + if (rx->skb->len < hdrlen + 8) 897 + return RX_DROP_MONITOR; 898 + 899 + skb_copy_bits(rx->skb, hdrlen + 6, &ethertype, 2); 900 + if (ethertype == rx->sdata->control_port_protocol) 899 901 return RX_CONTINUE; 900 902 } 901 903