From nobody Mon Mar 11 14:13:33 2024 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 4Ttdzf0q0lz5D45Z; Mon, 11 Mar 2024 14:13:34 +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 4Ttdzf0CFrz4PYS; Mon, 11 Mar 2024 14:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710166414; 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=gi7D0+x4nCftzwxigxiuMKGnNpPwd5TnZm5qTTE+DBI=; b=kBfULzGPS8sRb79zWGoYH9KLRgAsSnEIel0cisa30f1IcXYhuLlDNVUHi3YktfYkJRD+lV /Haqs/SiMwYHWAkn9wO2SsTkURB8Ast9qJGcY69/Ng4s8moY1yXWJBWJ22DngqFwaREkSB AUSY5a2P3xjgjQWPmeJIpnRXuQ/cUPHgy2w4zlIAF9Stt6gIEVFkSfPs1i4kGF9RuFI8ui NkzP4RBzcj2gBEWZ4z/VQclJJwfJXnOT+loYSDFLG7M+g5+17Au0Pfjay0CvgDyjMbZrq+ 4wPPqMDFB62XLslyOSJnVtmgaT3KYABSGPh0lj/FkX7VApwVzCfhxAybLKv/QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710166414; a=rsa-sha256; cv=none; b=xxl7hrCmT0kmvnodiWTI9PmYj/0edKhLMRA6rnScmgmSa5N6h6FaVllwRpC7+dfAHYR2wg ZC8o4bI4hZUFgM2PUhRzwJa59WYyMiIdaD+jvvBeyaj7L8pGevT4xtj8z7MLM825Dv7HM8 Oj0Jn1GmWAPghv2bXnURzsgJB4WkbHCCR0G3dRAwwjMkjg5io5bB0XYs72sFlI01CC17fR 2q1l0MKTxfEYIyd3+4MzrGXfvNwKN4cwBbV2cludCbLfHeVSDWH+hFyx7KYtkeHd6TejiV YdAIiLPhNCs5qk7zkCu4ZlYegWX/8Dr+nl7gc2/sbMYy4ikl5wMsp+MSQpt8zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710166414; 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=gi7D0+x4nCftzwxigxiuMKGnNpPwd5TnZm5qTTE+DBI=; b=jmYDb3A1m/UwSn2q4ZUOLPEFLq1IgasUf8Kw2Ncm+oXp/zYY4ZeMc54H4X0f6bk+lIoQ/C FJM8sN5A4FTljvkggHMkIcMLlVGyLrrghH6LLnW6qWXm/VkIrRBTHauF0X0ix+YZUelMz3 QwmpYzRPyb9jVwAwLz0QBuAR+jVi6dryk2Zr9VKJiQ94fg/jI/15n0XWueIfxZqYrDt6qc yoBTcbU9TPCfEqJQ6vURwRsJQvSy/MnQWxOqgXJdfMzkEVVRQghnS3V3xPgzLk4/2j8dvN fVSltvF1hqJ00pFAlZTe9kWtT52w6ro7CISVJAVDDJW3bcPCSZHdmHdo/Ok/cw== 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 4Ttdzd6sHDzYQS; Mon, 11 Mar 2024 14:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42BEDXFk097451; Mon, 11 Mar 2024 14:13:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42BEDXHJ097447; Mon, 11 Mar 2024 14:13:33 GMT (envelope-from git) Date: Mon, 11 Mar 2024 14:13:33 GMT Message-Id: <202403111413.42BEDXHJ097447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Toomas Soome Subject: git: 0148ccb95a8d - stable/14 - loader: we can only env_discard() existing variable 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: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0148ccb95a8df13d8a1234083490655d40550527 Auto-Submitted: auto-generated The branch stable/14 has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=0148ccb95a8df13d8a1234083490655d40550527 commit 0148ccb95a8df13d8a1234083490655d40550527 Author: Toomas Soome AuthorDate: 2024-02-25 22:34:00 +0000 Commit: Toomas Soome CommitDate: 2024-03-11 14:08:50 +0000 loader: we can only env_discard() existing variable While dropping nvpair from nvstore, we also remove the corresponding environment variable. By doing so, we should be careful not to try to unset non-existing variable. Reviewed by: imp MFC after: 2 week Differential revision: https://reviews.freebsd.org/D44083 (cherry picked from commit 1b3f4ccb7dd8600d010fc6a09b09ee7d74872809) --- stand/libsa/zfs/zfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c index af938fbe1b2b..f3cf60786a23 100644 --- a/stand/libsa/zfs/zfs.c +++ b/stand/libsa/zfs/zfs.c @@ -1265,8 +1265,12 @@ zfs_nvstore_unset_impl(void *vdev, const char *name, bool unset_env) rv = zfs_set_bootenv(vdev, spa->spa_bootenv); } - if (unset_env) - env_discard(env_getenv(name)); + if (unset_env) { + struct env_var *ev = env_getenv(name); + + if (ev != NULL) + env_discard(ev); + } return (rv); }