From nobody Wed Apr 06 14:33:18 2022 X-Original-To: dev-commits-src-branches@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 7D3521A95A6D; Wed, 6 Apr 2022 14:33:19 +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 4KYRnq1YkHz3QXj; Wed, 6 Apr 2022 14:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649255599; 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=Q9mCyl4Vo2d7sBvuEtk3+OBrGjYqbP3uouCCti/+YvQ=; b=Bxdq9LaauH3KM2taatea9JMubAcCyVF8ir3Ijgt7gC5BnVgopPx9y/kDOju3IJRptSGCvN TtuQg0tSWUdarSjMclxoBZUJu5TIYNSjKRYnVwR683OMK3c86N+PJCQ9zlHOW8UScUv6Op ICjv/TDCl4pcS52P9eyvmV9TejKqkyWtZwyGUJKcqcQ3grfgUBMpMp9FBHbM6+wGYOvrPX utbAGKNl2UHrG2oXX0FK3q9e7Ibm+5U4IuiUfjEOXOyvfIn4HwIce81qo/iom8Vu2RACAK JNufPPawJZAtYey/on+WfhzvfBTuf2jKCcdqgSE5zAlX0qtJjuQBpLiFLPDkow== 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 14A811CF1D; Wed, 6 Apr 2022 14:33:19 +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 236EXIQm066255; Wed, 6 Apr 2022 14:33:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236EXI8i066254; Wed, 6 Apr 2022 14:33:18 GMT (envelope-from git) Date: Wed, 6 Apr 2022 14:33:18 GMT Message-Id: <202204061433.236EXI8i066254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 99931db675d4 - releng/13.1 - libbe: fix be_mounted_at() with props after bootonce List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 99931db675d4d1ac702120f89a060fec1b152ae7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649255599; 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=Q9mCyl4Vo2d7sBvuEtk3+OBrGjYqbP3uouCCti/+YvQ=; b=CAbWRPzo7pYLGFSDhm41gZW32WpH6zOLa1RrFFoWgaht1/3Tbb7XhiXJS1HqDjiU11cABg B/FRFkWtcCOGuId4503Hs+VTD3zKn8nh6uOizGVTQDbW20s3nq0TDgwEzgwgKlGUKezs1N UJ+2qoFIlGm8e/D5Dbtm2JkSTmZ8HLL7s0tAwzpTPy1FetTG6R7geXLiBmONzPvZg3VTSV pUrw/fKnrIVR8xnxNb3PZG025zAMCFL2C4qfSvzKD9sLrCzfamCbGczFSNInZyzQTaWa6i bjcH34UcI870fW1OH2ITBRhjtJNQj+SvLbgzHzOQubza6wfvD2Ep6xthitP1IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649255599; a=rsa-sha256; cv=none; b=u4+Mss4HDkCnfsLZZ5g1vQZXLc/Q73HZ2sReoEN3T7yybim8lVosnWjxiLCYuOP/+R8KCp t60HvUxrXnbZvpWy3ZKDy0TreozUr12u02qFSoIPT0fGpy1sADWrwUivSgc35enXHbJY7+ 4HSgeWYeRO0Hhh7Y24KhLfX9oZsAg46breuibTht1Qko/+SyKz/mwbvw8igrP18qUN6VAl PYxw0Q++g0625dy3NWaVjL5HF/cMGgWn/qiGYH+GAQOSJ8hgAq+j8hUaZojmUV+wydMy7U Psi5Z9yL42k70cOcS61zM1ZhDC6v1PfrcUfFiNVy+54LLJ5kHHVSOo8jtUfgkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=99931db675d4d1ac702120f89a060fec1b152ae7 commit 99931db675d4d1ac702120f89a060fec1b152ae7 Author: Kyle Evans AuthorDate: 2022-03-31 19:18:14 +0000 Commit: Kyle Evans CommitDate: 2022-04-06 14:32:44 +0000 libbe: fix be_mounted_at() with props after bootonce propinfo.bootonce was filled with garbage, leading to a segfault later during prop building. Initialize it to NULL. Approved by: re (gjb) (cherry picked from commit d155d8e138563c0b39c658684e6a4fe6e2e36f8a) (cherry picked from commit 6ce8e35cead46048d9ae3c1dabafe1ef4ed26f97) --- lib/libbe/be_access.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libbe/be_access.c b/lib/libbe/be_access.c index 9f7ad32599ac..ec966bc85fb7 100644 --- a/lib/libbe/be_access.c +++ b/lib/libbe/be_access.c @@ -219,6 +219,7 @@ be_mounted_at(libbe_handle_t *lbh, const char *path, nvlist_t *details) propinfo.lbh = lbh; propinfo.list = details; propinfo.single_object = false; + propinfo.bootonce = NULL; prop_list_builder_cb(root_hdl, &propinfo); zfs_close(root_hdl); }