aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2013-08-22 11:43:58 +0200
committerGerd Hoffmann <kraxel@redhat.com>2013-09-12 09:58:18 +0200
commitb0d768c35e08d2057b63e8e77e7a513c447199fa (patch)
treee320d89537fc19394fba2592b44bbb1427882ae8
parent2d1fe1873a984d1c2c89ffa3d12949cafc718551 (diff)
downloadqemu-b0d768c35e08d2057b63e8e77e7a513c447199fa.zip
qemu-b0d768c35e08d2057b63e8e77e7a513c447199fa.tar.gz
qemu-b0d768c35e08d2057b63e8e77e7a513c447199fa.tar.bz2
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>
-rw-r--r--qemu-char.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/qemu-char.c b/qemu-char.c
index 6259496..f7f5464 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;
}