From nobody Wed Nov 04 19:47:15 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 4jKbZ10bjQz6ysmY for ; Wed, 04 Nov 2026 19:47: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jKbZ072HXz4GmG for ; Wed, 04 Nov 2026 19:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793821641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=25T6fMl0EQs22WtAmVMTuH9bD67PCEorRKFli6Qw6UQ=; b=MG29FC72Has1CfrnUqQfbRIr6T61fQC42DcVj5sLwGWEYAsRiGTVURPJtpsO5vFqXWUZg7 y8+pibIiVqX2od01+JSH4eBfpHcBNK+D8COkRRDV/jmAnv3ebKxeJRtkb1Eot5IdxlCoQ7 zGxqkN4r+w0cgrUVd/iiYYOUZeDss6aI338UU14qH4/FNAviLhXVRs6WHXaDkyQMrLuJt4 Wf/pf3RMSTKuOvIIAkkDKg+hfTC84OlocMpwhyOgXHfNiwBMa1Ec5ng4trACi2Dmd8tpDh QVIBV2+E1nke1sA4nYFpSOseGxm7Dsv4C2XFajXH/wPOjr7qNb7uGs/GSIoHNw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793821641; b=mD5kNN0fJ4rf7hfgeNCYQ/gM/clLpDljSavoFEbOBIT6ir9JiyrsoLBKLEstt+Pdz2J20x 0UZa7JU+FH6VY+0EmvjcuIJwJBq8gQbqLKMEKB7WiIIwgYNWnSo/TSgjPpzk4D3b8jwkbx XGAed02ievcBUQ7CFXXhGAV4B3Y4e6wz+bzzmmQJ2VJi8pUrteqIAUHQmWgTjWsNktJhyP NHV6OZFn4BsEv0rcRxmXc2Nlif9MdK7odkPZdxwX9UkX8oGC43gyZwoJz2plg/iHVkOA7V AZEuOwJHI207Op53F0Us2u8wvXv0MvQ+bzLb+P7UYg7xkJF/lqGc5jFrA9u04Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793821641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=25T6fMl0EQs22WtAmVMTuH9bD67PCEorRKFli6Qw6UQ=; b=uYlTcf4E8cMUpyOKpdSddxtcvadDxqPxG2q/weIy5W1tAwAxWy27Ign6p2iOG/JAWLXPDv DxvFqxQRor29rjGcGZj3zL/2fCaitjhJ5gmjcq/RyXVLasFlWH2Bbz77Q9/dYXHprOq2wH /rWjZdckVkS/PxKKPm0ufQiZY3gtzr4r4Ntz5CyrT/8J2Cbcadkil6Jg/Rxs+0qVm9cIBn cBpZSGG/oFR5FaLvOyHnqtOXq/ZIsUkLQTvIljkGYmrqg+uMWqbv97h7zNGzaa+7Pv80ec Ys+BYxvAabhr8Pcn6JwnR4sQo0i3gb05BRYcJ7qVt1DIRuwAdwfTgTy1rOlf6g== 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 4jKbZ06hwYzHLB for ; Wed, 04 Nov 2026 19:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e110 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 19:47:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hayzam Sherif From: Mark Johnston Subject: git: 1cd9aa5cbb02 - main - loader: Handle unavailable VBE during mode lookup List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1cd9aa5cbb02434242fd8f3beff78983ac71061a Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 19:47:15 +0000 Message-Id: <6aeb8bc3.3e110.2b3c1d44@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1cd9aa5cbb02434242fd8f3beff78983ac71061a commit 1cd9aa5cbb02434242fd8f3beff78983ac71061a Author: Hayzam Sherif AuthorDate: 2026-11-04 19:40:56 +0000 Commit: Mark Johnston CommitDate: 2026-11-04 19:41:16 +0000 loader: Handle unavailable VBE during mode lookup When VBE is unavailable, vbe_init() frees the controller information buffer and sets vbe to NULL. Console initialization still calls vbe_default_mode(), which reaches an unguarded memset() in vbe_find_mode_xydm(). Under BTX, the null write can overwrite the loader's own code and cause a later protection fault. Guard vbe_default_mode() with vbe_check(), as the other public functions in vbe.c already do, and return 0 to indicate that no graphics mode is available. This allows console initialization to continue on headless systems. Reviewed by: rmoeller, imp MFC ater: 2 weeks Differential Revision: https://reviews.freebsd.org/D61145 --- stand/i386/libi386/vbe.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stand/i386/libi386/vbe.c b/stand/i386/libi386/vbe.c index 00b9ab7ae0dc..61633567d056 100644 --- a/stand/i386/libi386/vbe.c +++ b/stand/i386/libi386/vbe.c @@ -1125,6 +1125,9 @@ vbe_default_mode(void) int modenum; uint32_t width, height; + if (!vbe_check()) + return (0); + modenum = 0; vbe_get_max_resolution(&width, &height); if (width != 0 && height != 0)