From nobody Tue Nov 17 17:09:50 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 4jTWSG5QGLz71ShT for ; Tue, 17 Nov 2026 17:09:50 +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 4jTWSG0hN2z4QT7 for ; Tue, 17 Nov 2026 17:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935390; 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=Hn7zN9RS0xGGLqJrfpEfi1HRJcs+CVhoUXz4RY1Fo/g=; b=e9m1Gh7AKgw5Z999wbQwKYDY7U3dGSPtoG3KBNKNtXh293WFYcUqPI8/ZpI/uoYLrMKbgK +0SexEJdRLg2tlQ4OCZaWPTSAwVWrp9qawvjvbB3UqHvLNvC1xI0/oCoM++t3NOQjGlPtn Ycks/ax/i54L89Gy+CHk3zwllVzsn0ZSen+1yrMPGcdrO7YkmvHhhJ1mrJxyR231aW03Ft SyvnOUG1Av8Ga6t1IxZSi5gtzaPgBYLk0qk0euGzxu16hRGem7qxo6YHDfMB/qKY1//ZTc AEkpoUc4X0cx7mLK3bXD7k/0gBTQ62lhWXjE6O0YNt0ib7FDlkRvy8PdglaG3g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935390; b=qZM2f5vTb0l73CcFEUE3+GJplNEWPWIbtgClgfkB9ck9xqMEnxFpoGZZtbfOSYQdmEq9sg l8H1cOeMaZMZAboAOP+e4C2KWOp++YOmHgnsaudIVPdSveWKuvOlNBahBsp3sbt147/o8G R2w34vWn4a2lHmvBTpFPZn47OnXsORfnj96NukTAbHMlUznOMxCARNQxGcKBAg79USFeIk aqixS3dtX+bBXnTA4t9c3KSZVKpOcenKYmhLvRl7MnuIFT8EFMstAQLkIr0iIFNh1m6Jen 62wrz2Zm7gNlunRqH3sivSomOHMWN+cohQzUAqp83x+E6EtS+OvPNJCPHIokKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935390; 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=Hn7zN9RS0xGGLqJrfpEfi1HRJcs+CVhoUXz4RY1Fo/g=; b=Fp/Q8xPAB/Hol/x9jYkQvcYxufpBPRRD4XGKfVvM774TiuhxQjbEWd2wC6GMQaBiRARCgp nE6ditl1/BdhsWhZXeHV0hbgrpHiMTKbXL0k2EQfJBNfz+9ZefBWPzlvVJynyqlLlEXSr2 urqyWiOpD3VNJkjS8Vy/Dij5vsBP0wqpiryuEDKu0MJfRlIqAaFepKJ4k9D6jlVnvJm+Gq kxw/NP7UlcJtlkcL08iBscZAF7tX/gy0nTZvRMkpiW8jhF/RsCXJmggxqnVdMhGf3asLO7 X1KgAG1IQc3bD3TIiaCFWXbomufFz9a+J6+hMwQ27qxlnmKRxSDADVk2y6M4ow== 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 4jTWSG0KNQzrnn for ; Tue, 17 Nov 2026 17:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f84 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:09:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b8eea48abd00 - releng/15.2 - 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/15.2 X-Git-Reftype: branch X-Git-Commit: b8eea48abd0073285d374c4534315d2704249669 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:09:50 +0000 Message-Id: <6afc8a5e.f84.40072573@gitrepo.freebsd.org> The branch releng/15.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b8eea48abd0073285d374c4534315d2704249669 commit b8eea48abd0073285d374c4534315d2704249669 Author: Mark Johnston AuthorDate: 2026-11-12 19:25:58 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 13:36:04 +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: re (cperciva) 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 5e900422ce58..f0b07129d8dd 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -97,6 +97,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 ed27a2c07e7b..a9ad967c6cea 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1831,9 +1831,15 @@ chn_calclatency(int dir, int latency, int bps, uint32_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; @@ -1843,7 +1849,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) { @@ -1902,7 +1908,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) ? @@ -1970,7 +1976,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)) {