diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-08-22 11:43:58 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2013-09-24 22:52:23 -0500 |
| commit | 4b5b4721464495fe76fe6e2e033cbb61dce78eef (patch) | |
| tree | b29a79bc87d28c138314865a78ed381c4a5aaf51 | |
| parent | 76f698948781a148d336ff9032159f6c7c9eccd2 (diff) | |
| download | qemu-4b5b4721464495fe76fe6e2e033cbb61dce78eef.tar.gz | |
chardev: fix pty_chr_timer
pty_chr_timer first calls pty_chr_update_read_handler(), then clears
timer_tag (because it is a one-shot timer). This is the wrong order
though. pty_chr_update_read_handler might re-arm time timer, and the
new timer_tag gets overwitten in that case.
This leads to crashes when unplugging a pty chardev: pty_chr_close
thinks no timer is running -> timer isn't canceled -> pty_chr_timer gets
called with stale CharDevState -> BOOM.
This patch fixes the ordering.
Kill the pointless goto while being at it.
https://bugzilla.redhat.com/show_bug.cgi?id=994414
Cc: qemu-stable@nongnu.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit b0d768c35e08d2057b63e8e77e7a513c447199fa)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | qemu-char.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/qemu-char.c b/qemu-char.c index 1be1cf676e..1621fbd30f 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1026,15 +1026,11 @@ static gboolean pty_chr_timer(gpointer opaque) struct CharDriverState *chr = opaque; PtyCharDriver *s = chr->opaque; - if (s->connected) { - goto out; - } - - /* Next poll ... */ - pty_chr_update_read_handler(chr); - -out: s->timer_tag = 0; + if (!s->connected) { + /* Next poll ... */ + pty_chr_update_read_handler(chr); + } return FALSE; } |