From nobody Tue Nov 1 20:33:47 2022 X-Original-To: dev-commits-src-all@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 4N21vJ2yqGz4hCyS; Tue, 1 Nov 2022 20:33:48 +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 4N21vH6XLNz3FLy; Tue, 1 Nov 2022 20:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667334827; 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=yLFuDXSR4iy0F6MULBt/hjbCnae0ONcg5A7juA+34e8=; b=QY/N2ZchG5ZeKwaNeSkjjJeLwpGdE2ehHATTZW/5kHLlPFAuIDChd+wBNex2rE7d0c2dtK IiJhMONOyEB6pjKvydbZQo0hrhi3C/BtjfmdUDLnLnRxl3jE4TGP7SlpB3SDxZwIOAnvUs hNSjmaThYfeC08IMnN4JPUcf83yXUE3tdD2Iz1lsrJTLcPVBZc9Lbegga8Fm+GJTEqz2lY L1o4ZkPEwBoN8WUxhuP4tZMdo6dB3eMMSDgzJJ2abpfEiPtlvNKaxvT5D5jCE8bCltT0x/ 36XkhZ/rYmPuYKBSziVULGVhD9hr4MVKY3XejHAKVIDx03omD1BphxfUlKwOtw== 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 4N21vH5csMzV3c; Tue, 1 Nov 2022 20:33:47 +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 2A1KXlYj026425; Tue, 1 Nov 2022 20:33:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1KXltY026424; Tue, 1 Nov 2022 20:33:47 GMT (envelope-from git) Date: Tue, 1 Nov 2022 20:33:47 GMT Message-Id: <202211012033.2A1KXltY026424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8838c650cb59 - releng/13.1 - Fix use-after-free in btree code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 8838c650cb59a1fc998e9f47424c53e030f457b9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667334827; 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=yLFuDXSR4iy0F6MULBt/hjbCnae0ONcg5A7juA+34e8=; b=DEDjQBh5FYxVvj8K0u6DjGAzH8i4gYsMTpXO3apXd/WiSDJV0KI3HARP6Ad/pMR2GoceV+ KkoVaaQh+ZHZ7Hu5D5dg4U3tXpX9Io6wRvURnmnoWkxbnw0aPyFTA74cQPbUnccDa2/oNG OdbOvTZv2zTpFs86imDNxQEsO/EH4JvNHsJpR44Iv9kH0Nozu+RKfMXupRyudetm/Zbey4 b0fdjwKwTsscuBReHiXTqp/3UDsq1zvFdgUm90t0KZ9KoOkEo4hXDZfQYqefKTrEY/6OGs Nr6C+DpgvbIeNrSCdp+YPBjQPqtSmuJci6LjEdaudpAgGJGOu0ZbMqbl6NnImw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667334827; a=rsa-sha256; cv=none; b=Eb0FFy+mWCs6yWSKNPYaJn7YjpYVcExRULJm/Q9GQseYdiKKaZVvdVOn01A0XrHUcWZsAW fbjiUb7ZC7i9xc5Xpy14dNm0oc+CnTckaSuthxEGOm84oEvONlZN79MoOl0vqPPWLAp4ZV /005BVkFvANZ0ahBxTmxNmEFeUOkI8riNe2/m4dUFhLR0UHYBZIcva8nY7OSaVU6cDksU6 y4bcbCtkmAbc6rkOJSCLY3knAx+3MyJyuq9XHRegEQll+pbdODaSVUjLmAODvV5vWhMi8R NtQoLhV2krcNY20eeUXoxm3vbgPud/YDPtFSQzvcLuJRCgeLxw+BZNfOLmZIOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8838c650cb59a1fc998e9f47424c53e030f457b9 commit 8838c650cb59a1fc998e9f47424c53e030f457b9 Author: Richard Yao AuthorDate: 2022-09-12 18:22:15 +0000 Commit: Mark Johnston CommitDate: 2022-11-01 18:03:25 +0000 Fix use-after-free in btree code Coverty static analysis found these. Reviewed-by: Alexander Motin Reviewed-by: Brian Behlendorf Reviewed-by: Neal Gompa Signed-off-by: Richard Yao Closes #10989 Closes #13861 Approved by: so Security: FreeBSD-EN-22:21.zfs (cherry picked from commit 8131a96544fd19411c23424af85140e91e41c001) --- sys/contrib/openzfs/module/zfs/btree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/zfs/btree.c b/sys/contrib/openzfs/module/zfs/btree.c index 57b9dbbb2b50..77cb2543e93d 100644 --- a/sys/contrib/openzfs/module/zfs/btree.c +++ b/sys/contrib/openzfs/module/zfs/btree.c @@ -1536,8 +1536,8 @@ zfs_btree_remove_from_node(zfs_btree_t *tree, zfs_btree_core_t *node, zfs_btree_poison_node_at(tree, keep_hdr, keep_hdr->bth_count); new_rm_hdr->bth_count = 0; - zfs_btree_node_destroy(tree, new_rm_hdr); zfs_btree_remove_from_node(tree, parent, new_rm_hdr); + zfs_btree_node_destroy(tree, new_rm_hdr); } /* Remove the element at the specific location. */ @@ -1769,6 +1769,7 @@ zfs_btree_remove_idx(zfs_btree_t *tree, zfs_btree_index_t *where) zfs_btree_node_destroy(tree, rm_hdr); /* Remove the emptied node from the parent. */ zfs_btree_remove_from_node(tree, parent, rm_hdr); + zfs_btree_node_destroy(tree, rm_hdr); zfs_btree_verify(tree); }