commit dab064434ddf41a837e500a73dd03c260aa26dc4
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 29 03:44:39 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Wed Apr 29 03:44:39 2020 -0700
tree eb1534824b8c971f4195b967e9adb3d2b974ba3b
parent 3c01df8afed042a418e714cb1e858dfd50e8eca3
parent 86df6d27824c8cca82c69dbc10b40909474a55d1

Merge 86df6d27824c8cca82c69dbc10b40909474a55d1 on remote branch

Change-Id: Ia62dc79f57b4826d605f89321ebcfe98ace84ab1

pppd/eap.c

diff --git a/pppd/eap.c b/pppd/eap.c
index 6ea6c1f..5940ebf 100644
--- a/pppd/eap.c
+++ b/pppd/eap.c
@@ -1421,7 +1421,7 @@
 		}
 
 		/* Not so likely to happen. */
-		if (vallen >= len + sizeof (rhostname)) {
+		if (len - vallen >= sizeof (rhostname)) {
 			dbglog("EAP: trimming really long peer name down");
 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
 			rhostname[sizeof (rhostname) - 1] = '\0';
@@ -1847,7 +1847,7 @@
 		}
 
 		/* Not so likely to happen. */
-		if (vallen >= len + sizeof (rhostname)) {
+		if (len - vallen >= sizeof (rhostname)) {
 			dbglog("EAP: trimming really long peer name down");
 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
 			rhostname[sizeof (rhostname) - 1] = '\0';