From nobody Thu Jul 31 04:41:35 2025 X-Original-To: dev-commits-src-main@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 4bsxHh1v4Cz63RQY; Thu, 31 Jul 2025 04:41:36 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bsxHh18SVz3M1Q; Thu, 31 Jul 2025 04:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753936896; 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=EjKg7vu/sqEOwPz3ZD+hhQC8qJE3CAxgcXgkPhHvd/8=; b=WXmmaDuXwk+eh4nbIwwhuNurRg3/Ihxcb6eFexdtq/eG05HXLZcBd+canbZ4MuxF56gnV6 KFTpjqkaz7x9yY1zjjb8+vGIMhA3h7RhrzGG6V2wP46hnmSUZUy9Cs8ORVBUANrF54hI1s WexLCn9vcLArnBw2lL6eJccZX/bqI2pT9otdrGQMF5HCJJRfz25RGmbPajFTS8OJxhoNz9 ZQt4EbBQEVBEvVJx8CmjhzOY5h4deepfO8F/gX3HcAIejSVDczN9c25TQaN2GH/TEm5K60 472eaFpLWF9JXxmkaB6bVYCxeRTczVtRhO//6N0YlBfXF8R3Z74LBq7fTDTVJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753936896; 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=EjKg7vu/sqEOwPz3ZD+hhQC8qJE3CAxgcXgkPhHvd/8=; b=QOiAU84Gugu8/c4YlmSEALxkM+mNu21m8l+dIMUgR/BwCoUl5D7A8+MCAcCVtaYtv5h3/v nSJqSM23o9P4qobvBf0TEIbKQKYcg3I/RYoB1zpCkkZQ+ji2DXVax/KFw91vjGjUcK7gxi r6zIRQRPLMxe/sMbF6YfQPjevlHBIQBY64AAhM8p8LPYBlx6ruqO/brUlqh9+rPGUuSXw4 60txoAV0W0kSfXH/B4CncTy0JAkbkSZMEb7TcMmj2F+yrJR4zDilwnQK2wjz8KPPLOeeo+ BqT0ttHcLemrAf1gfdZleE6VuD4TFAg5wY5WR0JyxzwfDIGGteJYpEXd3K95rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753936896; a=rsa-sha256; cv=none; b=QPg4n7Tss6unqefeEtsa0A11mBRVWGLkGB2sIjRUxNgIIlbHspgHqbPIaU6n7CwLmwAcYG IMDNmcVg2FOZBsuD1fzilIGdm1ns4KH9HI/rajJLpfZYiIx8QcBBIjo4n+wP1Ee9R88E4A +2mqfTyHWlF+JyKq2csULktSa8mQVTbAJ4XLGo8K13HzxkmIMaMnlEIq66FlijrOcOvBa+ /uMRMG3Wo7Zv9PNi6oRULXxUD8CPJjjLQ0B3bdFhKMD3IKOLsPy2koqXNajItn2BiBhoAO 8a3GBgHIMSPvi5jJwf5/hz1y+ASOAVyPUBBQBckumF4vGnJ5HVPCTFL/6KzJ6A== 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 4bsxHh0dKMzmsH; Thu, 31 Jul 2025 04:41:36 +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 56V4fZMe047577; Thu, 31 Jul 2025 04:41:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56V4fZi9047574; Thu, 31 Jul 2025 04:41:35 GMT (envelope-from git) Date: Thu, 31 Jul 2025 04:41:35 GMT Message-Id: <202507310441.56V4fZi9047574@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 763a097c156f - main - loader: add nvidia modules to the loader blacklist List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 763a097c156f36830e774b3cc789f68c5d1ae601 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=763a097c156f36830e774b3cc789f68c5d1ae601 commit 763a097c156f36830e774b3cc789f68c5d1ae601 Author: Kyle Evans AuthorDate: 2025-07-31 04:41:28 +0000 Commit: Kyle Evans CommitDate: 2025-07-31 04:41:28 +0000 loader: add nvidia modules to the loader blacklist It is known that nvidia modules, like the drm modules that are already present, will panic if loaded in early boot rather than later. Pop them into our list to deny loading them if someone were to add, e.g., nvidia-modeset_load="YES", to their loader.conf. This doesn't prevent them from being loaded if one drops to the loader prompt, but it does prevent the standard user from easy foot-shooting if they find old or inaccurate information out in the wild. Reviewed by: imp, kbowling MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D51644 --- stand/defaults/loader.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index f0843f3e930b..036479d22285 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -114,6 +114,7 @@ kernels_autodetect="YES" # Auto-detect kernel directories in /boot #currdev="disk1s1a" # Set the current device module_path="/boot/modules;/boot/firmware;/boot/dtb;/boot/dtb/overlays" # Set the module search path module_blacklist="drm drm2 radeonkms i915kms amdgpu if_iwlwifi if_rtw88 if_rtw89" # Loader module blacklist +module_blacklist="${module_blacklist} nvidia nvidia-drm nvidia-modeset" #prompt="\\${interpret}" # Set the command prompt #root_disk_unit="0" # Force the root disk unit number #rootdev="disk1s1a" # Set the root filesystem