diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2020-04-02 02:20:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-02 02:20:17 +0000 |
| commit | 5c642deb047f181ec0196f4eb344e63c2e21d059 (patch) | |
| tree | eb1534824b8c971f4195b967e9adb3d2b974ba3b | |
| parent | f39a656871ed774e290150e3d007d418858bdb27 (diff) | |
| parent | e4712fc02b6b2b4645858b8b5270860f7cb9025b (diff) | |
| download | ppp-5c642deb047f181ec0196f4eb344e63c2e21d059.tar.gz | |
pppd: Fix bounds check in EAP code am: f9fec5c369 am: 0adf11c24c am: 5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf am: 7bbd97dd7c am: e4712fc02b
Change-Id: If7b8e61fd56c097846e60ba0304753043e81ca00
| -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'; |