mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: Reset HMP mon->rs in CHR_EVENT_OPEN

Browse Source 
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 <psomas@grnet.gr>
Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Stratos Psomadakis 2014-09-15 15:34:57 +03:00 committed by Luiz Capitulino
parent 81ab11a7a5
commit e5554e2015
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
monitor.c
View File

@ -5249,6 +5249,7 @@ static void monitor_event(void *opaque, int event)
monitor_printf(mon, "QEMU %s monitor - type 'help' for more " monitor_printf(mon, "QEMU %s monitor - type 'help' for more "
"information\n", QEMU_VERSION); "information\n", QEMU_VERSION);
if (!mon->mux_out) { if (!mon->mux_out) {
readline_restart(mon->rs);
readline_show_prompt(mon->rs); readline_show_prompt(mon->rs);
} }
mon->reset_seen = 1; mon->reset_seen = 1;