From nobody Tue May 20 16:12:20 2025 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 4b201x1KQGz5wbNM; Tue, 20 May 2025 16:12:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b201x0hXcz3sVR; Tue, 20 May 2025 16:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747757541; 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=FLdLxWOghTzi3Cwt9xeeeC933fhI8IhaIOBgV1rZd7o=; b=lyihud5UaH7WPkt4kllZGA6PQRSwpKGn84mJeV1ucofMi7wzmYKqajhWrHzkZWcpdzD5PO MT2L7H/E7w/4SQuLWrR2yWU/Kc9HuXQ36wFTVhCIE0N3lyQYP/22IJ5vl5+5yhtr84DOxk 9QnZEEI69MnyRkwwOg3EcWrU3wpMJN0YcoZhAqeAY+Lo+rh76K7wSYF5x8FyylxaVNjIKQ /Tu2k7yT37VhCTiM/md2tWS8e1SRS9ViETt0+3w8AarhHsAk1+nF9QuqzZdhMKkTB7EKJv 3LZaZkkhqEtn4EuzCC+TgOuqrGr1rJ6QrFxn54mD2rCQAdj8QKMPjlD1mPq/BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747757541; 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=FLdLxWOghTzi3Cwt9xeeeC933fhI8IhaIOBgV1rZd7o=; b=K9wcvWdxDhbQZ19W3X7AMoKCUfEd15l6ESXXAIHqzuYr02XOEg8yWswEl/MpbQ5ZxAmf7a cKxFdYWErNitLEXa1VLfwLE3UQV/67wxZYVYi4/hpVL6m0rZBc7Qb27WgXtmD1aY51V5XQ cE60bQvDE4R4tszlrg5S+bh0xm7m3fGytQSZDfmE/Oj0ayorxBtTMuw4W3qO+vy0LVfxDi rcW/sXnrW6Z+Ap/onxgSyvLD2e24b+q/+4+SlGCwfn81qRu5b1FxZk3Km01NJwsqgJsEMM JWIOHPvk6AFsjd/Be41W0TjUWBHxWiy6gDRcj2/+VmZ9pwgmgn1tGkSoxKYyjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747757541; a=rsa-sha256; cv=none; b=NtYv99WXOrmI1YB72yD1rRy9RPSUi7J+GWdxAcK1i4VGNSvFpKAys4K/oodLlYj4oN2JqS +HUH1l87JwKR2y5LNabzao867VeIXuwRLuHPlcPVJwyXH6foDjdjnkUK0my8kiyJrJhp4H HsvF0pN36/qci/QLxKDpses08kejJa9A1VRmF7OvXL2QFIZhr8ua6WVC0zLuTiZZi3Sfhe UTBemelMhIF1dNqStixQznCjFzc7/1fpAsAE9Auplng1HCFYV9ijkju6VecgMeNwIAcZd1 zv9TsqHCzDRV6JRf7L56tcvFoLDh+OxzNvSEiNJrfCIyIhSBgc+q+M0wDjwd8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b201x09Cjzwdn; Tue, 20 May 2025 16:12:21 +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 54KGCKr1003841; Tue, 20 May 2025 16:12:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KGCKGu003838; Tue, 20 May 2025 16:12:20 GMT (envelope-from git) Date: Tue, 20 May 2025 16:12:20 GMT Message-Id: <202505201612.54KGCKGu003838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 41cf74fe8ce5 - main - loader - guard against empty rootdev List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41cf74fe8ce5c6f8f10aa074e9405043a242a2b1 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=41cf74fe8ce5c6f8f10aa074e9405043a242a2b1 commit 41cf74fe8ce5c6f8f10aa074e9405043a242a2b1 Author: Simon J. Gerraty AuthorDate: 2025-05-20 16:10:50 +0000 Commit: Simon J. Gerraty CommitDate: 2025-05-20 16:10:50 +0000 loader - guard against empty rootdev At least one instance of u-boot pretending to be EFI is passing empty rootdev to loader which does not end well. A simple precaution is harmless. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D50334 --- stand/common/metadata.c | 2 +- stand/efi/loader/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/common/metadata.c b/stand/common/metadata.c index 22df6f175791..715354aedd04 100644 --- a/stand/common/metadata.c +++ b/stand/common/metadata.c @@ -111,7 +111,7 @@ md_load_dual(char *args, vm_offset_t *modulep, vm_offset_t *dtb, int kern64) * tested/set by MI code before launching the kernel. */ rootdevname = getenv("rootdev"); - if (rootdevname == NULL) + if (rootdevname == NULL || *rootdevname == '\0') rootdevname = getenv("currdev"); /* Try reading the /etc/fstab file to select the root device */ getrootmount(rootdevname); diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 2384fd08b964..c9a842afb06d 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -513,7 +513,7 @@ find_currdev(bool do_bootmgr, bool is_last, * it's wrong. */ rootdev = getenv("rootdev"); - if (rootdev != NULL) { + if (rootdev != NULL && *rootdev != '\0') { printf(" Setting currdev to configured rootdev %s\n", rootdev); set_currdev(rootdev);