git: f4be8585afe7 - stable/15 - snd_envy24ht: Fix out-of-bounds DMA buffer indexing
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 Nov 2026 08:56:15 UTC
The branch stable/15 has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=f4be8585afe720b8f72c154ac134b618d9410ddc
commit f4be8585afe720b8f72c154ac134b618d9410ddc
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-11-03 10:28:58 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-11-12 08:56:07 +0000
snd_envy24ht: Fix out-of-bounds DMA buffer indexing
378e0c5c8967 reduced the number of playback channels from 5 to 1. This
introduced a regression, because the global DMA buffer indexing was not
adapted accordingly, which now results in kernel panics because of
out-of-bounds reads into the buffer. Additionally, because of wrong
indexing, recording channels ended up being serviced by the playback
part of envy24ht_intr().
Register 1 recording channel instead of 2 + sc->adcn, as the recording
DMA buffer only has room for 1 stereo stream. With 1 channel per
direction, give each channel the first index of its direction
(ENVY24HT_CHAN_PLAY_DAC1 and ENVY24HT_CHAN_REC_ADC1).
While here, fix the buffer wrap in envy24ht_r16sl(). It has to be
ch->size / ch->unit, but was copied verbatim from the 32-bit equivalent,
whose samples are twice as large, so 16-bit recording wrapped halfway
through the DMA buffer and never read the second half.
Fixes: 378e0c5c8967
PR: 299952
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D61155
(cherry picked from commit dbf51f8ed0a5bda749dd20aedca67ddcdfe70980)
---
sys/dev/sound/pci/envy24ht.c | 33 +++++++++++----------------------
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c
index 9818b716510f..a512676c5be1 100644
--- a/sys/dev/sound/pci/envy24ht.c
+++ b/sys/dev/sound/pci/envy24ht.c
@@ -171,7 +171,6 @@ struct sc_info {
struct pcmchan_caps caps[2];
/* channel info table */
- unsigned chnum;
struct sc_chinfo chan[11];
};
@@ -1448,7 +1447,7 @@ envy24ht_r16sl(struct sc_chinfo *ch)
dst = sndbuf_getfreeptr(ch->buffer) / 2;
src = dst / 2 + ch->offset;
dsize = ch->size / 2;
- ssize = ch->size / 8;
+ ssize = ch->size / 4;
slot = (ch->num - ENVY24HT_CHAN_REC_ADC1) * 2;
for (i = 0; i < length; i++) {
@@ -1477,14 +1476,13 @@ envy24htchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_chan
device_printf(sc->dev, "envy24htchan_init(obj, devinfo, b, c, %d)\n", dir);
#endif
mtx_lock(&sc->lock);
-#if 0
- if ((sc->chnum > ENVY24HT_CHAN_PLAY_SPDIF && dir != PCMDIR_REC) ||
- (sc->chnum < ENVY24HT_CHAN_REC_ADC1 && dir != PCMDIR_PLAY)) {
- mtx_unlock(&sc->lock);
- return NULL;
- }
-#endif
- num = sc->chnum;
+ /*
+ * Only 1 channel per direction is registered at the moment (see
+ * pcm_addchan() calls in envy24ht_pci_attach()), so only the first
+ * pair of slots in each frame is used.
+ */
+ num = dir == PCMDIR_PLAY ? ENVY24HT_CHAN_PLAY_DAC1 :
+ ENVY24HT_CHAN_REC_ADC1;
ch = &sc->chan[num];
ch->size = 8 * ENVY24HT_SAMPLE_NUM;
@@ -1498,8 +1496,7 @@ envy24htchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_chan
ch->channel = c;
ch->parent = sc;
ch->dir = dir;
- /* set channel map */
- ch->num = envy24ht_chanmap[num];
+ ch->num = num;
mtx_unlock(&sc->lock);
sndbuf_setup(ch->buffer, ch->data, ch->size);
mtx_lock(&sc->lock);
@@ -2481,16 +2478,8 @@ envy24ht_pci_attach(device_t dev)
/* set multi track mixer */
mixer_init(dev, &envy24htmixer_class, sc);
- /* set channel information */
- sc->chnum = 0;
- /* for (i = 0; i < 5; i++) { */
- pcm_addchan(dev, PCMDIR_PLAY, &envy24htchan_class, sc);
- sc->chnum++;
- /* } */
- for (i = 0; i < 2 + sc->adcn; i++) {
- pcm_addchan(dev, PCMDIR_REC, &envy24htchan_class, sc);
- sc->chnum++;
- }
+ pcm_addchan(dev, PCMDIR_PLAY, &envy24htchan_class, sc);
+ pcm_addchan(dev, PCMDIR_REC, &envy24htchan_class, sc);
/* set status iformation */
snprintf(status, SND_STATUSLEN,