From nobody Tue Nov 17 17:04:20 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 4jTWKw5hZhz71Qwl for ; Tue, 17 Nov 2026 17:04:20 +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 4jTWKw4PPmz4FjZ for ; Tue, 17 Nov 2026 17:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935060; 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=CgpbuwZ//wSd7U1qdFspx9D+ZbP05yNYhEr/Fon99JQ=; b=mbGIyeFJ+QEYiNZgbtVzxM0UpCLhe1HlgnuylxXAG5ZyfT0pxyNW3EMvlp+oYIDKeIXTj4 eoYfcZJlZ1VD3eDv7I/P1CjJe4nfMJkFzMeiaVnhHeeiZ4bT5SOsb2p59qz6UyvUUj7l/b R+i+oQsnQugeNu2TV8Pn3ploQEYmmua2H54awmFLNQgcvFG3o4p47zBXz2LEUAOJzeVP2X dqcabd/9dcX+9RCqTngEy8XSU7yMb3cVn6ZoVoUtYG0hxfr4NWoEl5un4JNQorzWOJ86+i PHu+4gakLNOsGJpkHmYcPczRYpnXtK/8o+jjWffVMDMFe+b8nLh8XUAehFUGOw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935060; b=ENbVLBu0Bwn384ruekHMl78uVCsEUb1Nx1iczTmYGErb1ypcvPBpzZa36we1iEqqEEid16 sPVBYnvff8Uj/RoE+HvJ9fp+K0oCFYsYE6g0Sb4yPk1FzHxIF+wOr/zWyphuq8LvJg6mIx btjewiimFhDnWVD5XYNpkUwfLTPYQ1OmDalTV6Wwj61F02oJJS3op7uaCDxMYg84jC3ZIO L1n8ZEzTQobhBY6U34sOF/nxZlvCbW5Qjo3D6fq6lWe6cXNS96BM7FkM0cQP6sd0DHhFUf lhodJYL4GUiFQFoVcG6dNZdozL3LIYEcOAUd7ouQXpw5ki5D0iMwZcIHf6Prpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935060; 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=CgpbuwZ//wSd7U1qdFspx9D+ZbP05yNYhEr/Fon99JQ=; b=pW4wQpm807vKkjWatNuiNElNqusraaWywD9Pi78OQ22+BTleZ2gvvHtrqZ0IIIwXGC8iZ6 jLmlDFJZ55lPre1jHJhev4CbpnoNVRySaoFj2N6GL+sXS4Zyutt9s0i/Ik2pAI+ontv1bZ HcNCoRaddVte6K2ue9NJKSGRnY9TGZMo2SEBd/TIAiMq8TlK+DxFJkujHHAY106vVolAhF 5K0OmxlgW+IwcV0al4WeTR/nvyiZW3SlXWVXtRM0H7VEOSnukbbEGywqNfyksbFzISuni3 VX9AVh03zVIp4pigVVn8SQCLPGTT/YtXyA/WPE/ScAT1CWAAZuTtHdwDqIOVVA== 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 4jTWKw42Bwzrgc for ; Tue, 17 Nov 2026 17:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df77 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:04:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: fe39499d2178 - releng/14.4 - 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/releng/14.4 X-Git-Reftype: branch X-Git-Commit: fe39499d2178b698532264d25c3b6424851d8d6f Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:04:20 +0000 Message-Id: <6afc8914.1df77.1bf71127@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fe39499d2178b698532264d25c3b6424851d8d6f commit fe39499d2178b698532264d25c3b6424851d8d6f Author: Mark Johnston AuthorDate: 2026-11-12 19:25:58 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:16:22 +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)) {