From patchwork Fri Mar 7 18:39:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 39793 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8AB1527BBEA; Fri, 7 Mar 2025 18:42:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0A7C827BBE2 for ; Fri, 7 Mar 2025 18:42:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqcdv-00029C-MY; Fri, 07 Mar 2025 13:41:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tqcdR-0001KQ-My for guix-patches@gnu.org; Fri, 07 Mar 2025 13:41:28 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqcdP-0003Gj-Fe for guix-patches@gnu.org; Fri, 07 Mar 2025 13:41:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=QhuAkDnzE9MVjoVkP1MkH7iiojjjkaXhxaVfb/n5LmQ=; b=EdR948TiGyllxaHNmQ19rrFDMbFPTCIOylUx/Shp6k39nlSFqhlYTS71kN4gXi3GRucsW5y9q6kF9FW483tLhGAqGoPjGIlTLvgTAJPpquWqDPMh7RQ0a8/K6tcIRYPwJ6C9f/kwLzvBwKF5dK8dfC3NoXyTocIVWmI5fouwwCFqlv03Fjy815hxR6VI8GLmtLD8MVP0hjtBOTWwi7dqog5e0ZfZkyP1sAq5xPd/ntwdEvTw21nZm1pFs+Hxc/14JTo01vAOCmH3neKMHyVxM7seLyriRvH9WGtcrb3UVmdDQDTtrKjg5BAtD9KfSc3fVNx6McNvyo2NQA7MXu0WrA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tqcdP-0006q8-CH for guix-patches@gnu.org; Fri, 07 Mar 2025 13:41:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76819] [PATCH v7 32/35] gnu: libconfuse: Patch CVE-2022-40320. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Mar 2025 18:41:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76819 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76819@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 76819-submit@debbugs.gnu.org id=B76819.174137287626158 (code B ref 76819); Fri, 07 Mar 2025 18:41:23 +0000 Received: (at 76819) by debbugs.gnu.org; 7 Mar 2025 18:41:16 +0000 Received: from localhost ([127.0.0.1]:50275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tqcdH-0006nY-Tf for submit@debbugs.gnu.org; Fri, 07 Mar 2025 13:41:16 -0500 Received: from 1.mo550.mail-out.ovh.net ([178.32.127.22]:55923) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tqccK-0006cQ-Rk for 76819@debbugs.gnu.org; Fri, 07 Mar 2025 13:40:17 -0500 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.139.154]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Z8Zpl0CXmz1d4m for <76819@debbugs.gnu.org>; Fri, 7 Mar 2025 18:40:15 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-hw52s (unknown [10.111.174.60]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C517E1FDE9; Fri, 7 Mar 2025 18:40:14 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-5b5ff79f4f-hw52s with ESMTPSA id l7JlHY49y2d/OQAAGCaFAw (envelope-from ); Fri, 07 Mar 2025 18:40:14 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R0061b79082c-c4ea-47d7-8a99-020668acf7e2, 93CD87FFD4632086FD827B47E208BFE70AFEC0F0) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 7 Mar 2025 19:39:01 +0100 Message-ID: <20250307183914.8825-32-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250307183914.8825-1-ngraves@ngraves.fr> References: <20250307183914.8825-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4435764158420017890 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduuddugeduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdeinecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejieekudelseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=QhuAkDnzE9MVjoVkP1MkH7iiojjjkaXhxaVfb/n5LmQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1741372815; v=1; b=prQVzbLPbu0QugwVKQABtxcdBdcE1IpC5dc4lCGSwmWNZIpwjvu0MCqTLlA4/7ae7bHeQMsZ 0z1ySXDCOcxWkodv5DiwtbYYOv3nEknUulSGElstSMEm9x32yNct15DbCpCW95K2R1pNRLVLbPh kjrLcRwqX0aq5qPSeyiWsVDdpINtnIyWSlRi1d4HxMqdgw+f6069oAC8NeGHuTlVtAnoy9sDCdT PrDKBpXEeCiC9pi8Vw/JhaStfM0B4bIZcaB8OKskMHJrgD65blXEIFetIDRq6Ef82dnCp54a78r gmQ4K/BILwwTsKjLrhjXVqykhB0DUgCmCXAnpWI7Bq3gg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/pacakges/patches/libconfuse-CVE-2022-40320.patch: Add file. * gnu/packages/textutils.scm (libconfuse)[source]: Record patch. * gnu/local.mk: Record patch. --- gnu/local.mk | 1 + .../patches/libconfuse-CVE-2022-40320.patch | 38 +++++++++++++++++++ gnu/packages/textutils.scm | 4 +- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libconfuse-CVE-2022-40320.patch diff --git a/gnu/local.mk b/gnu/local.mk index d08f3bba0a..dc7836d9a5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1656,6 +1656,7 @@ dist_patch_DATA = \ %D%/packages/patches/julia-Use-MPFR-4.2.patch \ %D%/packages/patches/libcall-ui-make-it-installable.patch \ %D%/packages/patches/libcamera-ipa_manager-disable-signature-verification.patch \ + %D%/packages/patches/libconfuse-CVE-2022-40320.patch \ %D%/packages/patches/libcss-check-format.patch \ %D%/packages/patches/libextractor-tidy-support.patch \ %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch \ diff --git a/gnu/packages/patches/libconfuse-CVE-2022-40320.patch b/gnu/packages/patches/libconfuse-CVE-2022-40320.patch new file mode 100644 index 0000000000..5911f2d397 --- /dev/null +++ b/gnu/packages/patches/libconfuse-CVE-2022-40320.patch @@ -0,0 +1,38 @@ +[PATCH] Fix #163: unterminated username used with getpwnam() +Signed-off-by: Joachim Wiberg +--- + src/confuse.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/confuse.c b/src/confuse.c +index ce4fca8..060fae2 100644 +--- 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); + } +-- +2.48.1 + diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index c886b009be..9567e222ba 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -280,7 +280,9 @@ (define-public libconfuse "releases/download/v" version "/confuse-" version ".tar.xz")) (sha256 - (base32 "043hqqykpprgrkw9s2hbdlxr308a7yxwsgxj4m8aadg1401hmm8x")))) + (base32 "043hqqykpprgrkw9s2hbdlxr308a7yxwsgxj4m8aadg1401hmm8x")) + (patches + (search-patches "libconfuse-CVE-2022-40320.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static")))