qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Daniel P . Berrange" <berrange@redhat.com>,
	peterx@redhat.com,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PATCH 2/9] chardev: fix leak in tcp_chr_telnet_init_io()
Date: Mon,  5 Mar 2018 14:50:33 +0800	[thread overview]
Message-ID: <20180305065040.10353-3-peterx@redhat.com> (raw)
In-Reply-To: <20180305065040.10353-1-peterx@redhat.com>

Need to free TCPChardevTelnetInit when session established.

Since at it, switch to use G_SOURCE_* macros.

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 chardev/char-socket.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index 113feaf948..205ee377a4 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -591,19 +591,23 @@ static gboolean tcp_chr_telnet_init_io(QIOChannel *ioc,
             ret = 0;
         } else {
             tcp_chr_disconnect(init->chr);
-            return FALSE;
+            goto end;
         }
     }
     init->buflen -= ret;
 
     if (init->buflen == 0) {
         tcp_chr_connect(init->chr);
-        return FALSE;
+        goto end;
     }
 
     memmove(init->buf, init->buf + ret, init->buflen);
 
-    return TRUE;
+    return G_SOURCE_CONTINUE;
+
+end:
+    g_free(init);
+    return G_SOURCE_REMOVE;
 }
 
 static void tcp_chr_telnet_init(Chardev *chr)
-- 
2.14.3

  parent reply	other threads:[~2018-03-05  6:50 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-05  6:50 [Qemu-devel] [PATCH 0/9] chardev: qio related non-default context support Peter Xu
2018-03-05  6:50 ` [Qemu-devel] [PATCH 1/9] vl: export machine_init_done Peter Xu
2018-03-05 11:48   ` Marc-André Lureau
2018-03-06  5:20     ` Peter Xu
2018-03-05  6:50 ` Peter Xu [this message]
2018-03-05 11:48   ` [Qemu-devel] [PATCH 2/9] chardev: fix leak in tcp_chr_telnet_init_io() Marc-André Lureau
2018-03-05  6:50 ` [Qemu-devel] [PATCH 3/9] chardev: update net listener gcontext Peter Xu
2018-03-05 11:48   ` Marc-André Lureau
2018-03-05  6:50 ` [Qemu-devel] [PATCH 4/9] chardev: allow telnet gsource to switch gcontext Peter Xu
2018-03-05  6:50 ` [Qemu-devel] [PATCH 5/9] chardev: introduce chr_machine_done hook Peter Xu
2018-03-05 10:54   ` Marc-André Lureau
2018-03-06  5:27     ` Peter Xu
2018-03-05  6:50 ` [Qemu-devel] [PATCH 6/9] chardev: use chardev's gcontext for async connect Peter Xu
2018-03-05  6:50 ` [Qemu-devel] [PATCH 7/9] chardev: tcp: postpone async connection setup Peter Xu
2018-03-05  6:50 ` [Qemu-devel] [PATCH 8/9] chardev: tcp: let TLS run on chardev context Peter Xu
2018-03-05  6:50 ` [Qemu-devel] [PATCH 9/9] chardev: tcp: postpone TLS work until machine done Peter Xu
2018-03-05  7:43 ` [Qemu-devel] [PATCH 0/9] chardev: qio related non-default context support no-reply
2018-03-05  7:59   ` Peter Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180305065040.10353-3-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=berrange@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).