diff options
author | Paul Mackerras <paulus@ozlabs.org> | 2020-04-02 01:33:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-02 01:33:51 +0000 |
commit | 7bbd97dd7c5f942f5714c17af4bb2aef9fa7b87a (patch) | |
tree | eb1534824b8c971f4195b967e9adb3d2b974ba3b | |
parent | f39a656871ed774e290150e3d007d418858bdb27 (diff) | |
parent | fdffd0deafab0930c09d02b017fb09f622e77809 (diff) | |
download | ppp-7bbd97dd7c5f942f5714c17af4bb2aef9fa7b87a.tar.gz |
pppd: Fix bounds check in EAP code am: f9fec5c369 am: 0adf11c24c am: 5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deafandroid-11.0.0_r16android11-d1-b-release
Change-Id: I83effc719d9484718ffacb16a6e82499735f75c4
-rw-r--r-- | pppd/eap.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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'; |