summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVaibhav Rustagi <vaibhavrustagi@google.com>2023-03-13 14:33:11 -0700
committerSam James <sam@gentoo.org>2023-03-13 23:27:02 +0000
commit5dce806e4b3a04419f125938501990818739bbb8 (patch)
treedc29f750d057268d0901c5a3f044bbd48fcb423c /dev-libs/confuse/files
parentnet-analyzer/ntopng: add HTML, CSS, JS assets (diff)
downloadgentoo-5dce806e4b3a04419f125938501990818739bbb8.tar.gz
gentoo-5dce806e4b3a04419f125938501990818739bbb8.tar.bz2
gentoo-5dce806e4b3a04419f125938501990818739bbb8.zip
dev-libs/confuse: Add fix for CVE-2022-40320
The source of libconfuse package didn't make a release since Jun 24, 2020 (https://github.com/libconfuse/libconfuse). Therefore, to fix the CVE add a patch. [sam: adjust patch metadata, drop back to ~arch.] Bug: https://bugs.gentoo.org/901089 Signed-off-by: Vaibhav Rustagi <vaibhavrustagi@google.com> Closes: https://github.com/gentoo/gentoo/pull/30104 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/confuse/files')
-rw-r--r--dev-libs/confuse/files/confuse-3.3-fix-CVE-2022-40320.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/dev-libs/confuse/files/confuse-3.3-fix-CVE-2022-40320.patch b/dev-libs/confuse/files/confuse-3.3-fix-CVE-2022-40320.patch
new file mode 100644
index 000000000000..478c8556fe59
--- /dev/null
+++ b/dev-libs/confuse/files/confuse-3.3-fix-CVE-2022-40320.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/901089
+https://github.com/libconfuse/libconfuse/commit/d73777c2c3566fb2647727bb56d9a2295b81669b
+
+(Rebased by Vaibhav Rustagi <vaibhavrustagi@google.com>)
+
+From d73777c2c3566fb2647727bb56d9a2295b81669b Mon Sep 17 00:00:00 2001
+From: Joachim Wiberg <troglobit@gmail.com>
+Date: Fri, 2 Sep 2022 16:12:46 +0200
+Subject: [PATCH] Fix #163: unterminated username used with getpwnam()
+
+Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+--- a/src/confuse.c
++++ b/src/confuse.c
+@@ -1863,18 +1863,20 @@ DLLIMPORT char *cfg_tilde_expand(const char *filename)
+ passwd = getpwuid(geteuid());
+ file = filename + 1;
+ } else {
+- /* ~user or ~user/path */
+- char *user;
++ char *user; /* ~user or ~user/path */
++ size_t len;
+
+ file = strchr(filename, '/');
+ if (file == 0)
+ file = filename + strlen(filename);
+
+- user = malloc(file - filename);
++ len = file - filename - 1;
++ user = malloc(len + 1);
+ if (!user)
+ return NULL;
+
+- strncpy(user, filename + 1, file - filename - 1);
++ strncpy(user, &filename[1], len);
++ user[len] = 0;
+ passwd = getpwnam(user);
+ free(user);
+ }
+