[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] socket: don't attempt to reconnect a TCP socket in
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH] socket: don't attempt to reconnect a TCP socket in server mode |
Date: |
Wed, 5 Sep 2012 14:01:36 -0500 |
Commit c3767ed0eb5d0bb25fe409ae5dec06e3411ff1b6 introduced a possible SEGV when
using a socket chardev with server=on because it assumes that all TCP sockets
are in client mode.
This patch adds a check to only reconnect when in client mode.
Cc: Lei Li <address@hidden>
Reported-by: Michael Roth <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
---
qemu-char.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 398baf1..767da93 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2148,10 +2148,12 @@ static int tcp_chr_write(CharDriverState *chr, const
uint8_t *buf, int len)
TCPCharDriver *s = chr->opaque;
if (s->connected) {
return send_all(s->fd, buf, len);
- } else {
+ } else if (s->listen_fd == -1) {
/* (Re-)connect for unconnected writing */
tcp_chr_connect(chr);
return 0;
+ } else {
+ return len;
}
}
--
1.7.5.4
- [Qemu-devel] [PATCH] socket: don't attempt to reconnect a TCP socket in server mode,
Anthony Liguori <=