commit 7074e3f60caab1056d58ebcbe280029c3155bad9
author android-build-team Robot <android-build-team-robot@google.com> Fri Jul 03 05:44:16 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jul 03 05:44:16 2020 +0000
tree 3319aa3988fb14c85b2121bccbf5032fff6b9c9f
parent 90da8c8f15db2c82aece6e4085aaf9c116d481f2
parent e459c2dd037d94541bcd93e5d20fe71770011b6d

Snap for 6650585 from e459c2dd037d94541bcd93e5d20fe71770011b6d to pi-wear-hmr2-dr-orca-release

Change-Id: I6f971613254ac982e7f57edff277884b58fcba02

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