falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

socket: don't attempt to reconnect a TCP socket in server mode 

Commit c3767ed0eb 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 <lilei@linux.vnet.ibm.com>
Reported-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 455aa1e081)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Anthony Liguori 2012-09-05 13:52:49 -05:00 committed by Michael Roth
parent 82645b9e93
commit 5af6b07ab0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qemu-char.c
View File

@ -2148,10 +2148,12 @@ static int tcp_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
TCPCharDriver *s = chr->opaque; TCPCharDriver *s = chr->opaque;
if (s->connected) { if (s->connected) {
return send_all(s->fd, buf, len); return send_all(s->fd, buf, len);
} else { } else if (s->listen_fd == -1) {
/* (Re-)connect for unconnected writing */ /* (Re-)connect for unconnected writing */
tcp_chr_connect(chr); tcp_chr_connect(chr);
return 0; return 0;
} else {
return len;
} }
} }