From nobody Wed Dec 15 16:00:43 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 806A218D379C; Wed, 15 Dec 2021 16:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JDg2N1Bc1z4bDH; Wed, 15 Dec 2021 16:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 094E31EC7E; Wed, 15 Dec 2021 16:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BFG0hC2068031; Wed, 15 Dec 2021 16:00:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BFG0hqh068030; Wed, 15 Dec 2021 16:00:43 GMT (envelope-from git) Date: Wed, 15 Dec 2021 16:00:43 GMT Message-Id: <202112151600.1BFG0hqh068030@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: 925b730fbf94 - main - dns/bind916: fix runnaway memory leak List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 925b730fbf94cffa1215f3a30bee4c27f0ae36c7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639584044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rORIdYDCs/Sbp8z4ILX8K4KuGxWjGStHkTbNIjooSq8=; b=qqIoboGB0izg+mQkiCLBF4eV5ywXmJ3sAmZa79RomLO4NEUDEEIIfNAPQ/6o1pRyfdqwY8 NHF+jzcC/HR+oEscGRsn3+ZKbbSqZaCcFgBHYi6NbIXdZYI5+j67/RekgVlPrsfOBr3kue GwzvO+uT3BInqmponPKXCRthrNyBIcb07MGnjF8nQf1zkgvhGnBpivnu+Au9f3XJ/lMdCN taMa7AKf8ZnNVBu1MtmJk5A8WDfYE7OEFDRnYmZik0dpH3gfuN2f0mR/u65uwt8gFLQTIt D1hXlH3GTUzNw7Cx5OQ7D2R1jMyTaoGmLAlzzkv2ViOHn3tmLrlSHVNgX8EIXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639584044; a=rsa-sha256; cv=none; b=COOSK4uMaHIN/JSYNGJbN2WiYwtyKopdIuYm7+DYgA0FLRiEXtJmVbleC9M/kv8VY+6pRT juer9o1UFfuxYVSZipwKx2qlxh86MsnvSanxWqOaGRIiPBmBU2WYtkrC26SG0x/+QQr4uy lzt0P6hwCHJCnnoaho0LUpbClse9uQEHw/wdbm0/4d278xEkxI9gvFoJ8snM18Ip8xdIH4 nIeRqYMuRrP/lepzk2HAitITo863uHFGqyqfzjlbxoQ5zmwClznNbn5091XSvxSIbCurJm Za2vvVSxlaw4HRpd0yfL9BcfdY/J4bXhf4E+M0jpAPBmeKAH3RjNRt/chJrFlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=925b730fbf94cffa1215f3a30bee4c27f0ae36c7 commit 925b730fbf94cffa1215f3a30bee4c27f0ae36c7 Author: Mathieu Arnold AuthorDate: 2021-12-15 15:58:37 +0000 Commit: Mathieu Arnold CommitDate: 2021-12-15 16:00:32 +0000 dns/bind916: fix runnaway memory leak Obtained from: https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/5626 --- dns/bind916/Makefile | 2 +- dns/bind916/files/patch-mr-5626 | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile index e3c09b5b9b4e..0c1dcee790c2 100644 --- a/dns/bind916/Makefile +++ b/dns/bind916/Makefile @@ -7,7 +7,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} PORTREVISION= 0 .else # dns/bind916 here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net MASTER_SITES= ISC/bind9/${ISCVERSION} diff --git a/dns/bind916/files/patch-mr-5626 b/dns/bind916/files/patch-mr-5626 new file mode 100644 index 000000000000..6cb9becc16e0 --- /dev/null +++ b/dns/bind916/files/patch-mr-5626 @@ -0,0 +1,21 @@ +--- lib/isc/netmgr/netmgr.c.orig 2021-12-07 12:24:49 UTC ++++ lib/isc/netmgr/netmgr.c +@@ -425,6 +425,7 @@ nm_destroy(isc_nm_t **mgr0) { + isc_mempool_put(mgr->evpool, ievent); + } + isc_condition_destroy(&worker->cond_prio); ++ isc_mutex_destroy(&worker->lock); + + r = uv_loop_close(&worker->loop); + INSIST(r == 0); +@@ -1267,8 +1268,9 @@ nmsocket_cleanup(isc_nmsocket_t *sock, bool dofree FLA + + isc_mem_free(sock->mgr->mctx, sock->ah_frees); + isc_mem_free(sock->mgr->mctx, sock->ah_handles); +- isc_mutex_destroy(&sock->lock); + isc_condition_destroy(&sock->scond); ++ isc_condition_destroy(&sock->cond); ++ isc_mutex_destroy(&sock->lock); + #ifdef NETMGR_TRACE + LOCK(&sock->mgr->lock); + ISC_LIST_UNLINK(sock->mgr->active_sockets, sock, active_link);