summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@ozlabs.org>2020-04-01 23:28:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-01 23:28:38 +0000
commit0adf11c24cb025da2047ed16547e876b99dff76e (patch)
tree3319aa3988fb14c85b2121bccbf5032fff6b9c9f
parent90da8c8f15db2c82aece6e4085aaf9c116d481f2 (diff)
parentf9fec5c36952301e585a420f31e96d35a60d0498 (diff)
downloadppp-0adf11c24cb025da2047ed16547e876b99dff76e.tar.gz
pppd: Fix bounds check in EAP code am: f9fec5c369
Change-Id: Ia918dbb574a1b4d560f04c056554b7dd1514b015
-rw-r--r--pppd/eap.c4
1 files changed, 2 insertions, 2 deletions
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 @@ int len;
}
/* 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 @@ int len;
}
/* 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';