aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/ppp/patches/701-pppd-Fix-bounds-check-in-EAP-code.patch
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2020-02-26 16:41:45 +0100
committerJo-Philipp Wich <jo@mein.io>2020-02-26 16:41:48 +0100
commitcd262f59cbf1bbf9af344196291d256e6a3351f1 (patch)
treeea8a7471e0c453e159a366b58b629643b7d748d0 /package/network/services/ppp/patches/701-pppd-Fix-bounds-check-in-EAP-code.patch
parented3c3048b8d3550f4efec51d6db47a26ae76cf1e (diff)
downloadupstream-cd262f59cbf1bbf9af344196291d256e6a3351f1.tar.gz
upstream-cd262f59cbf1bbf9af344196291d256e6a3351f1.tar.bz2
upstream-cd262f59cbf1bbf9af344196291d256e6a3351f1.zip
Revert "ppp: backport security fixes"
This reverts commit cc78f934a9466a0ef404bb169cc42680c7501d02 since it didn't contain a reference to the CVE it addresses. The next commit will re-add the commit including a CVE reference in its commit message. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/network/services/ppp/patches/701-pppd-Fix-bounds-check-in-EAP-code.patch')
-rw-r--r--package/network/services/ppp/patches/701-pppd-Fix-bounds-check-in-EAP-code.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/package/network/services/ppp/patches/701-pppd-Fix-bounds-check-in-EAP-code.patch b/package/network/services/ppp/patches/701-pppd-Fix-bounds-check-in-EAP-code.patch
deleted file mode 100644
index c2ca9729ec..0000000000
--- a/package/network/services/ppp/patches/701-pppd-Fix-bounds-check-in-EAP-code.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001
-From: Paul Mackerras <paulus@ozlabs.org>
-Date: Mon, 3 Feb 2020 15:53:28 +1100
-Subject: [PATCH] pppd: Fix bounds check in EAP code
-
-Given that we have just checked vallen < len, it can never be the case
-that vallen >= len + sizeof(rhostname). This fixes the check so we
-actually avoid overflowing the rhostname array.
-
-Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
-Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
----
- pppd/eap.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pppd/eap.c b/pppd/eap.c
-index 94407f56a336..1b93db01aebd 100644
---- a/pppd/eap.c
-+++ b/pppd/eap.c
-@@ -1420,7 +1420,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';
-@@ -1846,7 +1846,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';