From patchwork Fri Mar 7 18:38:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 39770 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 A08A327BBEA; Fri, 7 Mar 2025 18:41:31 +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 0B7F527BBE9 for ; Fri, 7 Mar 2025 18:41:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqcdK-0001E8-SW; Fri, 07 Mar 2025 13:41:18 -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 1tqcdE-00016b-B2 for guix-patches@gnu.org; Fri, 07 Mar 2025 13:41:12 -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 1tqcdE-0003Dn-0o for guix-patches@gnu.org; Fri, 07 Mar 2025 13:41:12 -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=akimhgq0WEH2/malkRvNw/nPc52fwv6uKA0vMd5qmu8=; b=hb5AXMH3GLrCNS7uTcgLOF9zuU1QPe7e3ywZlwfeoAOzJEGsSYbeLQ1ut/nEhJ0l4T3LhgIi2qMSe+9w0xrn4WG0zGnsV2pBQ7z9C9rSPVC0JbTc0rOrOaTSuDiZouUBDSHFOgLXcrYOH2RSnFajaz2MS/QaXohxlKLXiMg/SF2FSyg1U7JiujF4wGqJUFQ5A+IAC6m3cD3WadmyjPx1eHcTQpJVOX0ZPOwFM9ZZ7IgnKV8KLkkZ4IilwsYjveLK3d3AVVD8ZUNxAUvrTbynfe9LwzCGSPkrsI4tyw25KgPIU0J7fwAMh5gBMxiCJMxZHJiAk1laADDxuZJRhF+YVQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tqcdD-0006m4-R3 for guix-patches@gnu.org; Fri, 07 Mar 2025 13:41:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76819] [PATCH v7 17/35] gnu: tinyxml: Fix CVE-2023-34194. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Mar 2025 18:41:11 +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.174137284225724 (code B ref 76819); Fri, 07 Mar 2025 18:41:11 +0000 Received: (at 76819) by debbugs.gnu.org; 7 Mar 2025 18:40:42 +0000 Received: from localhost ([127.0.0.1]:50201 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tqcck-0006gk-4r for submit@debbugs.gnu.org; Fri, 07 Mar 2025 13:40:42 -0500 Received: from 5.mo582.mail-out.ovh.net ([46.105.54.31]:59199) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tqcc0-0006Tg-Ta for 76819@debbugs.gnu.org; Fri, 07 Mar 2025 13:39:58 -0500 Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.140.39]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4Z8ZpK57FYz1SxB for <76819@debbugs.gnu.org>; Fri, 7 Mar 2025 18:39:53 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-kz4cr (unknown [10.110.164.171]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 86E531FD1C; Fri, 7 Mar 2025 18:39:53 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-5b5ff79f4f-kz4cr with ESMTPSA id 4SABG3k9y2dzegYA1IxV2Q (envelope-from ); Fri, 07 Mar 2025 18:39:53 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R0010f44177c-43dc-4b1c-9f30-c1f37332b71e, 93CD87FFD4632086FD827B47E208BFE70AFEC0F0) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 7 Mar 2025 19:38:46 +0100 Message-ID: <20250307183914.8825-17-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: 4429571710516191970 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduuddugedtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepfeeugeelffeftdefhffgtdffvdehtdduudfhjefgiedvveelveeuudeikedvudfhnecuffhomhgrihhnpehfohhrvghstghouhhtrdgtohhmpdguvggsihgrnhdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejieekudelseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=akimhgq0WEH2/malkRvNw/nPc52fwv6uKA0vMd5qmu8=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1741372793; v=1; b=tBnfZgIILrV4e7GNs1WRb6odQlIqObjuOdfwZiR9JE23kOWGuLsH1tkJx+89BysySwOOLzJV XfQ0lq3G6yKaJFiNEPuVlrvIo36iF++zJbzG+HL8fHZTeija2ymKBZv7TG3KzJA9syQAw+RnhkD EHhYhU5HVjOKYKcDoDYoho8NtkdncKS/STqGJ2SZPVsFY19KnbUY11GkZ6p2PSMjBUNy4XqnLjc 9nUlYzWW7x0PhykcmVBgK17TlF/DUKWnpatnaAdxXOQXY96mcbPKj8DRuPu2y0Pm69uLPD1/yNl d4/A5DN4tCzG996/e5+tBkYMQMwtj9wa4winRdd/7Xe7A== 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/packages/patches/tinyxml-CVE-2023-34194.patch: Add patch. * gnu/packages/xml.scm, gnu/local.mk: Record it. --- gnu/local.mk | 1 + .../patches/tinyxml-CVE-2023-34194.patch | 28 +++++++++++++++++++ gnu/packages/xml.scm | 3 +- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/tinyxml-CVE-2023-34194.patch diff --git a/gnu/local.mk b/gnu/local.mk index 997b7344ff..2d602e0708 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2311,6 +2311,7 @@ dist_patch_DATA = \ %D%/packages/patches/tidy-CVE-2015-5522+5523.patch \ %D%/packages/patches/timewarrior-time-sensitive-tests.patch \ %D%/packages/patches/tinydir-fix-cbehave-test.patch \ + %D%/packages/patches/tinyxml-CVE-2023-34194.patch \ %D%/packages/patches/tinyxml-use-stl.patch \ %D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/tla2tools-build-xml.patch \ diff --git a/gnu/packages/patches/tinyxml-CVE-2023-34194.patch b/gnu/packages/patches/tinyxml-CVE-2023-34194.patch new file mode 100644 index 0000000000..dee0aa1d93 --- /dev/null +++ b/gnu/packages/patches/tinyxml-CVE-2023-34194.patch @@ -0,0 +1,28 @@ +From: Guilhem Moulin +Date: Sat, 30 Dec 2023 14:15:54 +0100 +Subject: Avoid reachable assertion via crafted XML document with a '\0' + located after whitespace + +Bug: https://www.forescout.com/resources/sierra21-vulnerabilities +Bug-Debian: https://bugs.debian.org/1059315 +Bug-Debian: https://security-tracker.debian.org/tracker/CVE-2023-34194 +Bug-Debian: https://security-tracker.debian.org/tracker/CVE-2023-40462 +--- + tinyxmlparser.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tinyxmlparser.cpp b/tinyxmlparser.cpp +index 8aa0dfa..1601962 100644 +--- a/tinyxmlparser.cpp ++++ b/tinyxmlparser.cpp +@@ -1606,6 +1606,10 @@ const char* TiXmlDeclaration::Parse( const char* p, TiXmlParsingData* data, TiXm + } + + p = SkipWhiteSpace( p, _encoding ); ++ if ( !p || !*p ) ++ { ++ break; ++ } + if ( StringEqual( p, "version", true, _encoding ) ) + { + TiXmlAttribute attrib; diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 10cd6d98fa..2ae9209f75 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1288,7 +1288,8 @@ (define-public tinyxml (sha256 (base32 "14smciid19lvkxqznfig77jxn5s4iq3jpb47vh5a6zcaqp7gvg8m")) - (patches (search-patches "tinyxml-use-stl.patch")))) + (patches (search-patches "tinyxml-use-stl.patch" + "tinyxml-CVE-2023-34194.patch")))) (build-system gnu-build-system) ;; This library is missing *a lot* of the steps to make it usable, so we ;; have to add them here, like every other distro must do.