From nobody Wed May 08 16:11:17 2024 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 4VZKrk63D5z5JRJx; Wed, 08 May 2024 16:11:18 +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 4VZKrj6B3yz4pKT; Wed, 8 May 2024 16:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715184677; 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=u/BIZW16mhBCaaLicNA5uXil7K8WzEdjYg8YiXv2MT8=; b=P6cZg35suELzaCNNd0+0kHcPObHEzqqewMtH5bT2NRQJP5cAu8pjLvyu1FuLhEzL7Q5qtW GREnKfa2YXIQ66Grzqas/gTdzofN32wV9eCHp2nh4Gr8JPx4ambjmHjlOAOY957yAQ+Ank YoXiOgS9H4TNDQQCBfI4zzk7UzUEkQK5fid8tfqtvMGA98roqT+REDZR6swDHu03qOIH61 DFpptOFygU2ei24C6w0uxf//Cbu5vbHGUzmUP84/A90/gYC6//LEMi7Vm/2v1FOH2f9mGn /FlK0TwRdzNp6J+QKCcthH37nGGBHFJRQr6817xrc0kBXJ/7cJXZQa6BiOT7bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715184677; a=rsa-sha256; cv=none; b=nKaDLwUd8FWGAuhlYkMIQKJJm2K9DSm0cH7pRso+zWkPFhdre5kRBAJ+y4AsBD0tT5kfxd h3q5He5/DpYr5JlNFOKa/FY3U96z4F1+uCFWekijHB42VFUTem4gN4YCcP2dXn35icowr7 w1QKOndV7phGD7EfdQdFo25jIPnXh8DvyEhFkEYfO4EANUcopgsGpLP9mueU9NNfIVE8O4 uh4E+Q2YqLkxxeo4SSk/IiXBVfX87x2QDjcVzoCqMKAZvcuBsYaIbUmeEXklPgV4Yg6ycM v/GTgbRhT06E4UoaLqNvayXJvtIuI+mqMhAFYJ53JrTeXqe6jGl7nuR9grFO9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715184677; 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=u/BIZW16mhBCaaLicNA5uXil7K8WzEdjYg8YiXv2MT8=; b=JnYqcMN8ICPm3D9ByNAqC35ejhf0QGGAkR9xxcAUcCMjZ9k+jI4amW+cmVez8AJSiUX62k dPdItvn5JlY+IWlaM/oIR2mjC8HgPd2Cbkp3yVGHEBdnqJ13xrMiz897OWJl/9aYpFhlUd AP5eaUIVFQYUwN+Dx+cfo4MuJHWcVGF3XXyYaLK/1M+L+yGTUY3Vem5EbKnjCdt66sETZJ 3hqUduXdiQEQPexOROWi6GY+dTl3e/VupbhDFCweAq9QlDryJ+NnjkSOOFe6spmS+SczPc /0T9sl+tYUAY6TfaQn+iWm9i0kPC/A3GADriCr2ha4YbUnuqGdOEhkMjIn71qg== 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 4VZKrj5nSLzX9y; Wed, 8 May 2024 16:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 448GBHui093803; Wed, 8 May 2024 16:11:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 448GBH0J093800; Wed, 8 May 2024 16:11:17 GMT (envelope-from git) Date: Wed, 8 May 2024 16:11:17 GMT Message-Id: <202405081611.448GBH0J093800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ffbaa453c191 - main - bsdinstall: Stop loading cryptodev for ZFS installations 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffbaa453c1914846ede99d9b8499eb9b52b77e9a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ffbaa453c1914846ede99d9b8499eb9b52b77e9a commit ffbaa453c1914846ede99d9b8499eb9b52b77e9a Author: Mark Johnston AuthorDate: 2024-05-08 16:01:52 +0000 Commit: Mark Johnston CommitDate: 2024-05-08 16:01:52 +0000 bsdinstall: Stop loading cryptodev for ZFS installations - zfs depends on the crypto module, not cryptodev, and most arm64 kernel configs include std.dev, which includes "device crypto" anyway. - This config works around a problem with kldxref lacking cross-target support, but that has since been fixed. - Loading cryptodev creates /dev/crypto, which gives unprivileged users access to the kernel's opencrypto framework. Very few applications need it, so we're needlessly increasing the kernel's surface area. Thus, stop auto-loading cryptodev. Reviewed by: kevans, allanjude, des Differential Revision: https://reviews.freebsd.org/D45127 --- usr.sbin/bsdinstall/scripts/config | 3 --- 1 file changed, 3 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/config b/usr.sbin/bsdinstall/scripts/config index 093d38ee0a59..ba39b8bdf305 100755 --- a/usr.sbin/bsdinstall/scripts/config +++ b/usr.sbin/bsdinstall/scripts/config @@ -43,9 +43,6 @@ cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf rm $BSDINSTALL_TMPBOOT/loader.conf.* -# The 'cryptodev_load' line is a workaround for arm64, which does not -# automatically load cryptodev.ko with zfs.ko. -df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "cryptodev_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot