[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/13] qemu-char: Fix missed data on unix socket
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 03/13] qemu-char: Fix missed data on unix socket |
Date: |
Fri, 24 Jul 2015 12:16:24 +0200 |
From: Nils Carlson <address@hidden>
Commit 812c1057 introduced HUP detection on unix and tcp sockets prior
to a read in tcp_chr_read. This unfortunately broke CloudStack 4.2
which relied on the old behaviour where data on a socket was readable
even if a HUP was present.
A working solution is to properly check the return values from recv,
handling a closed socket once there is no more data to read.
Also enable polling for G_IO_NVAL to ensure the callback is called
for all possible events as these should now be possible to handle
with the improved error detection.
Signed-off-by: Nils Carlson <address@hidden>
Message-Id: <address@hidden>
[Do not handle EINTR; use socket_error(). - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-char.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 3200200..d956f8d 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -807,7 +807,8 @@ static gboolean io_watch_poll_prepare(GSource *source, gint
*timeout_)
}
if (now_active) {
- iwp->src = g_io_create_watch(iwp->channel, G_IO_IN | G_IO_ERR |
G_IO_HUP);
+ iwp->src = g_io_create_watch(iwp->channel,
+ G_IO_IN | G_IO_ERR | G_IO_HUP |
G_IO_NVAL);
g_source_set_callback(iwp->src, iwp->fd_read, iwp->opaque, NULL);
g_source_attach(iwp->src, NULL);
} else {
@@ -2856,12 +2857,6 @@ static gboolean tcp_chr_read(GIOChannel *chan,
GIOCondition cond, void *opaque)
uint8_t buf[READ_BUF_LEN];
int len, size;
- if (cond & G_IO_HUP) {
- /* connection closed */
- tcp_chr_disconnect(chr);
- return TRUE;
- }
-
if (!s->connected || s->max_size <= 0) {
return TRUE;
}
@@ -2869,7 +2864,9 @@ static gboolean tcp_chr_read(GIOChannel *chan,
GIOCondition cond, void *opaque)
if (len > s->max_size)
len = s->max_size;
size = tcp_chr_recv(chr, (void *)buf, len);
- if (size == 0) {
+ if (size == 0 ||
+ (size < 0 &&
+ socket_error() != EAGAIN && socket_error() != EWOULDBLOCK)) {
/* connection closed */
tcp_chr_disconnect(chr);
} else if (size > 0) {
--
2.4.3
- [Qemu-devel] [PULL 00/13] Miscellaneous bugfixes for 2.4.0-rc3, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 01/13] exec.c: Use atomic_rcu_read() to access dispatch in memory_region_section_get_iotlb(), Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 03/13] qemu-char: Fix missed data on unix socket,
Paolo Bonzini <=
- [Qemu-devel] [PULL 02/13] qemu-char: handle EINTR for TCP character devices, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 05/13] vnc: fix memory leak, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 04/13] crypto: extend unit tests to cover decryption too, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 07/13] rcu: actually register threads that have RCU read-side critical sections, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 08/13] scsi: Handle no media case for scsi_get_configuration, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 10/13] memory: count number of active VGA logging clients, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 06/13] scsi: fix buffer overflow in scsi_req_parse_cdb (CVE-2015-5158), Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 09/13] vl: Fix compiler warning for builds without VNC, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 12/13] qemu-doc: fix typos, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 11/13] framebuffer: set DIRTY_MEMORY_VGA on RAM that is used for the framebuffer, Paolo Bonzini, 2015/07/24