diff options
| author | Manos Pitsidianakis <manos.pitsidianakis@linaro.org> | 2024-07-08 10:09:49 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2024-07-21 14:43:02 -0400 |
| commit | 98e77e3dd8dd6e7aa9a7dffa60f49c8c8a49d4e3 (patch) | |
| tree | 6c5b87b0650df909b124689f64b8dfbe2a655fe8 /hw/audio/virtio-snd.c | |
| parent | e3f15732c479e6c4baa56af65f52d99fbfb5c417 (diff) | |
| download | focaccia-qemu-98e77e3dd8dd6e7aa9a7dffa60f49c8c8a49d4e3.tar.gz focaccia-qemu-98e77e3dd8dd6e7aa9a7dffa60f49c8c8a49d4e3.zip | |
virtio-snd: add max size bounds check in input cb
When reading input audio in the virtio-snd input callback, virtio_snd_pcm_in_cb(), we do not check whether the iov can actually fit the data buffer. This is because we use the buffer->size field as a total-so-far accumulator instead of byte-size-left like in TX buffers. This triggers an out of bounds write if the size of the virtio queue element is equal to virtio_snd_pcm_status, which makes the available space for audio data zero. This commit adds a check for reaching the maximum buffer size before attempting any writes. Reported-by: Zheyu Ma <zheyuma97@gmail.com> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2427 Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> Message-Id: <virtio-snd-fuzz-2427-fix-v1-manos.pitsidianakis@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/audio/virtio-snd.c')
| -rw-r--r-- | hw/audio/virtio-snd.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c index 5993f4f040..e6432ac959 100644 --- a/hw/audio/virtio-snd.c +++ b/hw/audio/virtio-snd.c @@ -1261,7 +1261,7 @@ static void virtio_snd_pcm_in_cb(void *data, int available) { VirtIOSoundPCMStream *stream = data; VirtIOSoundPCMBuffer *buffer; - size_t size; + size_t size, max_size; WITH_QEMU_LOCK_GUARD(&stream->queue_mutex) { while (!QSIMPLEQ_EMPTY(&stream->queue)) { @@ -1275,7 +1275,12 @@ static void virtio_snd_pcm_in_cb(void *data, int available) continue; } + max_size = iov_size(buffer->elem->in_sg, buffer->elem->in_num); for (;;) { + if (buffer->size >= max_size) { + return_rx_buffer(stream, buffer); + break; + } size = AUD_read(stream->voice.in, buffer->data + buffer->size, MIN(available, (stream->params.period_bytes - |