From 5b96aa364ed4dc290a61af175ad8f122dfd7b8d3 Mon Sep 17 00:00:00 2001 From: Github Security Lab Date: Sat, 7 Mar 2020 20:58:06 +0100 Subject: [PATCH] `vallen` is verified to be less than `len`, therefore, it can never be the case that `vallen >= len + sizeof(rhostname)`. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR fixes the check so the `rhostname` array does not overflow. Reported-by: Github Security Lab Signed-off-by: Alvaro Muñoz --- chibios_stable-18.2.x/ext/lwip/src/netif/ppp/eap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chibios_stable-18.2.x/ext/lwip/src/netif/ppp/eap.c b/chibios_stable-18.2.x/ext/lwip/src/netif/ppp/eap.c index 5000e26..98e0762 100644 --- a/chibios_stable-18.2.x/ext/lwip/src/netif/ppp/eap.c +++ b/chibios_stable-18.2.x/ext/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';