From owner-dev-commits-src-branches@freebsd.org Mon Mar 1 10:54:50 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id F04BE558D27;
Mon, 1 Mar 2021 10:54:50 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Dpxwp6Sxcz3srg;
Mon, 1 Mar 2021 10:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 D0D2A222EA;
Mon, 1 Mar 2021 10:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 121Asord088990;
Mon, 1 Mar 2021 10:54:50 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 121Aso2D088989;
Mon, 1 Mar 2021 10:54:50 GMT (envelope-from git)
Date: Mon, 1 Mar 2021 10:54:50 GMT
Message-Id: <202103011054.121Aso2D088989@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Toomas Soome <tsoome@FreeBSD.org>
Subject: git: 05e4a34e4360 - stable/13 - loader: autoload_font will hung
loader when there is no local console
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tsoome
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 05e4a34e4360f54ec62616730465410726c96ba2
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Mar 2021 10:54:51 -0000
The branch stable/13 has been updated by tsoome:
URL: https://cgit.FreeBSD.org/src/commit/?id=05e4a34e4360f54ec62616730465410726c96ba2
commit 05e4a34e4360f54ec62616730465410726c96ba2
Author: Toomas Soome <tsoome@FreeBSD.org>
AuthorDate: 2021-02-21 10:32:18 +0000
Commit: Toomas Soome <tsoome@FreeBSD.org>
CommitDate: 2021-03-01 10:54:36 +0000
loader: autoload_font will hung loader when there is no local console
If we start with console set to comconsole, the local
console (vidconsole, efi) is never initialized and attempt to
use the data can render the loader hung.
(cherry picked from commit 61c50cbc096d28e44cb8b627e524ae58158c423a)
Reported by: Kamigishi Rei
---
stand/efi/libefi/efi_console.c | 3 +++
stand/i386/libi386/vidconsole.c | 8 ++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/stand/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c
index 7024f9c8b2f2..3cbd121c41da 100644
--- a/stand/efi/libefi/efi_console.c
+++ b/stand/efi/libefi/efi_console.c
@@ -886,6 +886,9 @@ cons_update_mode(bool use_gfx_mode)
EFI_STATUS status;
char env[10], *ptr;
+ if (!efi_started)
+ return (false);
+
/*
* Despite the use_gfx_mode, we want to make sure we call
* efi_find_framebuffer(). This will populate the fb data,
diff --git a/stand/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c
index f94ed2d26712..b933a7807687 100644
--- a/stand/i386/libi386/vidconsole.c
+++ b/stand/i386/libi386/vidconsole.c
@@ -53,7 +53,7 @@ static int vidc_getchar(void);
static int vidc_ischar(void);
static void cons_draw_frame(teken_attr_t *);
-static int vidc_started;
+static bool vidc_started;
static uint16_t *vgatext;
static tf_bell_t vidc_cons_bell;
@@ -877,6 +877,10 @@ cons_update_mode(bool use_gfx_mode)
char env[10], *ptr;
int format, roff, goff, boff;
+ /* vidc_init() is not called yet. */
+ if (!vidc_started)
+ return (false);
+
gfx_state.tg_tp.tp_row = TEXT_ROWS;
gfx_state.tg_tp.tp_col = TEXT_COLS;
@@ -996,7 +1000,7 @@ vidc_init(int arg)
if (vidc_started && arg == 0)
return (0);
- vidc_started = 1;
+ vidc_started = true;
vbe_init();
/*