From: Manos Pitsidianakis <[email protected]> In 98e77e3d we calculated the max size and checked that each buffer is smaller than it.
We neglected to subtract the size of the virtio_snd_pcm_status header from the max size, and max_size was thus larger than the correct value, leading to potential OOB writes. If the buffer cannot fit the header or can fit only the header, return the buffer immediately. Cc: [email protected] Fixes: 98e77e3dd8dd6e7aa9a7dffa60f49c8c8a49d4e3 ("virtio-snd: add max size bounds check in input cb") Reported-by: DARKNAVY <[email protected]> Signed-off-by: Manos Pitsidianakis <[email protected]> Reviewed-by: Michael S. Tsirkin <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Message-Id: <[email protected]> --- hw/audio/virtio-snd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c index ae8bfbca43..d1a46d47bc 100644 --- a/hw/audio/virtio-snd.c +++ b/hw/audio/virtio-snd.c @@ -1265,6 +1265,12 @@ static void virtio_snd_pcm_in_cb(void *data, int available) } max_size = iov_size(buffer->elem->in_sg, buffer->elem->in_num); + if (max_size <= sizeof(virtio_snd_pcm_status)) { + return_rx_buffer(stream, buffer); + continue; + } + max_size -= sizeof(virtio_snd_pcm_status); + for (;;) { if (buffer->size >= max_size) { return_rx_buffer(stream, buffer); -- MST
