From nobody Fri Jul 11 03:27:24 2025 X-Original-To: dev-commits-src-main@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 4bdcbK6pVGz61wVS; Fri, 11 Jul 2025 03:27:25 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdcbJ717Tz3tBg; Fri, 11 Jul 2025 03:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752204445; 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=qsE1Yisg78o39mkvv9mU0sbngNGfKtWTAgLKI9olUKw=; b=Tyevm1xUR1FBfOS6W/+TAblEGYfnjMHVN/y8eIunaBb/d6Of45zZIRdhX0oLZiyHnBjGUH weZmApbItGy9t4yB2x+qDTvl7ljrSnIApY5lQyOsi3BrqVxtEYcHseDHwYRr7DY6FFKf0n 4dThD4PyFHsJinFIQ0bKsowBEeEjDTrcyIYRUq3FLab2+y3RiCF11nTnskOMSJc2DHwoWs ykZVT6/mnH5jyfoysOyFxWHAHckJSP58SaRbWHoPCIvIA/0/Gn3rG17TsQPurZqsNsyz4U OFg870cd52LRY9om8EEnnf4kUIRT5zCmm9IHcMpcSjymILvDkp0wiL8vQb9UzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752204445; 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=qsE1Yisg78o39mkvv9mU0sbngNGfKtWTAgLKI9olUKw=; b=IaTzczmvWLcCz/iZtfhLtZo7pZV9qFxcG/AqUK89QRWqdd10Q/+eW01S6c0vFUB/75PvqC EqHqoNGXCcbMe8u+/WUFfnQdRKIuswxSn35vQIAd6eTbIhRO3v3nGex+rvt0ATZ4ZHiMDG toQBixStJCUzSu+TRv89kLcsOMldzz13xVbEQFyXZETDIhxpPBYMTHPlBZ6mmP89JQmnj8 dPfgegSPosmnqLzytqRBmcb0NZmvlwUXcU11MT40rKjIRuntjrSHAI+Qw+qGZL+DaUDwIc 2P+ZTPSMfrs9cU7PK9xXsous9OjCXkpZNkJskTvrXRJM/l2e54UBn/nFib8mrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752204445; a=rsa-sha256; cv=none; b=VlEU8wj909hAP4W9/mfP28y7nzUfjeH6APUokWdZou7udC4z0AKLL2lf1Wiih6s+kubIXh kgtE1KVfzKY6RbrbZCZe3xR/RwSz6NKZxS0Fl14UREkV+jbksHhFGY4RNced6Ses/iPr9r cjjrGoA+q+qv9pAk2W+C/4l+DdZiS79dsPdlTfjEgDzA05yACc6qMymeq8cVGr64/8auY0 Pkq4poa0ph3gOVpMihVKESx5s5r2qAnKBrbEP2J7OmYBbF5jyqwbVq6EQPTw8D5wnn9GOD B1D3EzAJaSglpE2DNpvv6UKW//rcQthM0Ej4bxcyZ+EeYSevOX6P3KWzImfVOg== 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 4bdcbJ6C1wz4lM; Fri, 11 Jul 2025 03:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56B3ROOR042018; Fri, 11 Jul 2025 03:27:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56B3ROPg042016; Fri, 11 Jul 2025 03:27:24 GMT (envelope-from git) Date: Fri, 11 Jul 2025 03:27:24 GMT Message-Id: <202507110327.56B3ROPg042016@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 8e8fd66ca06f - main - libsa/zfs: fail earlier in vdev_probe() if can't find ZPOOL_CONFIG_GUID List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e8fd66ca06ff73f3b4bdf3f7735d727a881cf60 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8e8fd66ca06ff73f3b4bdf3f7735d727a881cf60 commit 8e8fd66ca06ff73f3b4bdf3f7735d727a881cf60 Author: Gleb Smirnoff AuthorDate: 2025-07-11 03:26:01 +0000 Commit: Gleb Smirnoff CommitDate: 2025-07-11 03:26:01 +0000 libsa/zfs: fail earlier in vdev_probe() if can't find ZPOOL_CONFIG_GUID Don't store any configuration in memory from such weird label. --- stand/libsa/zfs/zfsimpl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index a31fa24f358e..c7dc72561eff 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -2067,7 +2067,9 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, nvlist_find(nvl, ZPOOL_CONFIG_POOL_GUID, DATA_TYPE_UINT64, NULL, &pool_guid, NULL) != 0 || nvlist_find(nvl, ZPOOL_CONFIG_POOL_NAME, DATA_TYPE_STRING, - NULL, &pool_name, &namelen) != 0) { + NULL, &pool_name, &namelen) != 0 || + nvlist_find(nvl, ZPOOL_CONFIG_GUID, DATA_TYPE_UINT64, + NULL, &guid, NULL) != 0) { /* * Cache and spare devices end up here - just ignore * them. @@ -2106,11 +2108,6 @@ vdev_probe(vdev_phys_read_t *_read, vdev_phys_write_t *_write, void *priv, * be some kind of alias (overlapping slices, dangerously dedicated * disks etc). */ - if (nvlist_find(nvl, ZPOOL_CONFIG_GUID, DATA_TYPE_UINT64, - NULL, &guid, NULL) != 0) { - nvlist_destroy(nvl); - return (EIO); - } vdev = vdev_find(guid); /* Has this vdev already been inited? */ if (vdev && vdev->v_phys_read) {