From nobody Wed Jul 12 03:10:58 2023 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 4R12nG3YQDz4h3f4; Wed, 12 Jul 2023 03:10:58 +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 4R12nG2pwrz49Ws; Wed, 12 Jul 2023 03:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131458; 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=5x/JiU2lrDv+iEv+QLuElp4yS+JB5JkoDM6ozAERatk=; b=NY2GUGdM+lgu/1hOpK4qklURxL5QnyF1Xt1ZgpYKHxOSwY/+NMwuPEFOYOE/NnJe4xm2Eg MnQhLnKyJWhj6uKOr8yK4dwCv7vstgGeim/pbiW7AtRISj+u+dTrbJFnOgPk5qgvHA2zc9 hEzJnApt27/FVY4jis8zdfE18K0vtKpr6Ye7Dt2QXb2FCAMtZSPBpjZ/G3TQKzaAJQt+wR bkFqGg7Y0+7GWjisfg4pnBD7DMwRlXd1bj5VKs5NHAHF/9rRXTA6qVhCwI8OAHcU4ePwWU YS9NRZeqtYw9TctrD0OtSPpvAHTBPf4NK2RKZKVP+CWh915GsGsAdDm7hBUrKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131458; 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=5x/JiU2lrDv+iEv+QLuElp4yS+JB5JkoDM6ozAERatk=; b=dtXsdME+Ml4nvzoxN8BMFPnF5sYAQVY9jVkWd/UzoQLSRYY10KmkrWDu8SlW8f4LM9aeF2 LED4qeYo2H2tlvA5Y+gY0L5v+kxCwq5rlKpPTlQ5Px7lA4JWZvHdQW9DgVhLoqxurj2uDV NtmIV3o0w9OaqYLe6vY6lESrYvl6zaFZzlChtLO9hGUHOnKfhoimUn8VUtAjDIVd4YB4Pr 8BkJ2NqvSC+aSRyqVFGhmpcxM0lZoC9k5MzrD7rwPSk4ah2qPaUbMwsDWk4ge4ByjjzN3o IOBQTYmSkhK+/iAf8baiBzZqfUrl4sYVttrWyOgtObNchr4QCFsid6IpYDIBbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689131458; a=rsa-sha256; cv=none; b=AxRbjYuEydrWwf0+qiY0sydK1ClyA1b0n0G88RD2dLy8YZiQLKJzgeGgidueXrRYakWF5o xcVqvLgnNCl/oRuXbWU+5osvlR451HkJupBdaQjgUkhvUzzcFmKKs6eawM2OBWxjZdLMMX YivvAgcWMHufrC9g3SEAF/QR4F2bopeUKd0/7GoEmj4YST9FYqApeP35Kv9z/8YRYdqbpX 65eFuq/v1aEcaZ0Ohcm1f3fH2tKDobk63mNbSJVNK8b0x9XSW9k90s7ccNFdjpl7ic7AeE 2YAV+44gXxOAHbNav8e81LowGhNbPe7iDNV+z2fwha6NzFPAt6eHWqsmTxa29g== 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 4R12nG1k0xzsWm; Wed, 12 Jul 2023 03:10:58 +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 36C3AwY3011425; Wed, 12 Jul 2023 03:10:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C3AwNQ011424; Wed, 12 Jul 2023 03:10:58 GMT (envelope-from git) Date: Wed, 12 Jul 2023 03:10:58 GMT Message-Id: <202307120310.36C3AwNQ011424@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: f25a4bbf5d1f - stable/13 - libbe: bail out early if the zfs kmod isn't loaded 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/stable/13 X-Git-Reftype: branch X-Git-Commit: f25a4bbf5d1ff31708d64f9cca644ae34e62cab0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f25a4bbf5d1ff31708d64f9cca644ae34e62cab0 commit f25a4bbf5d1ff31708d64f9cca644ae34e62cab0 Author: Kyle Evans AuthorDate: 2023-07-07 00:41:14 +0000 Commit: Kyle Evans CommitDate: 2023-07-11 15:06:00 +0000 libbe: bail out early if the zfs kmod isn't loaded As noted in the comment, we already know the rest of libbe_init() will fail because there's no pool imported. Avoid the side effect by checking beforehand and bailing out early. With this, freebsd-update(8) should no longer trigger a load of the zfs kmod just because it runs `bectl check`. Reviewed by: jwmaag_gmail.com, rew (cherry picked from commit 2f700ca965a04c4a03b6f760da6a210b6ca4df4b) --- lib/libbe/be.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/libbe/be.c b/lib/libbe/be.c index 13f7a59d5215..471a25e6304c 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -119,6 +120,16 @@ libbe_init(const char *root) lbh = NULL; poolname = pos = NULL; + /* + * If the zfs kmod's not loaded then the later libzfs_init() will load + * the module for us, but that's not desirable for a couple reasons. If + * the module's not loaded, there's no pool imported and we're going to + * fail anyways. We also don't really want libbe consumers to have that + * kind of side-effect (module loading) in the general case. + */ + if (modfind("zfs") < 0) + goto err; + if ((lbh = calloc(1, sizeof(libbe_handle_t))) == NULL) goto err;