diff options
| author | Thomas Huth <thuth@redhat.com> | 2016-11-10 21:16:01 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-11-15 10:08:43 +1100 |
| commit | 7bacfd7f7289192c83330adceef9c38649c9acf9 (patch) | |
| tree | e6ab0ca4f062374a9f2d2b1698cb1e59678ee30c /hw/char | |
| parent | 5310799a8b687a6cf0b5dbabaa3b6ddc8a6a7a1a (diff) | |
| download | qemu-7bacfd7f7289192c83330adceef9c38649c9acf9.zip qemu-7bacfd7f7289192c83330adceef9c38649c9acf9.tar.gz qemu-7bacfd7f7289192c83330adceef9c38649c9acf9.tar.bz2 | |
spapr-vty: Fix bad assert() statement
When using the serial console in the GTK interface of QEMU (and
QEMU has been compiled with CONFIG_VTE), it is possible to trigger
the assert() statement in vty_receive() in spapr_vty.c by pasting
a chunk of text with length > 16 into the QEMU window.
Most of the other serial backends seem to simply drop characters
that they can not handle, so I think we should also do the same in
spapr-vty to fix this issue.
Buglink: https://bugs.launchpad.net/qemu/+bug/1639322
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/char')
| -rw-r--r-- | hw/char/spapr_vty.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index 31822fe..06b9b39 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -1,4 +1,5 @@ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -37,7 +38,15 @@ static void vty_receive(void *opaque, const uint8_t *buf, int size) qemu_irq_pulse(spapr_vio_qirq(&dev->sdev)); } for (i = 0; i < size; i++) { - assert((dev->in - dev->out) < VTERM_BUFSIZE); + if (dev->in - dev->out >= VTERM_BUFSIZE) { + static bool reported; + if (!reported) { + error_report("VTY input buffer exhausted - characters dropped." + " (input size = %i)", size); + reported = true; + } + break; + } dev->buf[dev->in++ % VTERM_BUFSIZE] = buf[i]; } } |