From nobody Fri Nov 4 03:50:37 2022 X-Original-To: freebsd-stable@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 4N3RVg2PJNz4gs0y for ; Fri, 4 Nov 2022 03:50:51 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic301-20.consmr.mail.gq1.yahoo.com (sonic301-20.consmr.mail.gq1.yahoo.com [98.137.64.146]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4N3RVf0DgMz46cQ for ; Fri, 4 Nov 2022 03:50:49 +0000 (UTC) (envelope-from marklmi@yahoo.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1667533847; bh=byLORPoEDD2y5g3dk0mDCmA7PRig8NlanXS1J2zAuMA=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=rM5Nez9bBJSP446giv8bw6T5yZSkKLQRWmUL3BTg206jtPMMEiovhUhmAZEjgpGSXqg8zH9+eawZo+j0DaghFP2oTPbkyfaDJWE3czWhClD6i+jzk1FG8Q71csTEL1XabRhzCKKL4mM4dNAM0BJ8+wgJhamU5BUFvKXvWwhlgaUL4zlwPhIZek194LSea5sFqDUEXf/bu93Pgp0x56qZRpSZoeeHL9OsE3yAYtkSli1ECocpKZqPwt5sZNmGxM5Y/wQpchDrhxIuX5tFYSPf1SqYdOp5oNNSfuwo81i4S6Zqj/wqnPaDTdniajA52CNxhtPzUCm/bRuieqs9XDx/Og== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1667533847; bh=LL7qySzi6L7oDSB62tV9cHgLdvmTfcLWy6L4mVVjdyO=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=q6dh3dNClkosKI+WF4EUM/oATYxy8ch+YftZP0YKByS9Vny0ks5zUPMfYKvvDAqzcHNbk1aQc0Yj/OpX8YcdEJ+8ICaTZJyhO7SPCnGVHYaW4gGYVv14tvxGR5xblB892Zw54Zun3A1wfpn2x/apPvEgA7fXUBELbMsfIi/o4HPol7Hu+K6VG0hLjBTbP4WvK+v0lwGO9MC9mU6lNSxTk7m5kF2ks6gAtyAdBZnM0gqARynHb2Tv60i/KYPW1GqJp/H8hcjH7IhcQq1Ev6MOFze7jshGfuy31JIr3UM9Ww4pSL012G/XJunR+YYkO6bR+ue+wYI6zBbjnybIF4sBsg== X-YMail-OSG: Z58.AAMVM1meGyeQcMeK7V6VMh_TXgyprDzWETDhIWPrLuqyYO3xnOwnCkLvIk0 VBRa0hYtqnmol30y9GQEdJt_3X4ck0t4G9sgsH20RsvAbdNHjkZ_54tSeKlHpVqz2.GRYCXiYop0 vb2P8r.avo5vVJj3k04bgM8oN5MmVq5sWL6lsUII7d0.r2bxu4DDm4ePukQs9isDX4d9vJs.pVql P3VNJqdstYGh6trxjuutp2BHbJmoLL8oTu72vCx6YeVCpoqwFjFPiBlR0lHbHrGp6c_zFEtqvqMg ouk4EilecSVwAZ4oJ0utx6AA67LbGpOOYASnQHqQ7DOSfJQnorEvA7jckaV5jW7GQ.t6q1SeBaG. tcw.0WTVtJ9PYocqCuIQpTE8FaTXg5sjlxu2yoXPsHJOj4PfRZs7JBF6taElppSPXMH.Cvyxy6bM AT4r4Kp.noBPfIlONHWrwCl0nQ0lWUWA1kecp6lbtAAHIWRfGleLu.wKl4kQX6Ee9vzZz2fBM0aE _cgjsSvWQP9LZDvlePtrFn.oWqJgT024pSI4G64fy563MppuxacNFCdx9Ozpvbl7nHsFI9qBbzms MEigv.cNV_JkLjEQYNDZZWszDvc.zlOnHHy7PcSC80vU3y2jY3jxWm68Hyr10bEutEufcaCf2R3A wd9jqzovEuX1HOP4Xt3zG66Zuxts2Y_x6cB7j7q7yCYOkJV8oWwHia3WOmrDGVktrqH0MkyqKve1 _FFguz7YZsw3tJQ8G3dXHeIWE8D6.rrPqiluZDRDmFMUHdOweRQfVrZ.Sp_hgz91ieOaejrbWwZt kCY36k7JfScrb7kEsJqF7lZmnmHZbGEgxpel7KwUX2_Hc9it81rcVBMx2wR0ehpbtxFdVPEa0KVL ylZDTpCfIUf.JgYep.UnzjXIW70LJ9hZxyrASoAKFMSA5VxKi26SJDY42lIcLQF4DnJfEB3InFGJ wPDTJdaHcOdJ01r8fhu9yfYMKQXDmPI37gKsfnzv_ol8CJX3Su8IaYwpZgFMHLi7.VnPHIMuoDNm BnCHrLWsKZtHePJruuqUBIS6B01_ksFYO6.2jbrOX0QSLcEv_6HVdJmk5Sg.WRlij8Cq485M9yZI 2epLbnOm6mVpANO5So8CZVpRVL8cAC7KW8e3PS3bIBSLDeoK_xaJFJG5wvsbxaAYPmA_aM1akbO8 hikrtRrHlxNhvV3xVCKSr.TT0QeJtH_dOd4QOF.iSTJhzhCwOlqoZKJK.o6wwAWjb3roQDVpHdIH QcbYo5eJFawBHi.6BiAMLtmkkATpQOFaoFARd2WCriFYmU0jB5WVWf_pCm73Ox_RAXoj5BpVtgIR xY6nBlR0edYTqAwN59_8k.99x6.vuRSm4TDvINxBgweUEO5s8j6n.u8DVW2fDaoAcNDILn4V.P9m taWMmDrDx_GNA_bLAJjoT.qgtryG75UjOmPSquALGqTOfxaPwAHeFFiundDDYDuwEZxq8cwUvKu7 XZdjusgVaF4neN5.9ZsYynJMbOwCEkFF8gzMXINssKZwtKmsV15jxODfUTmWLyoWe3FAaMTrEFZq M7YwPkUu.GXfrBlbPoQeX4zauuk9aCgfOfD9EmkH5XGDL55m7k0JwM4rFJ1NsR3GChN.ES6cSqV2 RoGmVe2ePHRJ7nYhlx1nXvBHqnp7Uoprc0yytg1hdBXZ3Z7mfNP1tqBTqjq.Oj.z98sdHccm.ZyV 7g7Tt5t8VgQA4s7_b_GxpLHrmnYWRqQx6cJPFpvGFYnXvUAatSsct8jqRP3Ctzmj4aG6DFLMUtNL nfUh9rRQ9PNl0dj4QyD29WxO3gBwgdarXH8NUSJDW4rIQmnBR0InTlHLtChZB3.INROTn.DpDKbd endwfEAxs1Y8xcdpkK3IqHsx7HT5XABdcK0zUNmrShDz25pg.RhVg7GGWFwJdZTi3cd1TXaP1UTv brP_FCLnIvngEmc69M2cgnMKtZc0XSqKzHDh.RmWTkoe2MGujAHwrWBfNwgDneBfv3R1s_CI35hh 5YYwhpPuclRmYFP9Zjsls1YzAs0f2XQlh0UrsVrquaIDZX4IWXFsyG8c2zx42yYgAeYmVDzdV0EH llRqOSzukQieRC2ED.G3bEh3nYFpZLOtXrgwaNurZlknLFs2tHGlcbyk8kZtaCpD70omw9Bsx0GK 4n.bT3QUnYtM8TzVxrX6VGFda9ZVpzQi.6ZbOq.OKNVYJsSDeTaFtSjVmnqFUtujXpRCCMzMpcdF 0oTegDtIn3HvfDCYxwrDGV8Nl3ZRkLyc8oV5nRZFKIryzqLuruvguCxXegxrXLsZgLb4QZeR.vf8 - X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic301.consmr.mail.gq1.yahoo.com with HTTP; Fri, 4 Nov 2022 03:50:47 +0000 Received: by hermes--production-bf1-5878955b5f-n7x8p (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 9c7851321098f564d98f55363007db44; Fri, 04 Nov 2022 03:50:43 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Production branch of FreeBSD source code List-Archive: https://lists.freebsd.org/archives/freebsd-stable List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-stable@freebsd.org X-BeenThere: freebsd-stable@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: A possible unintended difference in 13.1-RELEASE vs., for example, 13.1-RELEASE-p3 Message-Id: Date: Thu, 3 Nov 2022 20:50:37 -0700 To: Glen Barber , FreeBSD-STABLE Mailing List X-Mailer: Apple Mail (2.3696.120.41.1.1) References: X-Rspamd-Queue-Id: 4N3RVf0DgMz46cQ X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=rM5Nez9b; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.64.146 as permitted sender) smtp.mailfrom=marklmi@yahoo.com X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.996]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; RCVD_IN_DNSWL_NONE(0.00)[98.137.64.146:from]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MLMMJ_DEST(0.00)[freebsd-stable@freebsd.org]; TO_DN_ALL(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; FREEMAIL_FROM(0.00)[yahoo.com]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MIME_TRACE(0.00)[0:+]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.64.146:from] X-ThisMailContainsUnwantedMimeParts: N I downloaded and looked at: FreeBSD-13.1-RELEASE-arm64-aarch64-RPI.img # mdconfig -u md0 -f FreeBSD-13.1-RELEASE-arm64-aarch64-RPI.img # mount -onoatime /dev/md0s2a /mnt # strings /mnt/boot/kern*/kernel | grep 13.1-RELEASE @(#)FreeBSD 13.1-RELEASE releng/13.1-n250148-fc952ac2212 GENERIC FreeBSD 13.1-RELEASE releng/13.1-n250148-fc952ac2212 GENERIC 13.1-RELEASE Note the: releng/13.1-n250148-fc952ac2212 Looking at the live system after the freebsd-update to -p3 : # strings /boot/kernel/kernel | grep 13.1-RELEASE @(#)FreeBSD 13.1-RELEASE-p3 GENERIC FreeBSD 13.1-RELEASE-p3 GENERIC 13.1-RELEASE-p3 No text analogous to: releng/13.1-n250148-fc952ac2212 I'll note that the actual 13.1-RELEASE-p3 for the binary release build appears to have been a build of at: QUOTE author Mark Johnston 2022-11-01 20:54:33 = +0000 committer Mark Johnston 2022-11-01 = 20:55:10 +0000 commit c3c13035ef270dcf0d24d2d847dd590edc535ed0 (patch) tree f6582d69009a70d8ae8b52e00da4cabe6d159fb7 parent e81b1bd17fb4e83865d60461c2554d90f72cd395 (diff) download src-c3c13035ef270dcf0d24d2d847dd590edc535ed0.tar.gz src-c3c13035ef270dcf0d24d2d847dd590edc535ed0.zip zfs: Fix an improperly resolved merge conflict releng/13.1 Approved by: so Fixes: 8838c650cb59 ("Fix use-after-free in btree code") Diffstat -rw-r--r-- sys/contrib/openzfs/module/zfs/btree.c 1=09 1 files changed, 0 insertions, 1 deletions 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); =20 rm_hdr->bth_count =3D 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); END QUOTE I'll also note that none of the FreeBSD-EN-22:* notices lists an exact match to what was actually built for the binary update. That would have been true even without the merge conflict fix, in that, without such involved, the final build would normally be based on a "Add UPDATING entries and bump version" type of commit after the last of the FreeBSD-EN-* commits reported. In other words, nothing seems to record and show anything identifying the actual commit used for the binary update. That could also be of interest to folks that want to build by starting with the exact same source code vintage as the binary update did. In this case: = https://lists.freebsd.org/archives/freebsd-announce/2022-November/000048.h= tml looks like it needs an update because the reference: releng/13.1/ 8838c650cb59 = releng/13.1-n250167 is to before the "zfs: Fix an improperly resolved merge conflict". That update will identify the commit built for the binary update. =3D=3D=3D Mark Millard marklmi at yahoo.com