From nobody Fri Apr 26 21:44:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1565625567; cv=none; d=zoho.com; s=zohoarc; b=Caf8WJ6i78wrko4Chfq9b7J7H0kL5Ol0BoEqhxGV+MYcggnf1mD76/F3z5kwad1MjSoqttGMKd1ewxZ5h1pifY6sDZ5ZTlLbcIjcHkJVOpiqQJ+Cp/m14fJ2vv46+Me+3vdp6EjNs4fR8ZOtemV9H0cTUAupwzLgsTDGtAbhqD8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565625567; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=bZ7T45sX4PhQMwb2s5z3NBv9hQ/jyFS4sYWbPVJGIEw=; b=Btlg9HO0X5bevijmzpGtRhfU4/P3WKe0kfhLLvb8RcczdUDswchyVvZ1yH+/5gyLxNvNOLG5KP3S8F52NIoJ/zMWpdmcbysFRbN0Np2w9BaCASKhKWi33Hc8JRNS4kXEKKow5XhHWpUZekzGafVlpOkxnNILWzENeVeVzC+a2dY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565625567139592.1611511574993; Mon, 12 Aug 2019 08:59:27 -0700 (PDT) Received: from localhost ([::1]:46784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxCjG-000742-8d for importer@patchew.org; Mon, 12 Aug 2019 11:59:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49442) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxCic-0005j8-Dg for qemu-devel@nongnu.org; Mon, 12 Aug 2019 11:58:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxCib-0007u7-6t for qemu-devel@nongnu.org; Mon, 12 Aug 2019 11:58:46 -0400 Received: from relay.sw.ru ([185.231.240.75]:46394) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxCia-0007sh-W4 for qemu-devel@nongnu.org; Mon, 12 Aug 2019 11:58:45 -0400 Received: from [172.16.25.136] (helo=localhost.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1hxCiW-0001HP-4F; Mon, 12 Aug 2019 18:58:40 +0300 From: Andrey Shinkevich To: qemu-devel@nongnu.org Date: Mon, 12 Aug 2019 18:58:28 +0300 Message-Id: <1565625509-404969-2-git-send-email-andrey.shinkevich@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1565625509-404969-1-git-send-email-andrey.shinkevich@virtuozzo.com> References: <1565625509-404969-1-git-send-email-andrey.shinkevich@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v4 1/2] main-loop: Fix GSource leak in qio_task_thread_worker() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vsementsov@virtuozzo.com, berrange@redhat.com, berto@igalia.com, marcandre.lureau@redhat.com, andrey.shinkevich@virtuozzo.com, pbonzini@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Alberto Garcia After g_source_attach() the GMainContext holds a reference to the GSource, so the caller does not need to keep it. qio_task_thread_worker() is not releasing its reference so the GSource is being leaked since a17536c594bfed94d05667b419f747b692f5fc7f. Signed-off-by: Alberto Garcia Reviewed-by: Daniel P. Berrang=C3=A9 --- io/task.c | 1 + 1 file changed, 1 insertion(+) diff --git a/io/task.c b/io/task.c index 64c4c71..1ae7b86 100644 --- a/io/task.c +++ b/io/task.c @@ -136,6 +136,7 @@ static gpointer qio_task_thread_worker(gpointer opaque) qio_task_thread_result, task, NULL); g_source_attach(task->thread->completion, task->thread->context); + g_source_unref(task->thread->completion); trace_qio_task_thread_source_attach(task, task->thread->completion); =20 qemu_cond_signal(&task->thread_cond); --=20 1.8.3.1 From nobody Fri Apr 26 21:44:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1565625566; cv=none; d=zoho.com; s=zohoarc; b=HtaPBYhyE6MZu4U+iiZKWjIwhvpnPkgQobYOlJUk5AusyrwCYBYhf65sGRSqyNQaiSvWOalk0fnoNC2UcCWk58+YI5p6gnkmzxzeHU19FB9AYt37UGGInTnmKLaXm3sh680FYvdivU5/bl1lUWttyGTpIZSI0el10IohzlSqkPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565625566; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=q1+3ckwiFb0ioDegpQoP0f01GaDGBsQZKHMNFTO381g=; b=ekMlBrklWknXFcN4xW162rwG25xX4DIodra53NzX0IidHERydKFMR2hKdLze5VjnjKjilcEJXom+cui6PafHJmKl9QtjLVDwDUttbdIfREIEn6CGNbmz/1KbRgi6pUi70ZFxJSOMC5EFtayvd+4DJ5vPQJ+zW4pRc9RxAPiNGyA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565625566328947.5891214041552; Mon, 12 Aug 2019 08:59:26 -0700 (PDT) Received: from localhost ([::1]:46780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxCjD-0006u2-CE for importer@patchew.org; Mon, 12 Aug 2019 11:59:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49453) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxCic-0005j9-Ns for qemu-devel@nongnu.org; Mon, 12 Aug 2019 11:58:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxCib-0007ty-4R for qemu-devel@nongnu.org; Mon, 12 Aug 2019 11:58:46 -0400 Received: from relay.sw.ru ([185.231.240.75]:46402) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxCia-0007sj-SX for qemu-devel@nongnu.org; Mon, 12 Aug 2019 11:58:45 -0400 Received: from [172.16.25.136] (helo=localhost.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1hxCiW-0001HP-8n; Mon, 12 Aug 2019 18:58:40 +0300 From: Andrey Shinkevich To: qemu-devel@nongnu.org Date: Mon, 12 Aug 2019 18:58:29 +0300 Message-Id: <1565625509-404969-3-git-send-email-andrey.shinkevich@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1565625509-404969-1-git-send-email-andrey.shinkevich@virtuozzo.com> References: <1565625509-404969-1-git-send-email-andrey.shinkevich@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v4 2/2] char-socket: Lock tcp_chr_disconnect() and socket_reconnect_timeout() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vsementsov@virtuozzo.com, berrange@redhat.com, berto@igalia.com, marcandre.lureau@redhat.com, andrey.shinkevich@virtuozzo.com, pbonzini@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Alberto Garcia There's a race condition in which the tcp_chr_read() ioc handler can close a connection that is being written to from another thread. Running iotest 136 in a loop triggers this problem and crashes QEMU. (gdb) bt #0 0x00005558b842902d in object_get_class (obj=3D0x0) at qom/object.c:860 #1 0x00005558b84f92db in qio_channel_writev_full (ioc=3D0x0, iov=3D0x7ffc= 355decf0, niov=3D1, fds=3D0x0, nfds=3D0, errp=3D0x0) at io/channel.c:76 #2 0x00005558b84e0e9e in io_channel_send_full (ioc=3D0x0, buf=3D0x5558baf= 5beb0, len=3D138, fds=3D0x0, nfds=3D0) at chardev/char-io.c:123 #3 0x00005558b84e4a69 in tcp_chr_write (chr=3D0x5558ba460380, buf=3D0x555= 8baf5beb0 "...", len=3D138) at chardev/char-socket.c:135 #4 0x00005558b84dca55 in qemu_chr_write_buffer (s=3D0x5558ba460380, buf= =3D0x5558baf5beb0 "...", len=3D138, offset=3D0x7ffc355dedd0, write_all=3Dfa= lse) at chardev/char.c:112 #5 0x00005558b84dcbc2 in qemu_chr_write (s=3D0x5558ba460380, buf=3D0x5558= baf5beb0 "...", len=3D138, write_all=3Dfalse) at chardev/char.c:147 #6 0x00005558b84dfb26 in qemu_chr_fe_write (be=3D0x5558ba476610, buf=3D0x= 5558baf5beb0 "...", len=3D138) at chardev/char-fe.c:42 #7 0x00005558b8088c86 in monitor_flush_locked (mon=3D0x5558ba476610) at m= onitor.c:406 #8 0x00005558b8088e8c in monitor_puts (mon=3D0x5558ba476610, str=3D0x5558= ba921e49 "") at monitor.c:449 #9 0x00005558b8089178 in qmp_send_response (mon=3D0x5558ba476610, rsp=3D0= x5558bb161600) at monitor.c:498 #10 0x00005558b808920c in monitor_qapi_event_emit (event=3DQAPI_EVENT_SHUT= DOWN, qdict=3D0x5558bb161600) at monitor.c:526 #11 0x00005558b8089307 in monitor_qapi_event_queue_no_reenter (event=3DQAP= I_EVENT_SHUTDOWN, qdict=3D0x5558bb161600) at monitor.c:551 #12 0x00005558b80896c0 in qapi_event_emit (event=3DQAPI_EVENT_SHUTDOWN, qd= ict=3D0x5558bb161600) at monitor.c:626 #13 0x00005558b855f23b in qapi_event_send_shutdown (guest=3Dfalse, reason= =3DSHUTDOWN_CAUSE_HOST_QMP_QUIT) at qapi/qapi-events-run-state.c:43 #14 0x00005558b81911ef in qemu_system_shutdown (cause=3DSHUTDOWN_CAUSE_HOS= T_QMP_QUIT) at vl.c:1837 #15 0x00005558b8191308 in main_loop_should_exit () at vl.c:1885 #16 0x00005558b819140d in main_loop () at vl.c:1924 #17 0x00005558b8198c84 in main (argc=3D18, argv=3D0x7ffc355df3f8, envp=3D0= x7ffc355df490) at vl.c:4665 This patch adds a lock to protect tcp_chr_disconnect() and socket_reconnect_timeout() Signed-off-by: Alberto Garcia Signed-off-by: Andrey Shinkevich Reviewed-by: Daniel P. Berrang=C3=A9 --- chardev/char-socket.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 7ca5d97..03f0340 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -150,7 +150,7 @@ static void tcp_chr_accept(QIONetListener *listener, void *opaque); =20 static int tcp_chr_read_poll(void *opaque); -static void tcp_chr_disconnect(Chardev *chr); +static void tcp_chr_disconnect_locked(Chardev *chr); =20 /* Called with chr_write_lock held. */ static int tcp_chr_write(Chardev *chr, const uint8_t *buf, int len) @@ -174,7 +174,7 @@ static int tcp_chr_write(Chardev *chr, const uint8_t *b= uf, int len) =20 if (ret < 0 && errno !=3D EAGAIN) { if (tcp_chr_read_poll(chr) <=3D 0) { - tcp_chr_disconnect(chr); + tcp_chr_disconnect_locked(chr); return len; } /* else let the read handler finish it properly */ } @@ -469,8 +469,9 @@ static void update_disconnected_filename(SocketChardev = *s) /* NB may be called even if tcp_chr_connect has not been * reached, due to TLS or telnet initialization failure, * so can *not* assume s->state =3D=3D TCP_CHARDEV_STATE_CONNECTED + * This must be called with chr->chr_write_lock held. */ -static void tcp_chr_disconnect(Chardev *chr) +static void tcp_chr_disconnect_locked(Chardev *chr) { SocketChardev *s =3D SOCKET_CHARDEV(chr); bool emit_close =3D s->state =3D=3D TCP_CHARDEV_STATE_CONNECTED; @@ -490,6 +491,13 @@ static void tcp_chr_disconnect(Chardev *chr) } } =20 +static void tcp_chr_disconnect(Chardev *chr) +{ + qemu_mutex_lock(&chr->chr_write_lock); + tcp_chr_disconnect_locked(chr); + qemu_mutex_unlock(&chr->chr_write_lock); +} + static gboolean tcp_chr_read(QIOChannel *chan, GIOCondition cond, void *op= aque) { Chardev *chr =3D CHARDEV(opaque); @@ -1131,8 +1139,10 @@ static gboolean socket_reconnect_timeout(gpointer op= aque) Chardev *chr =3D CHARDEV(opaque); SocketChardev *s =3D SOCKET_CHARDEV(opaque); =20 + qemu_mutex_lock(&chr->chr_write_lock); g_source_unref(s->reconnect_timer); s->reconnect_timer =3D NULL; + qemu_mutex_unlock(&chr->chr_write_lock); =20 if (chr->be_open) { return false; --=20 1.8.3.1