[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/9] monitor: Reset HMP mon->rs in CHR_EVENT_OPEN
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 1/9] monitor: Reset HMP mon->rs in CHR_EVENT_OPEN |
Date: |
Fri, 26 Sep 2014 15:03:59 -0400 |
From: Stratos Psomadakis <address@hidden>
Commit cdaa86a54 ("Add G_IO_HUP handler for socket chardev") exposed a bug in
the way the HMP monitor handles its command buffer. When a client closes the
connection to the monitor, tcp_chr_read() will detect the G_IO_HUP condition
and call tcp_chr_disconnect() to close the server-side connection too. Due to
the fact that monitor reads 1 byte at a time (for each tcp_chr_read()), the
monitor readline state / buffers might contain junk (i.e. a half-finished
command). Thus, without calling readline_restart() on mon->rs in
CHR_EVENT_OPEN, future HMP commands will fail.
Signed-off-by: Stratos Psomadakis <address@hidden>
Signed-off-by: Dimitris Aragiorgis <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/monitor.c b/monitor.c
index b96710e..48850af 100644
--- a/monitor.c
+++ b/monitor.c
@@ -5249,6 +5249,7 @@ static void monitor_event(void *opaque, int event)
monitor_printf(mon, "QEMU %s monitor - type 'help' for more "
"information\n", QEMU_VERSION);
if (!mon->mux_out) {
+ readline_restart(mon->rs);
readline_show_prompt(mon->rs);
}
mon->reset_seen = 1;
--
1.9.3
- [Qemu-devel] [PULL 0/9] QMP queue, Luiz Capitulino, 2014/09/26
- [Qemu-devel] [PULL 1/9] monitor: Reset HMP mon->rs in CHR_EVENT_OPEN,
Luiz Capitulino <=
- [Qemu-devel] [PULL 3/9] qapi: add visit_start_union and visit_end_union, Luiz Capitulino, 2014/09/26
- [Qemu-devel] [PULL 2/9] virtio-balloon: fix integer overflow in memory stats feature, Luiz Capitulino, 2014/09/26
- [Qemu-devel] [PULL 5/9] tests: add QMP input visitor test for unions with no discriminator, Luiz Capitulino, 2014/09/26
- [Qemu-devel] [PULL 4/9] qapi: dealloc visitor, implement visit_start_union, Luiz Capitulino, 2014/09/26
- [Qemu-devel] [PULL 7/9] qemu-socket: Polish errors for connect() and listen() failure, Luiz Capitulino, 2014/09/26
- [Qemu-devel] [PULL 6/9] qemu-iotests: Test missing "driver" key for blockdev-add, Luiz Capitulino, 2014/09/26
- [Qemu-devel] [PULL 8/9] qemu-socket: Eliminate silly QERR_ macros, Luiz Capitulino, 2014/09/26
- [Qemu-devel] [PULL 9/9] Add HMP command "info memory-devices", Luiz Capitulino, 2014/09/26
- Re: [Qemu-devel] [PULL 0/9] QMP queue, Peter Maydell, 2014/09/29