From nobody Wed Jul 23 06:22:08 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 4bn3vP3m8bz5q0dC; Wed, 23 Jul 2025 06:22:09 +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 4bn3vP0rh2z3tQY; Wed, 23 Jul 2025 06:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753251729; 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=lFJhlm4LjbHd2w52IiZdNkAXMiGp6jq+gtOsLHnSxD4=; b=oRjE0ePiZT6VS1rgp4fEp4q3Y5QbNRyQbZHMkALwB3baYepMo9IaXBI6I+2CCp434GMq2g AFos5aa5pPNklIzclkpgRr1IlMS8YSNdHXGDNinFSRYt/ca7UPqT5gXayVkpovs+MsKlvQ UD5ryq0CAy/kIxjgsRFFpSq9/OY67Fa1WRCgu1bqcN/3fRp6qKp3ykn4UVpQNjGXZ4xebr yeKSVOMiEYxack3i4euLNy+JG2+zYUZTD0f3A6dvifb/8lT5t0BgDPhgTcGtpGZj9RIQ/l V1fIdQe8hd+hV9DybtdRwR9CILSmJTNDc+9uclM3e2FE5Dz6iAaPNfIsZkZCzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753251729; 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=lFJhlm4LjbHd2w52IiZdNkAXMiGp6jq+gtOsLHnSxD4=; b=KjdiJvF+QDin0NHgpOb9mYcpRHX5UkFlcL7QSHlgPs3wKoqBAFKAw8MS+sLe0vUc27B+Gc VTDZ70v8U/CaD/dDzMtAa+NMgQ81JdpWwXgeosRZnh7qTlT5WoD/jOIJZpXcSIUrRmgMYN cOv5DRYjjrB5ujgx78cUw9xRwLqeWzKrzjrZyHuOG23qCmJpzwkHIdlEcJeTralvZYec7M B0CS6Zki9MPlLz4afhF5zcaHg9EUCUhZDibkA58wa5QKQyaqAPHQhE/HxZWFvMMYGS4qLA iKsy8q22Td4rfiKaj93g3q5qJc9i3+BUbFdlTYgYb+J7sgOz/52OD+kzjHF6UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753251729; a=rsa-sha256; cv=none; b=ar8CwcXblgc9ZkWaV5ax5S5BxjWRWqk5y6bHKe2ZQ38fVS6KgVYdxgTsgncFyUcFpm7pdp RzjDZCx2aqUHi/0+psdw6N9JrouxeaingTERLEijToMHGKwcfuQSvmoAWcEgNlCNWAZkGi IhxU3ZybpgWng6LLO8gAlK2UvdtmNTYRcOrIcGzPtm61nAXpxTxGOcp7wnq2OEejSu+F/3 xQ+XseiFAezCEdUuYPoIrDXhWqR/4FHWN6zJFtr0Nnd00S3a1HnBh9v3ThNaTESZmpRRQ+ Vui7HIDNQ5quFTu9Br/b6Kb1UnLfBM85JArX4H93JNB4O14wSPRcTfcTJjyW7Q== 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 4bn3vP0Rtxz11N5; Wed, 23 Jul 2025 06:22:09 +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 56N6M8VT020346; Wed, 23 Jul 2025 06:22:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56N6M8JV020343; Wed, 23 Jul 2025 06:22:08 GMT (envelope-from git) Date: Wed, 23 Jul 2025 06:22:08 GMT Message-Id: <202507230622.56N6M8JV020343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b9210d1241ea - main - gconcat: Return EINVAL when the metadata is invalid for an added disk. 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9210d1241ead536d27785ef2a034b8567b26b10 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b9210d1241ead536d27785ef2a034b8567b26b10 commit b9210d1241ead536d27785ef2a034b8567b26b10 Author: Wuyang Chung AuthorDate: 2025-07-18 09:04:22 +0000 Commit: Warner Losh CommitDate: 2025-07-23 05:58:44 +0000 gconcat: Return EINVAL when the metadata is invalid for an added disk. We don't use the disk and stop using it right afterwards. The user should get an error indication, just like they would if there had been a disk read error. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1775 --- sys/geom/concat/g_concat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c index 2b1cb575cac8..2173a84c7acf 100644 --- a/sys/geom/concat/g_concat.c +++ b/sys/geom/concat/g_concat.c @@ -590,6 +590,7 @@ g_concat_add_disk(struct g_concat_softc *sc, struct g_provider *pp, u_int no) strcmp(md.md_name, sc->sc_name) != 0 || md.md_id != sc->sc_id) { G_CONCAT_DEBUG(0, "Metadata on %s changed.", pp->name); + error = EINVAL; goto fail; }