From nobody Tue Jun 9 19:19:44 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 4gZdyT2tpbz6gVKH for ; Tue, 09 Jun 2026 19:19:45 +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 4gZdyS4vDHz3QZ4 for ; Tue, 09 Jun 2026 19:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781032784; 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=tTIVAs8/HSxVV74l+EootG+FHdmXnvDFiyHOD5vDrMY=; b=xoX+sw0ZSaXwRxc4WKQkT4wV1mIhCfyB1x+sLv7AOtc16yRg7dVxEx2Z44+FdrOSS6PGqH VWAMLTSrhWHwRtbo6YlgeuWWE1yOlEFQpJWMd7c1cl5DN6Tl3bKPQu/PHVRANq+6y/dzZR rgSc6vO7hBTnPIjSMsezRSBivKNTN9bS+sIetOA96Lg2uGQTfwqBvFsFBUkrY96BYlscfo kGfaD71CnAiUcVujn6VpeMmLwM8GgOeKDeKkXvrQ/TOYm8jUh9IDtKkS/dN3TXX7RoDsd7 B4knUozuZjF7n8FoVw87/XjjS5fmhmyTqLoTWOVdm9AxI+dX9kXIWSy5FPN6zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781032784; a=rsa-sha256; cv=none; b=vfi628AUwR16kGtj4VP783Pchy6JrkK0dcbJ47nGLgxF23+DmkVTzQILYnyRMDvIpLvXL9 8zhdpz/Leo0w/EzV5d5bz6MDYhRCeP3nItVKRSr+qr6srSFbcw6E0/m9MQ2RS4WxrscYFS XGKMfuLispPez11XLEllcuK1x8fm9rdXHbhaJLKjFbKKO+NMbWYcxhva8QTcNdXeWFko1M y6Jo8tAhEjnvvU6t19yWiyaHpk/xJhKICaSfiCy8mo8+9dr+RG9zV7RZ95D2QWmkFcRg94 o+nBLgMM1qpH0D5Z1Pb+Oo8ewY6isMRSn8C3iZcKEMRy+mSbKbGCmTiimX3Qyg== 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=1781032784; 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=tTIVAs8/HSxVV74l+EootG+FHdmXnvDFiyHOD5vDrMY=; b=BIUM44NT7+30AWio82+ZgTE5CSqobrBEvx246vFgjCZ8TNBvNcDLPj/4RGqNIvQlANrL9g VplHV7i4UXkQNjEbEPurps+u8E4Ct0zw3rLnpnZMzwIbzuiKsOQVSeXchPhnxr0UA1sZaM +NFEn6DcWet4rhCltQ1xT71eSmwv7gu+vBmAKuqImK7tujp/Rh8ZVl7rwc/P5T3DxknKNK c6v+98l7Hkxq4iNoWIksDRKFreWm3Z/BK3lVsYMu9nVeowAOn0zkMpayIj+ByCAVvR3h2h 0j9DT1zT9W/Pkt9lOyBPyOIXXo9CemH2crmlsdqAL2fn08Icg2nhPJZgBvaASg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZdyS4RMyznrp for ; Tue, 09 Jun 2026 19:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ecc3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Jun 2026 19:19:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christos Margiolis From: Mark Johnston Subject: git: c42ee04c521e - releng/15.0 - sound: Check for offset overflow in dsp_mmap_single() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c42ee04c521ed8268421173f961859233a321b17 Auto-Submitted: auto-generated Date: Tue, 09 Jun 2026 19:19:44 +0000 Message-Id: <6a286750.3ecc3.5176f660@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c42ee04c521ed8268421173f961859233a321b17 commit c42ee04c521ed8268421173f961859233a321b17 Author: Christos Margiolis AuthorDate: 2026-05-27 15:50:33 +0000 Commit: Mark Johnston CommitDate: 2026-06-08 15:39:32 +0000 sound: Check for offset overflow in dsp_mmap_single() Approved by: so Security: FreeBSD-SA-26:27.sound Security: CVE-2026-45258 Reviewed by: markj Sponsored by: The FreeBSD Foundation --- sys/dev/sound/pcm/dsp.c | 3 +++ tests/sys/sound/Makefile | 1 + tests/sys/sound/mmap.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index fe5576baf017..72bde9c1066f 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -1953,6 +1953,9 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, struct pcm_channel *wrch, *rdch, *c; int err; + if (*offset >= *offset + size) + return (EINVAL); + /* * Reject PROT_EXEC by default. It just doesn't makes sense. * Unfortunately, we have to give up this one due to linux_mmap diff --git a/tests/sys/sound/Makefile b/tests/sys/sound/Makefile index 74a0765a0540..ce156ae8c4cf 100644 --- a/tests/sys/sound/Makefile +++ b/tests/sys/sound/Makefile @@ -2,6 +2,7 @@ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/sound +ATF_TESTS_C+= mmap ATF_TESTS_C+= pcm_read_write ATF_TESTS_C+= sndstat diff --git a/tests/sys/sound/mmap.c b/tests/sys/sound/mmap.c new file mode 100644 index 000000000000..ab203a39194c --- /dev/null +++ b/tests/sys/sound/mmap.c @@ -0,0 +1,51 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 The FreeBSD Foundation + */ + +#include +#include + +#include +#include +#include +#include + +#define FMT_ERR(s) s ": %s", strerror(errno) + +ATF_TC(mmap_offset_overflow); +ATF_TC_HEAD(mmap_offset_overflow, tc) +{ + atf_tc_set_md_var(tc, "descr", "mmap offset overflow test"); + atf_tc_set_md_var(tc, "require.kmods", "snd_dummy"); +} + +ATF_TC_BODY(mmap_offset_overflow, tc) +{ + uint8_t *buf; + off_t off; + size_t len; + int fd; + + fd = open("/dev/dsp0", O_RDWR); + ATF_REQUIRE_MSG(fd >= 0, FMT_ERR("open")); + + /* off + len will overflow and wrap back to 0. */ + off = 0xfffffffffffff000; + len = 0x1000; + + buf = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, off); + ATF_REQUIRE_MSG(buf == MAP_FAILED, FMT_ERR("mmap")); + + munmap(buf, len); + + close(fd); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, mmap_offset_overflow); + + return (atf_no_error()); +}