From nobody Sun Nov 15 13:45:40 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 4jSC1c6tZ2z6y2h7 for ; Sun, 15 Nov 2026 13:45:40 +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 4jSC1c4vsdz4q7g for ; Sun, 15 Nov 2026 13:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794750340; 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=uhEgsm3bH7Cabfw3w3HKyBEa4WW0ApAZI73b2HdwL7Q=; b=M/4gj0viK3cYWgBTwlKkO1QuBZjh+bupqRSdCCFzTws10kfZRlYgCtYPAU+5eo4B7z2gqA tx2QEZR/GMYqiNgg6yvdN9MGahkE7iv7Svpfe37KcpXm8qde7lEXLAYJzsvld+lIxPdGvc Ha1ZQMtC3R5lszGY3EnCrIIRFhrpXNp3NqoT4OwpP0pM7qCJjX6Q1cWwohqcKdeB/HUDZT AJ0nppudGWR4pC8fayo89QoYGAhzqqgWFKXEwbTnj+ydDdgYZVjK7rsr1cW8UF/hyF0BYQ m0NdUq88nWbL6YrbjiFA2dUs9cb7zsWchoxA0meBBq7NWumrurRHkocMCuMMkw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794750340; b=g199zP3dHslzJ/oL0vZfZKQMq5T9Py20xOC/JyJ6Ua1uY0MsChQXicdZGQHmskSFphp0k+ 4UJZO814cxw/e3ze4MPwc3ZqBrVM30Y1sF3pXquU8Yv5bfOYKBddVPDnTOy2fZ6hNdizht vJponPOcqbXNSD5CHKGifyz314hNmm5/X1D/GTGglxDQXx174aahKFU74XKRg8IRL5wQfz HwoH4NDt7I38iRd7gMaClY9GPy+ZGXaBeq6ZvZY05EHim6FP7kIyhEvYgj/emi3m89gjj0 pdrzLb8a4KD5IjB0zNu/SCqZzwz0XfUJW4NDx9C5cFxQA9yiaXJcLxXSlS1vng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794750340; 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=uhEgsm3bH7Cabfw3w3HKyBEa4WW0ApAZI73b2HdwL7Q=; b=o0Li54GfQSv7SqAbzmV73TjRkCTOvxvue9e8xe6SiSyPaSewqfbgR9pJcmqJ/kWueyKaOT UDarR8gulCLVy0CcttxOygDVK2ga4ad6AFGO3XTSr8Gq0K9ioQ4J4yz8RRyjFs9ftuidtM hmr/fx29sAgTsiDqelo3AP5atTh0deBhP948ZLEkbrNDrL/sI7HIxF3L/98y0DeMMDj1pP 5vSIULADgO4DYuIGggS9f2JYU6cil52f9AVMeCwsceNNtiy86CNvmtPN/Kdks5TKKsLdUD Ta+AMlYmWHJ5KgzsjclLb1CwM+68LEX1+UMODLedF0KZh5LW0VnVQ/oNHqZEqQ== 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 4jSC1c4Zgtz18D9 for ; Sun, 15 Nov 2026 13:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 14c76 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Nov 2026 13:45:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 70cf7c62ee14 - main - ubldr: Pass the whole loaderdev name to 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: 70cf7c62ee14f54c5c0a4d3aea8be35e36166d58 Auto-Submitted: auto-generated Date: Sun, 15 Nov 2026 13:45:40 +0000 Message-Id: <6af9b784.14c76.538f4289@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=70cf7c62ee14f54c5c0a4d3aea8be35e36166d58 commit 70cf7c62ee14f54c5c0a4d3aea8be35e36166d58 Author: Olivier Cochard AuthorDate: 2026-11-12 10:54:22 +0000 Commit: Olivier Cochard CommitDate: 2026-11-15 13:37:33 +0000 ubldr: Pass the whole loaderdev name to disk_parsedev() p - 4 is one byte before the string for 3-letter types, so whether loaderdev=mmc0p2 parsed depended on that byte. disk_parsedev() now skips any name prefix itself. Reported by: llm-postcr Reviewed by: imp Approved by: imp Fixes: d18ed8e19c3c ("stand: Try to parse vdisk correctly") Sponsored by: Netfix Differential Revision: https://ron-dev.freebsd.org/FreeBSD/src/pulls/105 --- stand/uboot/main.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/stand/uboot/main.c b/stand/uboot/main.c index 6f53c83543ba..15c8e008a223 100644 --- a/stand/uboot/main.c +++ b/stand/uboot/main.c @@ -229,20 +229,14 @@ get_load_device(int *type, int *unit, int *slice, int *partition) * of the string contains spaces, dots, or a colon in any location other * than the last char, it's legacy format. Otherwise it might be * standard loader(8) format (e.g., disk0s2a or mmc1p12), so try to - * parse the remainder of the string as such, and if it works, return - * those results. Otherwise we'll fall through to the code that parses - * the legacy format. - * - * disk_parsedev now assumes that it points to the start of the device - * name, but since it doesn't know about uboot's usage, just subtract 4 - * since it always adds 4. This is the least-bad solution since it makes - * all the other loader code easier (might be better to create a fake - * 'disk...' string, but that's more work than uboot is worth). + * parse the string as such, and if it works, return those results. + * Otherwise we'll fall through to the code that parses the legacy + * format. */ if (*type & DEV_TYP_STOR) { size_t len = strlen(p); if (strcspn(p, " .") == len && strcspn(p, ":") >= len - 1 && - disk_parsedev((struct devdesc **)&dev, p - 4, NULL) == 0) { /* Hack */ + disk_parsedev((struct devdesc **)&dev, devstr, NULL) == 0) { *unit = dev->dd.d_unit; *slice = dev->d_slice; *partition = dev->d_partition;