From nobody Fri May 22 09:37:26 2026 X-Original-To: dev-commits-src-branches@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 4gMKtt6Ym6z6fHxm for ; Fri, 22 May 2026 09:37:26 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gMKtt4Yfrz3fK9 for ; Fri, 22 May 2026 09:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779442646; 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=K9hXATscIWzg+QS5tJULyJcUOkKxePwgCb2rueUPGTI=; b=fhv0+i+uIAA5/JIUiEN2yOJnxddUI3m8OjfYmgkQWHurBpSLeW18bE/O85Kz08xQp8Ze79 9VTqgNRN/CXYCpAHCXufQdgKtNalhIM+/1WrVIoPBor5sYHlU4xvM+lWZ0CgJarOGPcfQv I7zk/O8nsFyIKyLsfr3xkk7+N3zuMZ5wIFUDjsfSLz9n3slEHfLcnLhY3TjRQYrLoVJMg/ PE+EQJKTI+tVsTgQA1LRpGyRuYOAq0Tk4rdVjJhnaNZ1jbv7luweQv6c9YuIxMvTYHp0qF aI7Q3IYTcpW1+vOp7z7o5M43nE4wmVvTPk0o/eWRyHD/7OckyGM95PHnS5MRcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779442646; a=rsa-sha256; cv=none; b=QNU8bwz1isPqxKgdNisC6E3931kFJHln5yJmoozaeXaVMfL3WYsf60qjJoDubJ2WD+LIaK NDYkJ90vja+H/laV+6ukf1wdT4djxV1r9HJbOxnAm+XbuUElqVPr9NIWfwSV6fV/ETJ2MG pIQ5WuI/pma5vJQZPkOyP9Ew7hqQTyJYpj0dRQDz2UuqR9f3DXmqI7gxeFpOnzA7aX+z/m 7QkTgmZ8f/3x4sIXOvnt32+W9zO2tP2sLQbLKn6WXjKBxs5vmNiC8oCKcyXEEs0PDjy8ua TUtTOxxb9DPVrqnMBxCpYup91S38t+LHiL1FU4ZuN2gETfFMbk1naUZZ8UTe5w== 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=1779442646; 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=K9hXATscIWzg+QS5tJULyJcUOkKxePwgCb2rueUPGTI=; b=XQNHRVddb6JhnZLfBviAtW5hskUcS5enMh0pDPp6/xsD6m0h+609iI/X345JcHup9OFrsB U07KaxMrfQgJ4f59Qtrld53/8yq4TJ0HcFDJyLPJgmdkevG5HBO6v7Yw5X6aS2nOVtisQJ HiYCWv55rT2AL4hA8h8VTXhldb7AXPRqgpNive7O7Q2VWxp1i3weL+79+oPfEdSsZUfUGY AhdxjEkHinM8YRNiFMpryhnIlF6MK9gDF+7DQOsgwtQDRkxVpRI4k6lZy8iRWlMXDi5G+Y 1OoYU5aeva5sWCVOEBxy+K1WlV5myVAJoGwvsxQpejt39naIjq5gXJnXBguYrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gMKtt3mVMzMK for ; Fri, 22 May 2026 09:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19571 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 22 May 2026 09:37:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 9d28d4daff8d - stable/15 - sound: Improve hw.snd.compat_linux_mmap List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9d28d4daff8df7e38cd72c7113ec56253e7d57a7 Auto-Submitted: auto-generated Date: Fri, 22 May 2026 09:37:26 +0000 Message-Id: <6a1023d6.19571.e6b39d2@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9d28d4daff8df7e38cd72c7113ec56253e7d57a7 commit 9d28d4daff8df7e38cd72c7113ec56253e7d57a7 Author: Christos Margiolis AuthorDate: 2026-05-15 14:07:59 +0000 Commit: Christos Margiolis CommitDate: 2026-05-22 09:37:03 +0000 sound: Improve hw.snd.compat_linux_mmap - Reject PROT_EXEC in all cases when Linux support is not compiled in. - Define sysctl only when Linux support is compiled in. - Document better. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/29 (cherry picked from commit b9c10eeb380b3ba629421062af8658e79a9171cd) --- share/man/man4/pcm.4 | 26 +++++++++++++++++--------- sys/dev/sound/pcm/dsp.c | 13 +++++-------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index 518c37b54f1d..8a92cefa3549 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 15, 2025 +.Dd May 15, 2026 .Dt SOUND 4 .Os .Sh NAME @@ -254,21 +254,29 @@ are global settings and are device specific. .Bl -tag -width indent .It Va hw.snd.compat_linux_mmap -Linux +This +.Xr sysctl 8 +variable is available only when Linux application support is compiled into the +kernel, and affects Linux binaries only. +It is a hack to get around the fact that, for i386 emulation, +.Xr linux 4 +historically set PROT_EXEC automatically when PROT_READ or PROT_WRITE was set +during an .Xr mmap 2 -compatibility. +call, which +.Fx +does not. +.Pp The following values are supported (default is 0): .Bl -tag -width 2n .It -1 -Force disabling/denying PROT_EXEC +Force-disable PROT_EXEC .Xr mmap 2 -requests. +requests, even for Linux applications. .It 0 -Auto detect proc/ABI type, allow +Allow PROT_EXEC .Xr mmap 2 -for Linux applications, and deny for everything else. -.It 1 -Always allow PROT_EXEC page mappings. +requests for Linux applications only. .El .It Va hw.snd.default_auto Automatically assign the default sound unit. diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 797bfba81023..52bf2d66114a 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -54,10 +54,12 @@ struct dsp_cdevpriv { struct pcm_channel *wrch; }; +#ifdef SV_ABI_LINUX static int dsp_mmap_allow_prot_exec = 0; SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN, &dsp_mmap_allow_prot_exec, 0, - "linux mmap compatibility (-1=force disable 0=auto 1=force enable)"); + "linux mmap compatibility (-1=force-disable 0=auto)"); +#endif static int dsp_basename_clone = 1; SYSCTL_INT(_hw_snd, OID_AUTO, basename_clone, CTLFLAG_RWTUN, @@ -1922,20 +1924,15 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, struct pcm_channel *wrch, *rdch, *c; int err; +#ifdef SV_ABI_LINUX /* - * Reject PROT_EXEC by default. It just doesn't makes sense. - * Unfortunately, we have to give up this one due to linux_mmap - * changes. - * * https://lists.freebsd.org/pipermail/freebsd-emulation/2007-June/003698.html - * */ -#ifdef SV_ABI_LINUX if ((nprot & PROT_EXEC) && (dsp_mmap_allow_prot_exec < 0 || (dsp_mmap_allow_prot_exec == 0 && SV_CURPROC_ABI() != SV_ABI_LINUX))) #else - if ((nprot & PROT_EXEC) && dsp_mmap_allow_prot_exec < 1) + if (nprot & PROT_EXEC) #endif return (EINVAL);