[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.7 v3 19/36] char: free the tcp connection data
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH for-2.7 v3 19/36] char: free the tcp connection data when closing |
Date: |
Wed, 3 Aug 2016 18:55:24 +0400 |
From: Marc-André Lureau <address@hidden>
Make sure the connection data got freed when closing the chardev, to
avoid leaks.
Signed-off-by: Marc-André Lureau <address@hidden>
---
qemu-char.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index a50b8fb..625abcf 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2843,7 +2843,7 @@ static GSource *tcp_chr_add_watch(CharDriverState *chr,
GIOCondition cond)
return qio_channel_create_watch(s->ioc, cond);
}
-static void tcp_chr_disconnect(CharDriverState *chr)
+static void tcp_chr_free_connection(CharDriverState *chr)
{
TCPCharDriver *s = chr->opaque;
@@ -2851,11 +2851,6 @@ static void tcp_chr_disconnect(CharDriverState *chr)
return;
}
- s->connected = 0;
- if (s->listen_ioc) {
- s->listen_tag = qio_channel_add_watch(
- 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));
@@ -2863,6 +2858,24 @@ static void tcp_chr_disconnect(CharDriverState *chr)
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)
+{
+ TCPCharDriver *s = chr->opaque;
+
+ if (!s->connected) {
+ return;
+ }
+
+ tcp_chr_free_connection(chr);
+
+ if (s->listen_ioc) {
+ s->listen_tag = qio_channel_add_watch(
+ QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NULL);
+ }
chr->filename = SocketAddress_to_str("disconnected:", s->addr,
s->is_listen, s->is_telnet);
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
@@ -3179,6 +3192,7 @@ static void tcp_chr_close(CharDriverState *chr)
TCPCharDriver *s = chr->opaque;
int i;
+ tcp_chr_free_connection(chr);
if (s->reconnect_timer) {
g_source_remove(s->reconnect_timer);
s->reconnect_timer = 0;
--
2.9.0
- [Qemu-devel] [PATCH for-2.7 v3 11/36] tests: fix small leak in test-io-channel-command, (continued)
- [Qemu-devel] [PATCH for-2.7 v3 11/36] tests: fix small leak in test-io-channel-command, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 12/36] tests: fix leak in test-string-input-visitor, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 13/36] portio: keep references on portio, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 14/36] numa: do not leak NumaOptions, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 15/36] pc: simplify passing qemu_irq, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 20/36] char: free MuxDriver when closing, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 21/36] tests: fix qom-test leaks, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 18/36] acpi-build: fix array leak, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 22/36] pc: free i8259, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 16/36] pc: don't leak a20_line, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 19/36] char: free the tcp connection data when closing,
marcandre . lureau <=
- [Qemu-devel] [PATCH for-2.7 v3 17/36] machine: use class base init generated name, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 23/36] pc: keep gsi reference, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 24/36] ahci: free irqs array, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 25/36] sd: free timer, marcandre . lureau, 2016/08/03