From nobody Thu Nov 12 09:19:52 2026 X-Original-To: dev-commits-src-all@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 4jQFGJ73Lsz70GT3 for ; Thu, 12 Nov 2026 09:19:52 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQFGJ6Tz5z4rw5 for ; Thu, 12 Nov 2026 09:19:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794475192; 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=HcY8c8kKAbLPY+dNdmjr6VLCJEw3Ckguh03y01k8zXs=; b=tGj+55lgxNwEIq5Siwlv/8Ysu79EcwgPjRDbyZxnfsIyowt+mBuCWeNMBbDDmu9BpIzX6p sgKW64y1o5SKOYgXxP/yh7+OSfEFE8P5HHHzB4fC887z8g5wCOE88gvHlLqr17uoFOsaH0 a8NWyMnPMVY+TxJjyVcpfmg3D9AUiML0JJdpVJopULOxA/P6hmrj0Yoo3IhoYVpdZFIXdN qdHvkLz7Xz6DRlr+RCA26V1Wc7mHdDW5JiOyO13FrB3wghRZuIEHP9+YQWNc2smKUNTfXn 2EX/pqauu3hZvhcWM2/BYRFo1+I4oTZqxFK3Q4yvOL8B1dOeWOjxdsd1n3/kKA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794475192; b=v4fIhCK8gGSzoJ8ErrvnEolmpf8LDK3kqiGJMpQk+XKwjIGvWlixwJqtSlAsgUK5tu9tlX /GKnUqzKE48XDzg5Yop93J17J1lZ+p91WLT2y6bBB5HHtoYQ3Hn9DBBDtb0MsiUruMPwVC RKmHZZ1B7H8PwHciYi2iAcusLL+STSCAi2tFGlfeJP6XJfafikzqh3QnRBhs1SqirPhrOw 3wt3FlXCe+5ZYkyQtQRb9alEcSRUgLbF03O8tXbWKKFscX95GbBa1ZTMzT+fMcnZhhV9Uw NQ2FWsWMME6/UKRkQBgdQh/4npQ1sjUtas6UA62H6der/VfQEAdSuXOxc5doVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794475192; 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=HcY8c8kKAbLPY+dNdmjr6VLCJEw3Ckguh03y01k8zXs=; b=ESHuLCk8+jg0VWDe9coGclv92HJOoYL40T911MlmBX1bN1bP7YUHbDrEyB8EiYQBr8kLCd YzvkjnMND7Mj0iDtNsYJ6+ltfJnZIBVcF127G4GD0w0c6sDR/dkmneJ1sArq77dV4EtQcQ 6kGuRlfXWbtYbqrrVSMAV/guKlXvf8UpIqc5M0Nty+zgC6n8U0nsxD2PYfJ/n2eKrXP/CS ElbjqRuJ90zCwaWkzK3b2LSmfgz1wccaM9rqytyfpj98OxQXBznV0P+3wBGqM0fSZuxUXP Ufxq4Bnurj1/VDX1IzNmPs6Mt3+35ICNlsp7CA+W0t+nrNra9CtBU3QUMbn1PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQFGJ5hzfzxFJ for ; Thu, 12 Nov 2026 09:19:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ace8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 09:19:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: d687c9fc7efe - main - stand: Accept any device name in disk_parsedev() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d687c9fc7efe55d1ba7bc7bea056352ce0437588 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 09:19:52 +0000 Message-Id: <6af584b8.1ace8.1b6f99b3@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=d687c9fc7efe55d1ba7bc7bea056352ce0437588 commit d687c9fc7efe55d1ba7bc7bea056352ce0437588 Author: Olivier Cochard AuthorDate: 2026-11-08 21:34:05 +0000 Commit: Olivier Cochard CommitDate: 2026-11-12 09:13:24 +0000 stand: Accept any device name in disk_parsedev() disk_parsedev() only accepted names starting with "disk" or "vdisk", so other DEVT_DISK devices using disk_fmtdev() could print a name they could not parse back, e.g. "md0s2a:". Skip any alphabetic prefix instead; devparse() has already matched it to the devsw. Reviewed by: imp Approved by: imp Sponsored by: Netflix Differential Revision: https://ron-dev.freebsd.org/FreeBSD/src/pulls/97 --- stand/common/disk.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/stand/common/disk.c b/stand/common/disk.c index 47f882d5a532..42981c4c6090 100644 --- a/stand/common/disk.c +++ b/stand/common/disk.c @@ -419,15 +419,15 @@ disk_parsedev(struct devdesc **idev, const char *devspec, const char **path) /* * disk names look approximately like: - * v?disk([0-9]+(p[0-9]+|s[a-z])?)?: - * so skip over the initial bit. We don't have access to the devsw - * to check the name. + * ([0-9]+(p[0-9]+|s[a-z])?)?: + * so skip over the leading name. We don't have access to the devsw + * to check it, and any device using disk_fmtdev() can land here, so + * take whatever alphabetic prefix it wrote rather than a fixed list. */ - if (strncmp(devspec, "disk", 4) == 0) - np = devspec + 4; - else if (strncmp(devspec, "vdisk", 5) == 0) - np = devspec + 5; - else + np = devspec; + while (isalpha(*np)) + np++; + if (np == devspec) return (EINVAL); unit = -1; /*