From nobody Fri Oct 31 09:24:44 2025 X-Original-To: dev-commits-src-branches@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 4cybCx0mnWz6FXL0; Fri, 31 Oct 2025 09:24:45 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cybCx0GLKz3dFC; Fri, 31 Oct 2025 09:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761902685; 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=WkJ7F+NOdyJMPgUKBfmN8nPXJ+NjI1W8+ZJ83ZB2M4M=; b=e6tf52lU2AIiSRI7SEqiZoF4D5hOlIolglsxvhU+lNrC9y9QLhd8/bMKOC/9cJvlKt1l0B Aai3r97IyQKPADQQEfphJMUmVitopsigJweuPju48RmXsf4OBLUf7np5j4yOd3lr8G7jPZ g5wcrD4Vg8KNYl4viK0iTSyASttjgUFr8804oHvel4+ng1T+dzdYxQ0EOXBb9lnarX17bT h+3z4A3hu6jtsDimHyfrqlbRI2uZiJ+J3HaihaGqrKlP+xfGkp+cyemJhqAr/HmSWnNX4F huyMBcabel0HyuG/+Zg7LJ+wYWSFhdOwKWr/6YdniXAhlvh/6K1EaPUMJF6Usg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761902685; 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=WkJ7F+NOdyJMPgUKBfmN8nPXJ+NjI1W8+ZJ83ZB2M4M=; b=s33M5bKa8X/EAPnjCGSvzJ9ct2xlmuQUsUfgOzonF0l9Kle0vPICADBlNLp6gjUcnuUJgd FbHba+mBWbAigoaZW6yjP4wLPQNX6PwV+inQ5gJkRrDWoReUlHU53cBq7sH1ynSV8ccgsi 7IAY9jskLXX+E8cffaPGb0CY600XE/RfImm0cgyWotKSctud38ls78cU0W0f/4xUxXcCdZ ROsJr172x1w536I4udJ7AUUxQhH6btToVERF8Vo7+c+He48633bCgeOKufnLwAvQAAEwUh sOrD2DoYrkjI2j4cUJcNdg0ehCNwQlbymNX6wnAoQ1iffNGx/F0+vwvMS7i49Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761902685; a=rsa-sha256; cv=none; b=RSEt3fpCsWiGOKoH0D0tHPeejzuKybd9b1pljg84+CZYmItAjDLGSzFipKh8QeYi+3jmDO jSygBcFhM/VnJHQ14g6M0ciEyvqNTHB85CyJ3l5kix+GbzvxzmptWBjBuwt5iwxKK+zwOo bBDuy/yFInbWKEZNcMDRtwzsvG4xBPtrwHnR9S96z/oL3Y+slMyFULfaDHlUMUiQIRHYy3 GuslsjkeYOsxTcqE/JacU328HYjyqULyWOLhFNzMR9To9uWKFqgmSi694/OwbRHyhLVho4 oAGzOv5X/TPopxTT/OxnSYyy4cy0GS19O7buKg35gEYicjGwLIdwNDh6sdCkkQ== 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 4cybCw6r2Cz12sn; Fri, 31 Oct 2025 09:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59V9Oi0O064467; Fri, 31 Oct 2025 09:24:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59V9OiCk064464; Fri, 31 Oct 2025 09:24:44 GMT (envelope-from git) Date: Fri, 31 Oct 2025 09:24:44 GMT Message-Id: <202510310924.59V9OiCk064464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 4eac02b29f56 - stable/15 - snd_dummy: Round channel pointer after each write List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 4eac02b29f56f35d17f3cb2104e5b952841e83b9 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4eac02b29f56f35d17f3cb2104e5b952841e83b9 commit 4eac02b29f56f35d17f3cb2104e5b952841e83b9 Author: Christos Margiolis AuthorDate: 2025-10-27 11:30:29 +0000 Commit: Christos Margiolis CommitDate: 2025-10-31 09:24:24 +0000 snd_dummy: Round channel pointer after each write Otherwise we go out of bounds and keep incrementing endlessly. Sponsored by: The FreeBSD Foundation MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D53337 (cherry picked from commit 364864ea91abbd8a9a79578168fa5d34e05200a7) --- sys/dev/sound/dummy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 1f2d69708eec..39214a141bf9 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -104,9 +104,10 @@ dummy_chan_io(void *arg) ch = &sc->chans[i]; if (!ch->run) continue; - if (ch->dir == PCMDIR_PLAY) + if (ch->dir == PCMDIR_PLAY) { ch->ptr += sndbuf_getblksz(ch->buf); - else + ch->ptr %= sndbuf_getsize(ch->buf); + } else sndbuf_fillsilence(ch->buf); snd_mtxunlock(sc->lock); chn_intr(ch->chan);