summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@ozlabs.org>2020-04-02 00:35:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-02 00:35:30 +0000
commit39855b1e5b483e16ff1f23466140b2695c531f43 (patch)
treeeb1534824b8c971f4195b967e9adb3d2b974ba3b
parentf39a656871ed774e290150e3d007d418858bdb27 (diff)
parent024dbd1dc3d34b73a19ea8e9032f4023fa202134 (diff)
downloadppp-39855b1e5b483e16ff1f23466140b2695c531f43.tar.gz
pppd: Fix bounds check in EAP code am: f9fec5c369 am: 0adf11c24c am: 5788de2192 am: 024dbd1dc3
Change-Id: I0d8404ab0b7d555cd4d4ff4c314305aa90523e2e
-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';