commit 6ccffa6683c24e32eee852209b79c1fa22efbd46
author android-build-team Robot <android-build-team-robot@google.com> Fri Apr 03 02:12:14 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Apr 03 02:12:14 2020 +0000
tree eb1534824b8c971f4195b967e9adb3d2b974ba3b
parent f39a656871ed774e290150e3d007d418858bdb27
parent fdffd0deafab0930c09d02b017fb09f622e77809

Snap for 6360479 from fdffd0deafab0930c09d02b017fb09f622e77809 to rvc-release

Change-Id: I14fff2d1f2b703f7d4d2c2063e95a70501751986

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';