From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 758F2158020 for ; Wed, 19 Oct 2022 12:52:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 972B1E086C; Wed, 19 Oct 2022 12:52:11 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A81DE086C for ; Wed, 19 Oct 2022 12:52:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 459BF340EE6 for ; Wed, 19 Oct 2022 12:52:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7CF225F7 for ; Wed, 19 Oct 2022 12:52:08 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1666183925.a3d8d8adbd38e235b75232ac2e42741d03e0de65.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/exim/files/, mail-mta/exim/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-mta/exim/exim-4.94.2-r10.ebuild mail-mta/exim/exim-4.94.2-r11.ebuild mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch X-VCS-Directories: mail-mta/exim/files/ mail-mta/exim/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: a3d8d8adbd38e235b75232ac2e42741d03e0de65 X-VCS-Branch: master Date: Wed, 19 Oct 2022 12:52:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dd89e982-9f80-4a7f-895d-5e70478bc8b8 X-Archives-Hash: 280168e01750bfe87a2d5806c166ef6a commit: a3d8d8adbd38e235b75232ac2e42741d03e0de65 Author: Fabian Groffen gentoo org> AuthorDate: Wed Oct 19 12:50:54 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Oct 19 12:52:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d8d8ad mail-mta/exim-4.94.2-r11: 3rd attempt at CVE patch Fix another combination in which the code can be compiled. Hopefully 3rd time is the charm or something. Closes: https://bugs.gentoo.org/877641 Signed-off-by: Fabian Groffen gentoo.org> mail-mta/exim/{exim-4.94.2-r10.ebuild => exim-4.94.2-r11.ebuild} | 0 mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mail-mta/exim/exim-4.94.2-r10.ebuild b/mail-mta/exim/exim-4.94.2-r11.ebuild similarity index 100% rename from mail-mta/exim/exim-4.94.2-r10.ebuild rename to mail-mta/exim/exim-4.94.2-r11.ebuild diff --git a/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch b/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch index 8793514b8fb7..533aaf1f9e51 100644 --- a/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch +++ b/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch @@ -69,7 +69,7 @@ Subject: [PATCH 1/1] Fix $regex use-after-free. Bug 2915 /* precompile our regexes */ if (!(re_list_head = compile(*listptr))) -@@ -213,3 +205,12 @@ +@@ -213,3 +205,14 @@ } #endif /* WITH_CONTENT_SCAN */ @@ -78,7 +78,9 @@ Subject: [PATCH 1/1] Fix $regex use-after-free. Bug 2915 +void +regex_vars_clear(void) +{ ++#ifdef WITH_CONTENT_SCAN +regex_match_string = NULL; ++#endif +for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; +} +