Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

wired: Relax the EAPoL packet body length safety check

Browse Source
This commit is contained in:
Marcel Holtmann 2018-10-16 18:54:42 +02:00
parent f68ee5ac74
commit be6a2495ca
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wired/ethdev.c
View File

@ -185,14 +185,23 @@ static void rx_packet(struct ethdev *dev, const uint8_t *addr,
{ {
const struct eapol_hdr *hdr = frame; const struct eapol_hdr *hdr = frame;
struct eapol *eapol; struct eapol *eapol;
uint16_t pkt_len;
if (len < 4) { if (len < 4) {
l_error("Too short EAPoL packet with %zu bytes", len); l_error("Too short EAPoL packet with %zu bytes", len);
return; return;
} }
if (L_BE16_TO_CPU(hdr->pkt_len) != len - 4) { pkt_len = L_BE16_TO_CPU(hdr->pkt_len);
l_error("Length mismatch with EAPoL packet");
/*
* EAPoL packet frames might contain padding at the end and so just
* ensure that at least packet body length worth of packet body is
* actually present.
*/
if (len - 4 < pkt_len) {
l_error("Missing %zu bytes from EAPoL packet",
pkt_len - (len - 4));
return; return;
} }
@ -218,7 +227,7 @@ static void rx_packet(struct ethdev *dev, const uint8_t *addr,
eapol->cred = network_lookup_security("default"); eapol->cred = network_lookup_security("default");
eap_load_settings(eapol->eap, eapol->cred, "EAP-"); eap_load_settings(eapol->eap, eapol->cred, "EAP-");
} }
eap_rx_packet(eapol->eap, frame + 4, len - 4); eap_rx_packet(eapol->eap, frame + 4, pkt_len);
break; break;
} }
} }