From nobody Sat Nov 12 12:41:49 2022 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 4N8Zvd6sd9z4fffD; Sat, 12 Nov 2022 12:41:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N8Zvd4mcwz3tJc; Sat, 12 Nov 2022 12:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668256909; 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=EmNTfPPm1s9Xik1PVIEcO8AykY43aw+Yt9PlJo4bX4Y=; b=TE03PryfriwDMfVMvY4xF2h1fGVrMU07ySUzns9grjE7D/ly8jSIakKOqGBrigTsd5lb/h /D3009zd6rPtfGvmsYNX2/jDQ45L+HQvco+jZtJJs+3iXkrW+JhWakR9bqjM/N37NcE3hc ppD1B7xMWlzJ/qgB+iB3VBgCx/I3l0KumGGaC6J+T1ZvwaL5il+PDP2AyXBD/RXhOGuxNX zQXz/nbkl8KnV9wGRGVTYaYsa4iikR2so+ljxHErtv8iI1F8bVIE6+lqsQ7a89whfI6fvK cutnqHG1RbWLY6LZH0tths/g3oRDroTuH5xjQ5Eitv/V4ftRPER7qOc0FBvPjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668256909; 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=EmNTfPPm1s9Xik1PVIEcO8AykY43aw+Yt9PlJo4bX4Y=; b=h3PGUEvmm+xKrD+YrZ59DNLoXURUdx83n+uwIZCz5JAWnCWmsZjnLsBSDN9qxE704Gtr06 nNdvI2HGd96LF/bGCqFM1NRn7CUHLOKqYVHYFc/ajhDyna/xSFzoe98fe9W2+KZFI+7l5x B6AOnCQW/a26RI/CqE8iFj7Mq/sgxCnNCgdxtgMqvtUDRUS2NotBVWxMAEkBwlNYX6yYgy nwAs1CTFoydbjeXONsEqqtW4en/fcG35YXKoHb4Vc1r8JLZAcwHpp6rFovmlQVUo8Uw4H1 +cnHiU8kEQTXmiW/LWqPbjck09YHuMlkQtl/LJpmYJCxyrHcB+rG4KgCrw+acA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668256909; a=rsa-sha256; cv=none; b=epTjRWPB+fvq1Z2jBkuXuLMDDOlm0XfEhmlBu21ad8kcowMld2vMpdZu7vQAQJypVAxhQs PH3nIxoZEb4w01a0GSdbFHK5fDghg5ruqJc91Bpw72HtoJSWpcgtgldpjKH4gOGx1rPLI3 ZRUekGxTaFIqJtgglBhcQEwGfZfdZnd04Jlp42woamlt6sN19TEkPdPIX34V+uXGIDkAVu QpqcR9OpzxfCAMJKWiypTadpFiPcoJTod/b5TIuVXpR6sdVMfJPLLYtFxkbtgOvMXbVJ4P dVk+Y7D4YsF1nXRMi9VbJucSXd0bhDFUH4O7yO6TXc831NdHUz5zM51cEhsWfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N8Zvd3k5PzP5r; Sat, 12 Nov 2022 12:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2ACCfntl054902; Sat, 12 Nov 2022 12:41:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ACCfnVp054901; Sat, 12 Nov 2022 12:41:49 GMT (envelope-from git) Date: Sat, 12 Nov 2022 12:41:49 GMT Message-Id: <202211121241.2ACCfnVp054901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: f0a3d2341d34 - stable/13 - sound(4): Fix memory map of /dev/dsp devices when buffer size is not a multiple of PAGE_SIZE. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f0a3d2341d345121c92e01f03d439b054f69793c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=f0a3d2341d345121c92e01f03d439b054f69793c commit f0a3d2341d345121c92e01f03d439b054f69793c Author: Florian Walpen AuthorDate: 2022-11-04 18:04:26 +0000 Commit: Hans Petter Selasky CommitDate: 2022-11-12 12:00:01 +0000 sound(4): Fix memory map of /dev/dsp devices when buffer size is not a multiple of PAGE_SIZE. By using sndbuf_getallocsize() instead of sndbuf_getsize() in dsp_mmap_single(). PR: 267555 Sponsored by: NVIDIA Networking (cherry picked from commit ad370f7658ba59811d02c04032ac33ef787f752f) --- sys/dev/sound/pcm/dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 15f437b8627c..cddc05206c4d 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2291,7 +2291,7 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, c = ((nprot & PROT_WRITE) != 0) ? wrch : rdch; if (c == NULL || (c->flags & CHN_F_MMAP_INVALID) || - (*offset + size) > sndbuf_getsize(c->bufsoft) || + (*offset + size) > sndbuf_getallocsize(c->bufsoft) || (wrch != NULL && (wrch->flags & CHN_F_MMAP_INVALID)) || (rdch != NULL && (rdch->flags & CHN_F_MMAP_INVALID))) { relchns(i_dev, rdch, wrch, SD_F_PRIO_RD | SD_F_PRIO_WR);