diff options
| author | Manos Pitsidianakis <manos.pitsidianakis@linaro.org> | 2024-07-11 10:38:49 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2024-07-21 14:43:02 -0400 |
| commit | 9b6083465fb8311f2410615f8303a41f580a2a20 (patch) | |
| tree | 3468ded4b020ff1e57537aaa61c6df2a7c704325 /hw/audio/virtio-snd.c | |
| parent | 98e77e3dd8dd6e7aa9a7dffa60f49c8c8a49d4e3 (diff) | |
| download | focaccia-qemu-9b6083465fb8311f2410615f8303a41f580a2a20.tar.gz focaccia-qemu-9b6083465fb8311f2410615f8303a41f580a2a20.zip | |
virtio-snd: check for invalid param shift operands
When setting the parameters of a PCM stream, we compute the bit flag with the format and rate values as shift operand to check if they are set in supported_formats and supported_rates. If the guest provides a format/rate value which when shifting 1 results in a value bigger than the number of bits in supported_formats/supported_rates, we must report an error. Previously, this ended up triggering the not reached assertions later when converting to internal QEMU values. Reported-by: Zheyu Ma <zheyuma97@gmail.com> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2416 Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> Message-Id: <virtio-snd-fuzz-2416-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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c index e6432ac959..e5196aa4bb 100644 --- a/hw/audio/virtio-snd.c +++ b/hw/audio/virtio-snd.c @@ -282,11 +282,13 @@ uint32_t virtio_snd_set_pcm_params(VirtIOSound *s, error_report("Number of channels is not supported."); return cpu_to_le32(VIRTIO_SND_S_NOT_SUPP); } - if (!(supported_formats & BIT(params->format))) { + if (BIT(params->format) > sizeof(supported_formats) || + !(supported_formats & BIT(params->format))) { error_report("Stream format is not supported."); return cpu_to_le32(VIRTIO_SND_S_NOT_SUPP); } - if (!(supported_rates & BIT(params->rate))) { + if (BIT(params->rate) > sizeof(supported_rates) || + !(supported_rates & BIT(params->rate))) { error_report("Stream rate is not supported."); return cpu_to_le32(VIRTIO_SND_S_NOT_SUPP); } |