openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

char: free the tcp connection data when closing 

Make sure the connection data got freed when closing the chardev, to
avoid leaks. Introduce tcp_chr_free_connection() to clean all connection
related data, and move some tcp_chr_close() clean-ups there.

(while at it, set write_msgfds_num to 0 when clearing array in
tcp_set_msgfds())

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-07-14 03:21:37 +02:00
parent 157e94e8a2
commit 5b498459b4
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
qemu-char.c
View File

@ -2763,6 +2763,7 @@ static int tcp_set_msgfds(CharDriverState *chr, int *fds, int num)
/* clear old pending fd array */ /* clear old pending fd array */
g_free(s->write_msgfds); g_free(s->write_msgfds);
s->write_msgfds = NULL; s->write_msgfds = NULL;
s->write_msgfds_num = 0;
if (!s->connected || if (!s->connected ||
!qio_channel_has_feature(s->ioc, !qio_channel_has_feature(s->ioc,
@ -2843,6 +2844,35 @@ static GSource *tcp_chr_add_watch(CharDriverState *chr, GIOCondition cond)
return qio_channel_create_watch(s->ioc, cond); return qio_channel_create_watch(s->ioc, cond);
} }
static void tcp_chr_free_connection(CharDriverState *chr)
{
TCPCharDriver *s = chr->opaque;
int i;
if (!s->connected) {
return;
}
if (s->read_msgfds_num) {
for (i = 0; i < s->read_msgfds_num; i++) {
close(s->read_msgfds[i]);
}
g_free(s->read_msgfds);
s->read_msgfds = NULL;
s->read_msgfds_num = 0;
}
tcp_set_msgfds(chr, NULL, 0);
remove_fd_in_watch(chr);
object_unref(OBJECT(s->sioc));
s->sioc = NULL;
object_unref(OBJECT(s->ioc));
s->ioc = NULL;
g_free(chr->filename);
chr->filename = NULL;
s->connected = 0;
}
static void tcp_chr_disconnect(CharDriverState *chr) static void tcp_chr_disconnect(CharDriverState *chr)
{ {
TCPCharDriver *s = chr->opaque; TCPCharDriver *s = chr->opaque;
@ -2851,18 +2881,12 @@ static void tcp_chr_disconnect(CharDriverState *chr)
return; return;
} }
s->connected = 0; tcp_chr_free_connection(chr);
if (s->listen_ioc) { if (s->listen_ioc) {
s->listen_tag = qio_channel_add_watch( s->listen_tag = qio_channel_add_watch(
QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NULL); QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NULL);
} }
tcp_set_msgfds(chr, NULL, 0);
remove_fd_in_watch(chr);
object_unref(OBJECT(s->sioc));
s->sioc = NULL;
object_unref(OBJECT(s->ioc));
s->ioc = NULL;
g_free(chr->filename);
chr->filename = SocketAddress_to_str("disconnected:", s->addr, chr->filename = SocketAddress_to_str("disconnected:", s->addr,
s->is_listen, s->is_telnet); s->is_listen, s->is_telnet);
qemu_chr_be_event(chr, CHR_EVENT_CLOSED); qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
@ -3177,17 +3201,14 @@ int qemu_chr_wait_connected(CharDriverState *chr, Error **errp)
static void tcp_chr_close(CharDriverState *chr) static void tcp_chr_close(CharDriverState *chr)
{ {
TCPCharDriver *s = chr->opaque; TCPCharDriver *s = chr->opaque;
int i;
tcp_chr_free_connection(chr);
if (s->reconnect_timer) { if (s->reconnect_timer) {
g_source_remove(s->reconnect_timer); g_source_remove(s->reconnect_timer);
s->reconnect_timer = 0; s->reconnect_timer = 0;
} }
qapi_free_SocketAddress(s->addr); qapi_free_SocketAddress(s->addr);
remove_fd_in_watch(chr);
if (s->ioc) {
object_unref(OBJECT(s->ioc));
}
if (s->listen_tag) { if (s->listen_tag) {
g_source_remove(s->listen_tag); g_source_remove(s->listen_tag);
s->listen_tag = 0; s->listen_tag = 0;
@ -3195,18 +3216,9 @@ static void tcp_chr_close(CharDriverState *chr)
if (s->listen_ioc) { if (s->listen_ioc) {
object_unref(OBJECT(s->listen_ioc)); object_unref(OBJECT(s->listen_ioc));
} }
if (s->read_msgfds_num) {
for (i = 0; i < s->read_msgfds_num; i++) {
close(s->read_msgfds[i]);
}
g_free(s->read_msgfds);
}
if (s->tls_creds) { if (s->tls_creds) {
object_unref(OBJECT(s->tls_creds)); object_unref(OBJECT(s->tls_creds));
} }
if (s->write_msgfds_num) {
g_free(s->write_msgfds);
}
g_free(s); g_free(s);
qemu_chr_be_event(chr, CHR_EVENT_CLOSED); qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
} }