From nobody Tue Nov 01 20:55:22 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 4N22NC0LYFz4hFyG; Tue, 1 Nov 2022 20:55:23 +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 4N22NB6xs8z3LVG; Tue, 1 Nov 2022 20:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667336123; 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=tL4/y9y12EtejJZDzacXtIHjvTf3osAH/3sX4iSo5GU=; b=rCfkUjcx6NQefFATaZPwjolRbKwxXEab5v5dQVYRmlNpv4K4uZBvKDh7b2knIBxnhQZ0/Q lQ1NXZa+suIoPrRhO/ZSISmfUpoxEqg6zxGsNKlf4JOcFiNh/rCRtsmTVjcItHZUprA+w0 f8k6GHiAd69fyyVLZU2Go6PX8Ar+6ipvaKZxFgvwYBFO/jPWZCDh98GQ6dzEYbZQfmdzZp JmDfDNCKWbRjwBaFqM1fX/C8WVMunuPA9bwiL1UJRxGZNh9Lya/GN9SoILizZFnmd7oMup Ea/vbGH+kBIqIsGjIHADXoeN38CfRxfzlZrbvwFXZu1i8KDifhDOObBVn4UWuw== 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 4N22NB6074zVyW; Tue, 1 Nov 2022 20:55:22 +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 2A1KtMTR054997; Tue, 1 Nov 2022 20:55:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1KtMjG054996; Tue, 1 Nov 2022 20:55:22 GMT (envelope-from git) Date: Tue, 1 Nov 2022 20:55:22 GMT Message-Id: <202211012055.2A1KtMjG054996@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: c3c13035ef27 - releng/13.1 - zfs: Fix an improperly resolved merge conflict 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: c3c13035ef270dcf0d24d2d847dd590edc535ed0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667336123; 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=tL4/y9y12EtejJZDzacXtIHjvTf3osAH/3sX4iSo5GU=; b=iR/EzSy4+Pg0xsrl+bdOL1m9ieaFHnWaSZvSgVYD0WrjZDf5/7Q70cWoq3BQOg8ddEAPzJ DPZgf5OqCvfP6iFZOv8iAdx/K7wNFfxFpnVfK8rvCJVkd4I0jmzeDD9BjiR7S9zVj+CJYi usMMht7vlkJ0nL7XSl9GHljFPQK/kw0lKzV5fo1bsW6aDds0hoDJLg+6o3M8fzcIb6p3eo BamiLKKZF7Q4qrQUyvUf4OB593/gtS/CLnQCxFB5rQ7wgIsx+MYgVdoc5vff85NtJaJMz5 yl5Ck2r8x/zKA+CyIWmLqDaXofDXo0WieBrj2QQPtEjFiyHlwWmhxx0lyoGw1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667336123; a=rsa-sha256; cv=none; b=Wmuz0sctWMV7+/Ax78vdlK6of6n7Nw/DEtNEcmWvR8WYe6uXeMDKQJvyn8W4E4JUlQPdSv vpH3rwfEs08aRSz9iBY6N0yoZPfBi0cSKJbJqCDAZQUbFXBTdht085buAQZY38XN8Iz318 5rrtwswyO6IZ2ncBRX+ZKo4L77mhykTDUttYYVfETv0Fag0ybg6dzvMx/XzgeNQdDCmQ8q mViHQY1GrkWyCkl2Rsz63HX1NFyGb0WcbpbbxCMe8Sstn+Z/4VNsZ7icN/npaHD4xMhmOR 9dqTlpy+HgDpyd9MH8UbJa+B272seaxblM09xCpT14wvSNU/VgNYiXdvwHTWyQ== 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=c3c13035ef270dcf0d24d2d847dd590edc535ed0 commit c3c13035ef270dcf0d24d2d847dd590edc535ed0 Author: Mark Johnston AuthorDate: 2022-11-01 20:54:33 +0000 Commit: Mark Johnston CommitDate: 2022-11-01 20:55:10 +0000 zfs: Fix an improperly resolved merge conflict Approved by: so Fixes: 8838c650cb59 ("Fix use-after-free in btree code") --- sys/contrib/openzfs/module/zfs/btree.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/contrib/openzfs/module/zfs/btree.c b/sys/contrib/openzfs/module/zfs/btree.c index 77cb2543e93d..09625bc92f92 100644 --- a/sys/contrib/openzfs/module/zfs/btree.c +++ b/sys/contrib/openzfs/module/zfs/btree.c @@ -1766,7 +1766,6 @@ zfs_btree_remove_idx(zfs_btree_t *tree, zfs_btree_index_t *where) zfs_btree_poison_node_at(tree, keep_hdr, keep_hdr->bth_count); rm_hdr->bth_count = 0; - 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);