From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSRVv-0003gs-Dv for qemu-devel@nongnu.org; Fri, 12 Sep 2014 10:07:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSRVo-00040B-AL for qemu-devel@nongnu.org; Fri, 12 Sep 2014 10:07:51 -0400 Received: from averel.grnet-hq.admin.grnet.gr ([195.251.29.3]:29435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSRVn-0003z4-SX for qemu-devel@nongnu.org; Fri, 12 Sep 2014 10:07:44 -0400 From: Stratos Psomadakis Date: Fri, 12 Sep 2014 17:07:32 +0300 Message-Id: <1410530852-13631-1-git-send-email-psomas@grnet.gr> In-Reply-To: <87wq991g1c.fsf@blackfin.pond.sub.org> References: <87wq991g1c.fsf@blackfin.pond.sub.org> Subject: [Qemu-devel] [PATCH resend 1/2] monitor: Reset HMP mon->rs on CHR_EVENT_CLOSED List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: synnefo-devel@googlegroups.com, qemu-stable@nongnu.org, armbru@redhat.com, lcapitulino@redhat.com 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 upon CHR_EVENT_CLOSED, future HMP commands will fail. Signed-off-by: Stratos Psomadakis Signed-off-by: Dimitris Aragiorgis --- monitor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/monitor.c b/monitor.c index 34cee74..7857300 100644 --- a/monitor.c +++ b/monitor.c @@ -5252,6 +5252,7 @@ static void monitor_event(void *opaque, int event) break; case CHR_EVENT_CLOSED: + readline_restart(mon->rs); mon_refcount--; monitor_fdsets_cleanup(); break; -- 1.7.10.4