From nobody Sat Jun 20 19:05:35 2026 X-Original-To: dev-commits-src-main@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 4gjP7422SCz6hNSS for ; Sat, 20 Jun 2026 19:05:36 +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 4gjP735Kzvz3sc5 for ; Sat, 20 Jun 2026 19:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781982335; 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=y76S6BGDSjpj7W1osja0VuP2h7ymakKyA86dkzaLPtc=; b=UmhcQycE5WnmjkcAVtiyVbF6stfW+2nGh+zEWcx7S8fwPRqB9bx3WSNjGlJjKN9icVWlUo V88p391jgModPjmxarmOM3kU8h0ypp821vB0rldqQR6AR2iHntEAzN5ztpfX0GeOv6dIl8 pOt52c/N4RMp9pJa2K4S3uMUeouYbvdquDeD3gI3wxF9S8Gg+JWdK5XKj/y5j+c0Hxo9FD xV2YFQACapXFUxUrlY0zFSCtu192LAWKtmPkZh3+kC2cj8cv1L4/lQW/WyxzwimLO/Qj3w bS7p+pH517K68TzODrtq0jn/I00sct/28hyt4r5yFhCUq7t6+fuVR95YhnLZeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781982335; a=rsa-sha256; cv=none; b=Np4x59962CjefL7mi4NHFkMCiY7rrV0LdrD130evf2gIhVxDyPYUP+Lkm55aZZCjH2/Cdx djful4JIX2/Eru6+eBkSivgRsIV2EaIVqpHwkARHviSydQkOedmeyIK257q/CgJZppxNOL jxygjAgE6VkuUwcqCtIBf1d9fHvK2O1oE2FLDr72Y8DfIRlS+/S3AJm5SZ7P0HuJ3DjC2q VquHSmhjPlSQeHCr8QIC3sztOqKdymEmO/juaiIU3ZZG4ZXlQk2iWkO+n16iUfclyCy903 4oiI2tehrBOFF/C9R1OhYF8Fi1Nsg1obXG5v3PYSyAICkwU6/oMRYJNkjRvc4g== 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=1781982335; 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=y76S6BGDSjpj7W1osja0VuP2h7ymakKyA86dkzaLPtc=; b=xrYUH309xPfu+VoGYOcXlzOdsMj3+1nuAk9QRrSv0JWaklQWXhpq5r9Tw5nxpCo7vq6JRK aLOMV23/+cV0uoGKrffFTVsF9dOkuid3pSrJsMsTtcYH6Yv9cjy2g+NqR0Z5TBKnSoZ6tD PUJYNBNdnq7hbX2+OOhBUfcsZZP+rfVj1MnD+ex2+cZRG5tL8M5PT4RPU1Zl22koIMPvoC kHbdq1BtsZPdl+JB2aR0Et06QrpIoupVYrAqlPXh9+Z6Mja6tp9xakGtwZbVq1oWTYbaxc pBHGzazn/x14WLwYwKVkur6D7XDYgSGaD35zkV3YkqNQoJwYujxZ8M9+iRPgJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gjP7336Sjzk6L for ; Sat, 20 Jun 2026 19:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 325eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 20 Jun 2026 19:05:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 47efa8128268 - main - sound: Handle CHN_F_MMAP_INVALID after cdev_pager_allocate() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 47efa8128268c35ac8f0a552d7a7ce43cd1c5925 Auto-Submitted: auto-generated Date: Sat, 20 Jun 2026 19:05:35 +0000 Message-Id: <6a36e47f.325eb.486a92f4@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=47efa8128268c35ac8f0a552d7a7ce43cd1c5925 commit 47efa8128268c35ac8f0a552d7a7ce43cd1c5925 Author: Christos Margiolis AuthorDate: 2026-06-12 06:19:07 +0000 Commit: Christos Margiolis CommitDate: 2026-06-20 19:04:50 +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 --- 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 52c30f847f01..8bb07d87fac9 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[] = {