git: f3afd16367c5 - stable/15 - sound: Improve interlocking in chn_resizebuf()

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Tue, 17 Nov 2026 17:06:08 UTC
The branch stable/15 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=f3afd16367c5b301a6dfa8f942adaa9bcc50b84f

commit f3afd16367c5b301a6dfa8f942adaa9bcc50b84f
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2026-11-12 19:25:58 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-11-17 16:57:23 +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 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)) {