From nobody Tue Nov 17 17:02:55 2026 X-Original-To: dev-commits-src-all@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 4jTWJJ3GXWz71QdV for ; Tue, 17 Nov 2026 17:02:56 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWJJ0B1Hz4Bpx for ; Tue, 17 Nov 2026 17:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934976; 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=ZaQggCvTTZYkrE2tXkfsSkgK8mAme14EKL3yujI1psQ=; b=PCiy/w+9x4928QQ9Lk38bAlymbKMImXFEKX0PG4FXt8p3uJ2wftQJh9KrnU9i6rzr+bUEa hBOjDaU4hQWqqYnvp7o+I+9Spts0tWjaLWNe5EwCcIxWX9D0R5ze1woa2iIkHxX5RE7bo1 R/s3HNIhSXfxZl6e2RZCwwcoHcg7tOWomWGydMSXcF4tfIpu7rSyzmy0kFEQXuD4GfA+Oe 0xfxLoSSqzm19Zm56xlwPLWMJa8JVtGaEQoHLUE6TxnY57YYR9pNQ91nXWw7NHVZi9wLvi /5mBgQW8C2y/xtbOvdDKKOSyj8sxT3oqQudXtxrthRWinjxGEHmJZfXNvArdyg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934976; b=jdkbjPzQIEYaIb+tnHiw9+IdxQXCwEjd4J5IVN/j2LBsUBrxMEk0/9nEWD2kJKU+2VFLJ0 6wosHyFiMHf+ET41wI/IIyHcc1HNR7IzhkGLSt/0hikCrXy9ljEPk3j05VlMi8iifU2jlh XHxYGSpo4mDGy+ogLugOJrOsSwByKNzEAd49SPIzpXByPp1yY9MFbH7Gn07VmDQROsXwFs SJXC+NAqf1e6xw5Tahf/+gmaI1MzggXnQLRJT5hKsVU5k5KW7eElV0aSAHzPcJaJuWFouG n9pavj58vMoMRLiSpQga12weEuCUAZ/qEbJ7axaWh50vEs8ggezO45RTN2Gi5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934976; 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=ZaQggCvTTZYkrE2tXkfsSkgK8mAme14EKL3yujI1psQ=; b=DPmOycdN1Tw4UwJ823WKCzq3YSNYjNJXMUayR/rlihiX7bDDkEaixyhU+JOYyHb7oXplOs qSxaLnRp/AGuJxc/4InLvELm14lVSU+LgEfPeaO8PedJSzcIr4mTCm84UtM3Q9ALWwx/tD qyg/mf9LEMdfIQbKDu3HC+x0eS36TLKzMS1BK2Azjkx7P7kDPMUZVSNDkpuUqISGq8vfwx jp8p4Zf2ko4pH0MRWZa0ZHrfKUMhlzaPXXZavuCS7rOfoWFit5aYKEoFDnLxK2xC5nIDoW RMlIGuORPA79j9WMyvPL+bAZNj8YfZ9XzN4cNqR+5vKFZ1U/IkJ1kqkColh/yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWJH6jfDzrRb for ; Tue, 17 Nov 2026 17:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e918 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:02:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2a5981445627 - stable/14 - sound: Improve interlocking in chn_resizebuf() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 2a59814456272185ab3db2e52b22fab4153f396f Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:02:55 +0000 Message-Id: <6afc88bf.1e918.3c339c02@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2a59814456272185ab3db2e52b22fab4153f396f commit 2a59814456272185ab3db2e52b22fab4153f396f Author: Mark Johnston AuthorDate: 2026-11-12 19:25:58 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 13:24:11 +0000 sound: Improve interlocking in chn_resizebuf() chn_resizebuf() fails if the channel's software buffer is mapped, but does not take into account the fact that channel I/O drops the channel lock when copying from or to user memory. During the window where the lock is dropped, a resize may free the old buffer, causing userspace to access freed kernel memory. This can be exploited to escalate privileges. Fix this by disallowing resizing when I/O is in progress. Approved by: so Security: FreeBSD-SA-26:88.sound Security: CVE-2026-127741 Reviewed by: christos, kib Reported by: OpenAI Security Research Team Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D61446 --- sys/dev/sound/pcm/buffer.c | 1 + sys/dev/sound/pcm/channel.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index 53eea0113126..5025e769300e 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -98,6 +98,7 @@ sndbuf_busy(struct snd_dbuf *b) return (refcount_load(&b->refcount) > 1 || (b->flags & SNDBUF_F_DETACHED) != 0 || + b->channel->inprog != 0 || /* * XXX-MJ CHN_F_MMAP is not reliable, but for software buffers the * refcount accurately reflects whether the buffer is mapped. diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index e803c8fd3407..07cd98e2030a 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1864,9 +1864,15 @@ chn_calclatency(int dir, int latency, int bps, u_int32_t datarate, return blksz << blkcnt; } +static bool +chn_may_resizebuf(struct pcm_channel *c) +{ + return ((c->flags & (CHN_F_MMAP | CHN_F_TRIGGERED)) == 0 && + c->inprog == 0); +} + static int -chn_resizebuf(struct pcm_channel *c, int latency, - int blkcnt, int blksz) +chn_resizebuf(struct pcm_channel *c, int latency, int blkcnt, int blksz) { struct snd_dbuf *b, *bs, *pb; int sblksz, sblkcnt, hblksz, hblkcnt, limit = 0, nsblksz, nsblkcnt; @@ -1875,7 +1881,7 @@ chn_resizebuf(struct pcm_channel *c, int latency, if (!(c->direction == PCMDIR_PLAY || c->direction == PCMDIR_REC)) return EINVAL; - if ((c->flags & (CHN_F_MMAP | CHN_F_TRIGGERED)) != 0) + if (!chn_may_resizebuf(c)) return EINVAL; if (latency == -1) { @@ -1933,7 +1939,7 @@ chn_resizebuf(struct pcm_channel *c, int latency, CHN_UNLOCK(c->parentchannel); CHN_LOCK(c); /* Revalidate. */ - if ((c->flags & (CHN_F_MMAP | CHN_F_TRIGGERED)) != 0) + if (!chn_may_resizebuf(c)) return EINVAL; if (c->direction == PCMDIR_PLAY) { limit = (pb != NULL) ? @@ -1993,7 +1999,7 @@ chn_resizebuf(struct pcm_channel *c, int latency, } CHN_LOCK(c); /* Revalidate. */ - if ((c->flags & (CHN_F_MMAP | CHN_F_TRIGGERED)) != 0) + if (!chn_may_resizebuf(c)) return EINVAL; if (!CHN_EMPTY(c, children)) {