|
 |
dc7afb |
From 96c8fcafa7325cd0e8a23a743a55f0ad0aa9f79b Mon Sep 17 00:00:00 2001
|
|
|
dc7afb |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
dc7afb |
Date: Thu, 18 Mar 2021 09:13:42 -0400
|
|
|
dc7afb |
Subject: [PATCH 5/5] audio: audio_generic_get_buffer_in should honor *size
|
|
|
dc7afb |
MIME-Version: 1.0
|
|
|
dc7afb |
Content-Type: text/plain; charset=UTF-8
|
|
|
dc7afb |
Content-Transfer-Encoding: 8bit
|
|
|
dc7afb |
|
|
|
dc7afb |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
dc7afb |
Message-id: <20210318091342.3232471-2-kraxel@redhat.com>
|
|
|
dc7afb |
Patchwork-id: 101352
|
|
|
dc7afb |
O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 1/1] audio: audio_generic_get_buffer_in should honor *size
|
|
|
dc7afb |
Bugzilla: 1932823
|
|
|
dc7afb |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
dc7afb |
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
|
|
dc7afb |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
dc7afb |
|
|
|
dc7afb |
From: Volker Rümelin <vr_qemu@t-online.de>
|
|
|
dc7afb |
|
|
|
dc7afb |
The function generic_get_buffer_in currently ignores the *size
|
|
|
dc7afb |
parameter and may return a buffer larger than *size.
|
|
|
dc7afb |
|
|
|
dc7afb |
As a result the variable samples in function
|
|
|
dc7afb |
audio_pcm_hw_run_in may underflow. The while loop then most
|
|
|
dc7afb |
likely will never termiate.
|
|
|
dc7afb |
|
|
|
dc7afb |
Buglink: http://bugs.debian.org/948658
|
|
|
dc7afb |
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
|
|
|
dc7afb |
Message-Id: <20200123074943.6699-9-vr_qemu@t-online.de>
|
|
|
dc7afb |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
dc7afb |
(cherry picked from commit 599eac4e5a41e828645594097daee39373acc3c0)
|
|
|
dc7afb |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
dc7afb |
---
|
|
|
dc7afb |
audio/audio.c | 3 ++-
|
|
|
dc7afb |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
dc7afb |
|
|
|
dc7afb |
diff --git a/audio/audio.c b/audio/audio.c
|
|
|
dc7afb |
index 56fae55047..39a62fc62a 100644
|
|
|
dc7afb |
--- a/audio/audio.c
|
|
|
dc7afb |
+++ b/audio/audio.c
|
|
|
dc7afb |
@@ -1402,7 +1402,8 @@ void *audio_generic_get_buffer_in(HWVoiceIn *hw, size_t *size)
|
|
|
dc7afb |
}
|
|
|
dc7afb |
assert(start >= 0 && start < hw->size_emul);
|
|
|
dc7afb |
|
|
|
dc7afb |
- *size = MIN(hw->pending_emul, hw->size_emul - start);
|
|
|
dc7afb |
+ *size = MIN(*size, hw->pending_emul);
|
|
|
dc7afb |
+ *size = MIN(*size, hw->size_emul - start);
|
|
|
dc7afb |
return hw->buf_emul + start;
|
|
|
dc7afb |
}
|
|
|
dc7afb |
|
|
|
dc7afb |
--
|
|
|
dc7afb |
2.27.0
|
|
|
dc7afb |
|