aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/ppp/patches/700-radius-Prevent-buffer-overflow-in-rc_mksid.patch
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2020-02-26 16:40:21 +0100
committerJo-Philipp Wich <jo@mein.io>2020-02-26 16:40:25 +0100
commit0e9e5b15538e530a88572bc58c689afeba91c0fe (patch)
tree30a893d5daa69d2ac3587e8dd3012f816b2587a0 /package/network/services/ppp/patches/700-radius-Prevent-buffer-overflow-in-rc_mksid.patch
parent9e2a1af62f9ad68c16c2c58a73b4ae998b674b18 (diff)
downloadupstream-0e9e5b15538e530a88572bc58c689afeba91c0fe.tar.gz
upstream-0e9e5b15538e530a88572bc58c689afeba91c0fe.tar.bz2
upstream-0e9e5b15538e530a88572bc58c689afeba91c0fe.zip
Revert "ppp: backport security fixes"
This reverts commit 6b7eeb74dbf8b491b6426820bfa230fca60047dc 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/700-radius-Prevent-buffer-overflow-in-rc_mksid.patch')
-rw-r--r--package/network/services/ppp/patches/700-radius-Prevent-buffer-overflow-in-rc_mksid.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/package/network/services/ppp/patches/700-radius-Prevent-buffer-overflow-in-rc_mksid.patch b/package/network/services/ppp/patches/700-radius-Prevent-buffer-overflow-in-rc_mksid.patch
deleted file mode 100644
index 1c5722e6dd..0000000000
--- a/package/network/services/ppp/patches/700-radius-Prevent-buffer-overflow-in-rc_mksid.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 858976b1fc3107f1261aae337831959b511b83c2 Mon Sep 17 00:00:00 2001
-From: Paul Mackerras <paulus@ozlabs.org>
-Date: Sat, 4 Jan 2020 12:01:32 +1100
-Subject: [PATCH] radius: Prevent buffer overflow in rc_mksid()
-
-On some systems getpid() can return a value greater than 65535.
-Increase the size of buf[] to allow for this, and use slprintf()
-to make sure we never overflow it.
-
-Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
----
- pppd/plugins/radius/util.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pppd/plugins/radius/util.c b/pppd/plugins/radius/util.c
-index 6f976a712951..740131e8377c 100644
---- a/pppd/plugins/radius/util.c
-+++ b/pppd/plugins/radius/util.c
-@@ -73,9 +73,9 @@ void rc_mdelay(int msecs)
- char *
- rc_mksid (void)
- {
-- static char buf[15];
-+ static char buf[32];
- static unsigned short int cnt = 0;
-- sprintf (buf, "%08lX%04X%02hX",
-+ slprintf(buf, sizeof(buf), "%08lX%04X%02hX",
- (unsigned long int) time (NULL),
- (unsigned int) getpid (),
- cnt & 0xFF);