From nobody Tue Jun 9 19:19:06 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 4gZdxl36rfz6gVCK for ; Tue, 09 Jun 2026 19:19:07 +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 4gZdxk5ZbTz3PXp for ; Tue, 09 Jun 2026 19:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781032746; 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=CjGzW5K9mgxqm0Zt9EAnE/n1WUawdgtW2qeL1gAw9mc=; b=aTbJgBnrmOXVPSrMPehZaTsVZxV4PlW5xjSP/8n5+JlWHmAniHW8EPT3NUMTGsL4xSzGsa yV+/VzSLIw5Kkn9aAB/WNu7hbTd4TOztVcJXCb5thOJwcifxmSc8CP/qO3Rvdm5PfUuxYY 2kOad7bEYoq1ISnptr6Hij7SRUHb6Nheq5Ln5SZvEspEgsnobP/4jzn58tXfRngQq5lb2r MWAz8mrG6AGUG1v0lI5Qy8j+PAJd3xbt4wNIW3v/rU96CTFA7z8TB4u4XulGSE2Ki+awwk VwndFws5kSG4cMTZ5rIqMSLzam7yTVGoBOlSERHZBVMyCKyFVpKjkbNbd4wZZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781032746; a=rsa-sha256; cv=none; b=drgcqE9BbviZ5umfB3+HDo5FtQDkr7RJTOkFo88kB6IxulzBhV5hetl74dRKUUj8R0hnPb wCStetFyFdbN/hKwhX5S4srCqVHSwPohGCkyM6Q56Ph5dzRfBdXRDiiHTGt5WKpOnZIFzi QJisTQDB4MpGAUcUoiGhIk+3W1Rra3m1tUecegVgM1Y0PgDe2Q00x93AovnwUndH5Vl6Ai Q+BfiHxmYNu3fyjao/KnK1SX1zYHBOdWttoXPm6AbiD0yLl9cbAq1LzthW2/3Tc69RJHbg c8xvMjmS26k/hac8CKmEY+fyAKY/yLtiOoiYOyA9hsOmEKGv3ZS/xrDfltvLZQ== 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=1781032746; 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=CjGzW5K9mgxqm0Zt9EAnE/n1WUawdgtW2qeL1gAw9mc=; b=RXsHnlAmAJ8QVITMl39NYSfvRDjes9XZvsUIgebcY2NKrnkofek8J9WpT9Ryp3aMAPdG7M jKYJS3Rd8AaN/1p8uUPh6q7DEkU+a8dgK6uiX5OcytIsPSNe1IxIw9QWs+XNnUAMeemIbi L9OafurG6K69g40VgnNK1wQ2H61b1sGCOGg2j3QgELTuFCj3BG9nIyIp+lLkdSGr/qcJ6m KFFKqatwNbDTAQnnXiqXU+C+FaSgyyfcVR3JGqPFVZUK/yrM5QWgzjut8dBjnE0gK//kCt dH4s//tKIrJEbx//zdpO4UwPtetDGNCK5TEV8F13lVwQi3HbitCUuJJ+cFeBaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZdxk52PMznkm for ; Tue, 09 Jun 2026 19:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ebc4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Jun 2026 19:19:06 +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: b9128fe1951c - releng/14.4 - 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/14.4 X-Git-Reftype: branch X-Git-Commit: b9128fe1951c2af3845411dcfe4e2ea0bbf7384c Auto-Submitted: auto-generated Date: Tue, 09 Jun 2026 19:19:06 +0000 Message-Id: <6a28672a.3ebc4.43e256ab@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b9128fe1951c2af3845411dcfe4e2ea0bbf7384c commit b9128fe1951c2af3845411dcfe4e2ea0bbf7384c Author: Christos Margiolis AuthorDate: 2026-05-27 15:50:33 +0000 Commit: Mark Johnston CommitDate: 2026-06-08 13:21:14 +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()); +}