confuse: fix CVE-2022-40320

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/confuse/Makefile b/libs/confuse/Makefile
index f060994eea1015128a65f81c0e4485ce6b755c72..a3110cf6c0ace91f0600c3f4e4d393d1ddb6cac4 100644 (file)
--- a/libs/confuse/Makefile
+++ b/libs/confuse/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=confuse
 PKG_VERSION:=3.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/martinh/libconfuse/releases/download/v$(PKG_VERSION)

diff --git a/libs/confuse/patches/010-CVE-2022-40320.patch b/libs/confuse/patches/010-CVE-2022-40320.patch
new file mode 100644 (file)
index 0000000..2dafd24
--- /dev/null
+++ b/libs/confuse/patches/010-CVE-2022-40320.patch
@@ -0,0 +1,37 @@
+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>
+---
+ src/confuse.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+--- a/src/confuse.c
++++ b/src/confuse.c
+@@ -1863,18 +1863,20 @@ DLLIMPORT char *cfg_tilde_expand(const c
+                       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);
+               }