wm8750: add record buffer underrun check

[Qemu-devel] [PATCH] wm8750: add record buffer underrun check

Gerd Hoffmann posted 1 patch 8 years, 2 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20170901131409.6712-1-kraxel@redhat.com

Test FreeBSD passed

Test checkpatch passed

Test docker passed

Test s390x passed

hw/audio/wm8750.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] wm8750: add record buffer underrun check

Posted by Gerd Hoffmann 8 years, 2 months ago

Reported-by: niuguoxiang@huawei.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/audio/wm8750.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c
index f8b5bebfc2..d2bf2e1da1 100644
--- a/hw/audio/wm8750.c
+++ b/hw/audio/wm8750.c
@@ -680,8 +680,12 @@ uint32_t wm8750_adc_dat(void *opaque)
     WM8750State *s = (WM8750State *) opaque;
     uint32_t *data;
 
-    if (s->idx_in >= sizeof(s->data_in))
+    if (s->idx_in >= sizeof(s->data_in)) {
         wm8750_in_load(s);
+        if (s->idx_in >= sizeof(s->data_in)) {
+            return 0x80008000; /* silence in AUD_FMT_S16 sample format */
+        }
+    }
 
     data = (uint32_t *) &s->data_in[s->idx_in];
     s->req_in -= 4;
-- 
2.9.3

Re: [Qemu-devel] [PATCH] wm8750: add record buffer underrun check

Posted by P J P 8 years, 2 months ago

+-- On Fri, 1 Sep 2017, Gerd Hoffmann wrote --+
| diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c
| index f8b5bebfc2..d2bf2e1da1 100644
| --- a/hw/audio/wm8750.c
| +++ b/hw/audio/wm8750.c
| @@ -680,8 +680,12 @@ uint32_t wm8750_adc_dat(void *opaque)
|      WM8750State *s = (WM8750State *) opaque;
|      uint32_t *data;
|  
| -    if (s->idx_in >= sizeof(s->data_in))
| +    if (s->idx_in >= sizeof(s->data_in)) {
|          wm8750_in_load(s);
| +        if (s->idx_in >= sizeof(s->data_in)) {
| +            return 0x80008000; /* silence in AUD_FMT_S16 sample format */
| +        }
| +    }
|  
|      data = (uint32_t *) &s->data_in[s->idx_in];
|      s->req_in -= 4;

Ack, looks good. Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F