From nobody Sat Jun 27 09:56:00 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 4gnSbh4YZNz6jH7r for ; Sat, 27 Jun 2026 09:56:00 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnSbh2ls5z46rx for ; Sat, 27 Jun 2026 09:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782554160; 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=I3f+RHguTWydA2Hrem3pPYFG7EeXwr0SNkYLjboleR4=; b=WHZV2j04/L7aLKgiQxpqje6vKGSvMzD+wXZUKTrbG9WLtmFpoaRoxwNxQrlDK9SenhLdxX 9RuvW9H8qRETcWPiJS2IS0HvMSc9Siz3GhI0xsdk5cRWjeGjt21Ih3N8KVFKHKBx5QP5ae 4Z1jGThg9JBnTD1mH2rLR66IO8zvzCBP+pFcAqJIPfgfyF/vEf2PnYUPLA1pfXtAa8UDjF YmRIMbn1j+VHvZWnJ1EylWVFhsH2jOG3fqDZGpb9cMSTlY+dGVHKjsC8zHASS3sP9Vti7E Lr1N/3gllY4MKlk4H4K3mp/Ydkgl7MPmoHuK/AtB6HEvDos/ir83VvlCPZ+wEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782554160; a=rsa-sha256; cv=none; b=EyDv7azNPz3uYVED+Suhs6bOjFV/SNV+LKeshOBwazE4+zKtFwvFnoy8zJ/oZmlGt+lvbg Ik6z02c1oox+5jrMpbymOad248F3bvqJmLmdxrbZW4eEMZvjLWUFJbX1Eiclv2hQLh16uY CvepHx9BPb8v+PCXs2RGRPAWppV05498hlSwhMkayM1hu1DYbC502O2YgjzJDXffyy+Nva NXTiQ/u1/rB8CbS7Bqp4QTNK3rJqbcs8CFEap3dq8EWuHzYnKYlQ0K0cMXgnYB6G7xefc9 H8hiwBV2uiSBVI6QJn9nba512fyKoxvZgb/dz3fjrhZlbNRNoqn8PJpFK1/IAw== 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=1782554160; 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=I3f+RHguTWydA2Hrem3pPYFG7EeXwr0SNkYLjboleR4=; b=G2SwpbcmoGUkuyvTj3yQSVmHihP1V1v5XgZ/IzN/3yneEamrgxpuGTxwHe6mk0cu+m6eP7 84573zJuPCoPazeDUQYfGTcxO3fNQJM+/1OaO2IRbVVWndg2cXiPccbZY2aqsl0Q2NGmWn VgKbG38m0IK7MtSXpZWO5LuFqmRZSBWoF/cT+IBJ2O+fw3k4QqDhpzgCuOhjCWHp6PGUiA enPQCOE8l4wSMiYpM26C2sWqJg0dJv3GnGCSKav26AMeSUvQWLHGe4vcKiUPaSQIeHK3vO vgNyHj4cNsCs2DglJJpeem+tzl6tkgDUekNUUr2+t0qKygt2uPuHnJDAt1SRbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnSbh1NL8z491 for ; Sat, 27 Jun 2026 09:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31f8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 09:56:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0f4aac7ed5ae - stable/15 - sound: Handle CHN_F_MMAP_INVALID after cdev_pager_allocate() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0f4aac7ed5ae5b5cc8bd45597a91b7011067a6ef Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 09:56:00 +0000 Message-Id: <6a3f9e30.31f8b.1bca4ad6@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0f4aac7ed5ae5b5cc8bd45597a91b7011067a6ef commit 0f4aac7ed5ae5b5cc8bd45597a91b7011067a6ef Author: Christos Margiolis AuthorDate: 2026-06-12 06:19:07 +0000 Commit: Christos Margiolis CommitDate: 2026-06-27 09:55:21 +0000 sound: Handle CHN_F_MMAP_INVALID after cdev_pager_allocate() We drop the channel lock to execute cdev_pager_allocate(). By the time we pick up the lock again, CHN_F_MMAP_INVALID might be set, so make sure we fail and free the vm handle. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, kib Pull-Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/30 (cherry picked from commit 47efa8128268c35ac8f0a552d7a7ce43cd1c5925) --- sys/dev/sound/pcm/dsp.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 3f0c5d622f99..471db6524aa2 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -1957,6 +1957,7 @@ dsp_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, struct snddev_info *d; struct pcm_channel *c; int err; + bool dealloc; if (*offset >= *offset + size) return (EINVAL); @@ -2008,12 +2009,25 @@ dsp_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, *object = cdev_pager_allocate(handle, OBJT_DEVICE, &dsp_dev_pager_ops, size, nprot, *offset, curthread->td_ucred); PCM_GIANT_LEAVE(d); - if (*object == NULL) { + if (*object != NULL) { + err = 0; + dealloc = false; + CHN_LOCK(c); + if (c->flags & CHN_F_MMAP_INVALID) { + c->flags &= ~CHN_F_MMAP; + err = EINVAL; + dealloc = true; + } + CHN_UNLOCK(c); + /* We use a helper bool to keep the channel locking simpler. */ + if (dealloc) + vm_object_deallocate(*object); + } else { free(handle, M_DEVBUF); - return (EINVAL); + err = ENOMEM; } - return (0); + return (err); } static const char *dsp_aliases[] = {