From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anxGt-0007Lc-QQ for qemu-devel@nongnu.org; Wed, 06 Apr 2016 19:54:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1anxGq-0007yI-Js for qemu-devel@nongnu.org; Wed, 06 Apr 2016 19:54:03 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:50144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anxGq-0007yA-CM for qemu-devel@nongnu.org; Wed, 06 Apr 2016 19:54:00 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 6 Apr 2016 17:53:58 -0600 Received: from b01cxnp22034.gho.pok.ibm.com (b01cxnp22034.gho.pok.ibm.com [9.57.198.24]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 887933E4003E for ; Wed, 6 Apr 2016 17:53:56 -0600 (MDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by b01cxnp22034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u36NruDl30671000 for ; Wed, 6 Apr 2016 23:53:56 GMT Received: from d01av03.pok.ibm.com (localhost [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u36Nrtoc013989 for ; Wed, 6 Apr 2016 19:53:55 -0400 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <1459921411-20723-2-git-send-email-den@openvz.org> References: <1459921411-20723-1-git-send-email-den@openvz.org> <1459921411-20723-2-git-send-email-den@openvz.org> Message-ID: <20160406235350.14380.72767@loki> Date: Wed, 06 Apr 2016 18:53:50 -0500 Subject: Re: [Qemu-devel] [PATCH 1/2] qga: fix fd leak with guest-exec i/o channels List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Denis V. Lunev" , qemu-devel@nongnu.org Cc: Yuriy Pudgorodskiy Quoting Denis V. Lunev (2016-04-06 00:43:30) > From: Yuriy Pudgorodskiy > = > Signed-off-by: Yuriy Pudgorodskiy > Signed-off-by: Denis V. Lunev > CC: Michael Roth > --- > qga/commands.c | 3 +++ > 1 file changed, 3 insertions(+) > = > diff --git a/qga/commands.c b/qga/commands.c > index e091ee1..9ad2f7d 100644 > --- a/qga/commands.c > +++ b/qga/commands.c > @@ -446,6 +446,7 @@ GuestExec *qmp_guest_exec(const char *path, > g_io_channel_set_encoding(in_ch, NULL, NULL); > g_io_channel_set_buffered(in_ch, false); > g_io_channel_set_flags(in_ch, G_IO_FLAG_NONBLOCK, NULL); > + g_io_channel_set_close_on_unref(in_ch, true); > g_io_add_watch(in_ch, G_IO_OUT, guest_exec_input_watch, &gei->in= ); > } > = > @@ -461,6 +462,8 @@ GuestExec *qmp_guest_exec(const char *path, > g_io_channel_set_encoding(err_ch, NULL, NULL); > g_io_channel_set_buffered(out_ch, false); > g_io_channel_set_buffered(err_ch, false); > + g_io_channel_set_close_on_unref(out_ch, true); > + g_io_channel_set_close_on_unref(err_ch, true); I don't seem any harm in adding these for safety, but don't the handles get closed via the g_io_channel_shutdown(ch, ...) calls we make prior to unref in guest_exec_{output,input}_watch()? Or is there another unref path I'm missing? > g_io_add_watch(out_ch, G_IO_IN | G_IO_HUP, > guest_exec_output_watch, &gei->out); > g_io_add_watch(err_ch, G_IO_IN | G_IO_HUP, > -- = > 2.1.4 >=20