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 1A3EC15800A for ; Mon, 7 Aug 2023 17:22:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EA182BC020; Mon, 7 Aug 2023 17:22:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 475282BC020 for ; Mon, 7 Aug 2023 17:22:37 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9030F340815 for ; Mon, 7 Aug 2023 17:22:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 065D5EF7 for ; Mon, 7 Aug 2023 17:22:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1691428945.0507e5274d19d90e15aad64aa7ab4f26189c7edc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch mail-filter/rspamd/rspamd-3.6-r1.ebuild mail-filter/rspamd/rspamd-3.6.ebuild X-VCS-Directories: mail-filter/rspamd/ mail-filter/rspamd/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0507e5274d19d90e15aad64aa7ab4f26189c7edc X-VCS-Branch: master Date: Mon, 7 Aug 2023 17:22:35 +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: daea7cad-9eb9-4cc7-8b86-546be6adc34d X-Archives-Hash: 0e439c728d4a7b1c565493efa6584b7a commit: 0507e5274d19d90e15aad64aa7ab4f26189c7edc Author: Petr Vaněk atlas cz> AuthorDate: Mon Aug 7 11:17:18 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 7 17:22:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0507e527 mail-filter/rspamd: backport memory leak fix This backports fix from upstream commit ffbab4fbf218 ("[CritFix] Fix leak in `gzip` function"). Upstream-Issue: https://github.com/rspamd/rspamd/issues/4564 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/32209 Signed-off-by: Sam James gentoo.org> .../rspamd/files/rspamd-3.6-memleak-fix.patch | 36 ++++++++++++++++++++++ .../{rspamd-3.6.ebuild => rspamd-3.6-r1.ebuild} | 3 ++ 2 files changed, 39 insertions(+) diff --git a/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch b/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch new file mode 100644 index 000000000000..f372b79de7c7 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch @@ -0,0 +1,36 @@ +From ffbab4fbf218514845b8e5209aec044621b1f460 Mon Sep 17 00:00:00 2001 +From: Vsevolod Stakhov +Date: Sun, 6 Aug 2023 18:33:37 +0100 +Subject: [PATCH] [CritFix] Fix leak in `gzip` function + +Upstream-Issue: https://github.com/rspamd/rspamd/issues/4564 + +diff --git a/src/libutil/util.c b/src/libutil/util.c +index 4be7cc620..deba3e807 100644 +--- a/src/libutil/util.c ++++ b/src/libutil/util.c +@@ -2231,6 +2231,7 @@ rspamd_fstring_gzip(rspamd_fstring_t **in) + strm.avail_out = sizeof(temp) > buf->allocated ? buf->allocated : sizeof(temp); + ret = deflate(&strm, Z_FINISH); + if (ret == Z_STREAM_ERROR) { ++ deflateEnd(&strm); + return FALSE; + } + +@@ -2247,6 +2248,8 @@ rspamd_fstring_gzip(rspamd_fstring_t **in) + if (ret != Z_BUF_ERROR || strm.avail_in == 0) { + buf->len = strm.next_out - (unsigned char *) buf->str; + *in = buf; ++ deflateEnd(&strm); ++ + return ret == Z_STREAM_END; + } + } +@@ -2267,6 +2270,7 @@ rspamd_fstring_gzip(rspamd_fstring_t **in) + g_free(hold); + buf->len = strm.next_out - (unsigned char *) buf->str; + *in = buf; ++ deflateEnd(&strm); + + return ret == Z_STREAM_END; + } diff --git a/mail-filter/rspamd/rspamd-3.6.ebuild b/mail-filter/rspamd/rspamd-3.6-r1.ebuild similarity index 97% rename from mail-filter/rspamd/rspamd-3.6.ebuild rename to mail-filter/rspamd/rspamd-3.6-r1.ebuild index fb768118313d..dba607175345 100644 --- a/mail-filter/rspamd/rspamd-3.6.ebuild +++ b/mail-filter/rspamd/rspamd-3.6-r1.ebuild @@ -72,6 +72,9 @@ PATCHES=( "${FILESDIR}/rspamd-3.6-unbundle-lua.patch" "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch" "${FILESDIR}/rspamd-3.6-fix-tests.patch" + + # see https://github.com/rspamd/rspamd/issues/4564 + "${FILESDIR}/${P}-memleak-fix.patch" ) src_prepare() {