From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUxbO-0000On-GQ for qemu-devel@nongnu.org; Wed, 03 Aug 2016 10:56:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUxbK-0001Wg-99 for qemu-devel@nongnu.org; Wed, 03 Aug 2016 10:56:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59902) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUxbD-0001SN-M7 for qemu-devel@nongnu.org; Wed, 03 Aug 2016 10:56:54 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2D1FD80082 for ; Wed, 3 Aug 2016 14:56:47 +0000 (UTC) From: marcandre.lureau@redhat.com Date: Wed, 3 Aug 2016 18:55:24 +0400 Message-Id: <20160803145541.15355-20-marcandre.lureau@redhat.com> In-Reply-To: <20160803145541.15355-1-marcandre.lureau@redhat.com> References: <20160803145541.15355-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-2.7 v3 19/36] char: free the tcp connection data when closing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, eblake@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau Make sure the connection data got freed when closing the chardev, to avoid leaks. Signed-off-by: Marc-Andr=C3=A9 Lureau --- 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); } =20 -static void tcp_chr_disconnect(CharDriverState *chr) +static void tcp_chr_free_connection(CharDriverState *chr) { TCPCharDriver *s =3D chr->opaque; =20 @@ -2851,11 +2851,6 @@ static void tcp_chr_disconnect(CharDriverState *ch= r) return; } =20 - s->connected =3D 0; - if (s->listen_ioc) { - s->listen_tag =3D qio_channel_add_watch( - QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NU= LL); - } 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 *ch= r) object_unref(OBJECT(s->ioc)); s->ioc =3D NULL; g_free(chr->filename); + chr->filename =3D NULL; + s->connected =3D 0; +} + +static void tcp_chr_disconnect(CharDriverState *chr) +{ + TCPCharDriver *s =3D chr->opaque; + + if (!s->connected) { + return; + } + + tcp_chr_free_connection(chr); + + if (s->listen_ioc) { + s->listen_tag =3D qio_channel_add_watch( + QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NU= LL); + } chr->filename =3D 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 =3D chr->opaque; int i; =20 + tcp_chr_free_connection(chr); if (s->reconnect_timer) { g_source_remove(s->reconnect_timer); s->reconnect_timer =3D 0; --=20 2.9.0