From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P . Berrange" <berrange@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
peterx@redhat.com,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>
Subject: [Qemu-devel] [PATCH v2 01/15] chardev: fix leak in tcp_chr_telnet_init_io()
Date: Thu, 1 Mar 2018 16:44:24 +0800 [thread overview]
Message-ID: <20180301084438.13594-2-peterx@redhat.com> (raw)
In-Reply-To: <20180301084438.13594-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>
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 bdd6cff5f6..43a2cc2c1c 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
next prev parent reply other threads:[~2018-03-01 8:44 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-01 8:44 [Qemu-devel] [PATCH v2 00/15] qio: general non-default GMainContext support Peter Xu
2018-03-01 8:44 ` Peter Xu [this message]
2018-03-01 17:39 ` [Qemu-devel] [PATCH v2 01/15] chardev: fix leak in tcp_chr_telnet_init_io() Paolo Bonzini
2018-03-02 3:46 ` Peter Xu
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 02/15] qio: rename qio_task_thread_result Peter Xu
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 03/15] qio: introduce qio_channel_add_watch_{full|source} Peter Xu
2018-03-01 15:37 ` Daniel P. Berrangé
2018-03-01 17:13 ` Paolo Bonzini
2018-03-02 3:54 ` Peter Xu
2018-03-02 11:15 ` Paolo Bonzini
2018-03-02 15:44 ` Daniel P. Berrangé
2018-03-02 15:53 ` Paolo Bonzini
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 04/15] migration: let incoming side use thread context Peter Xu
2018-03-01 16:03 ` Daniel P. Berrangé
2018-03-02 3:56 ` Peter Xu
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 05/15] qio: refactor net listener source operations Peter Xu
2018-03-01 10:47 ` Daniel P. Berrangé
2018-03-02 3:58 ` Peter Xu
2018-03-02 4:04 ` Peter Xu
2018-03-02 10:51 ` Daniel P. Berrangé
2018-03-05 5:34 ` Peter Xu
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 06/15] qio: store gsources for net listeners Peter Xu
2018-03-01 15:40 ` Daniel P. Berrangé
2018-03-01 17:12 ` Paolo Bonzini
2018-03-02 4:10 ` Peter Xu
2018-03-02 4:59 ` Peter Xu
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 07/15] qio/chardev: update net listener gcontext Peter Xu
2018-03-01 15:43 ` Daniel P. Berrangé
2018-03-02 4:26 ` Peter Xu
2018-03-02 11:17 ` Paolo Bonzini
2018-03-05 5:43 ` Peter Xu
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 08/15] chardev: allow telnet gsource to switch gcontext Peter Xu
2018-03-01 15:46 ` Daniel P. Berrangé
2018-03-01 17:16 ` Paolo Bonzini
2018-03-02 4:37 ` Peter Xu
2018-03-02 11:02 ` Daniel P. Berrangé
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 09/15] qio: non-default context for threaded qtask Peter Xu
2018-03-01 15:47 ` Daniel P. Berrangé
2018-03-01 17:18 ` Paolo Bonzini
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 10/15] qio: non-default context for async conn Peter Xu
2018-03-01 15:48 ` Daniel P. Berrangé
2018-03-02 5:01 ` Peter Xu
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 11/15] qio: non-default context for TLS handshake Peter Xu
2018-03-01 15:50 ` Daniel P. Berrangé
2018-03-02 6:18 ` Peter Xu
2018-03-01 17:22 ` Paolo Bonzini
2018-03-02 6:09 ` Peter Xu
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 12/15] chardev: introduce chr_machine_done hook Peter Xu
2018-03-01 17:38 ` Paolo Bonzini
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 13/15] char: use chardev's gcontext for async connect Peter Xu
2018-03-01 17:38 ` Paolo Bonzini
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 14/15] chardev: tcp: postpone async connection setup Peter Xu
2018-03-01 16:01 ` Daniel P. Berrangé
2018-03-02 6:27 ` Peter Xu
2018-03-01 17:38 ` Paolo Bonzini
2018-03-01 8:44 ` [Qemu-devel] [PATCH v2 15/15] chardev: tcp: postpone TLS work until machine done Peter Xu
2018-03-01 16:03 ` Daniel P. Berrangé
2018-03-02 6:34 ` Peter Xu
2018-03-01 17:37 ` Paolo Bonzini
2018-03-02 6:43 ` Peter Xu
2018-03-01 16:07 ` [Qemu-devel] [PATCH v2 00/15] qio: general non-default GMainContext support Daniel P. Berrangé
2018-03-02 6:48 ` 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=20180301084438.13594-2-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--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).