From 87970e63c5e5f1edf7b1683f796a58ba45beca9b Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Wed, 28 Oct 2020 19:41:15 +0100 Subject: [PATCH] Fix buffer overflow in EAP Fixes CVE-2020-8597 --- components/network/lwip/src/netif/ppp/eap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/network/lwip/src/netif/ppp/eap.c b/components/network/lwip/src/netif/ppp/eap.c index 8fb56368..971f58b9 100644 --- a/components/network/lwip/src/netif/ppp/eap.c +++ b/components/network/lwip/src/netif/ppp/eap.c @@ -1417,7 +1417,7 @@ static void eap_request(ppp_pcb *pcb, u_char *inp, int id, int len) { } /* Not so likely to happen. */ - if (vallen >= len + sizeof (rhostname)) { + if (len - vallen >= sizeof (rhostname)) { ppp_dbglog("EAP: trimming really long peer name down"); MEMCPY(rhostname, inp + vallen, sizeof (rhostname) - 1); rhostname[sizeof (rhostname) - 1] = '\0'; @@ -1845,7 +1845,7 @@ static void eap_response(ppp_pcb *pcb, u_char *inp, int id, int len) { } /* Not so likely to happen. */ - if (vallen >= len + sizeof (rhostname)) { + if (len - vallen >= sizeof (rhostname)) { ppp_dbglog("EAP: trimming really long peer name down"); MEMCPY(rhostname, inp + vallen, sizeof (rhostname) - 1); rhostname[sizeof (rhostname) - 1] = '\0';