From patchwork Wed Sep 7 18:46:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 113813 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 792ACB6F80 for ; Thu, 8 Sep 2011 04:46:47 +1000 (EST) Received: from localhost ([::1]:59257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1N91-00087g-5q for incoming@patchwork.ozlabs.org; Wed, 07 Sep 2011 14:46:43 -0400 Received: from eggs.gnu.org ([140.186.70.92]:60718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1N8r-000879-Or for qemu-devel@nongnu.org; Wed, 07 Sep 2011 14:46:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R1N8n-0001BQ-IN for qemu-devel@nongnu.org; Wed, 07 Sep 2011 14:46:33 -0400 Received: from e38.co.us.ibm.com ([32.97.110.159]:37822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1N8n-0001BK-DG for qemu-devel@nongnu.org; Wed, 07 Sep 2011 14:46:29 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e38.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p87IcQpE016219 for ; Wed, 7 Sep 2011 12:38:26 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p87IkFTs094542 for ; Wed, 7 Sep 2011 12:46:19 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p87CkDdC004041 for ; Wed, 7 Sep 2011 06:46:13 -0600 Received: from titi.austin.rr.com (sig-9-65-212-157.mts.ibm.com [9.65.212.157]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p87CkCAg003876; Wed, 7 Sep 2011 06:46:13 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Wed, 7 Sep 2011 13:46:08 -0500 Message-Id: <1315421168-22698-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.110.159 Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH] iohandlers: fix issue with qemu_set_fd_handler() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org As spotted by Aneesh, some users pass a NULL opaque so we need to be more aggressive in checking whether a user means to unregister. Also fix a double free caused by tag not being reset to zero after delete. Signed-off-by: Anthony Liguori --- iohandler.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/iohandler.c b/iohandler.c index 5ef66fb..4cc1c5a 100644 --- a/iohandler.c +++ b/iohandler.c @@ -93,10 +93,6 @@ static gboolean fd_trampoline(GIOChannel *chan, GIOCondition cond, gpointer opaq { IOTrampoline *tramp = opaque; - if (tramp->opaque == NULL) { - return FALSE; - } - if ((cond & G_IO_IN) && tramp->fd_read) { tramp->fd_read(tramp->opaque); } @@ -119,9 +115,10 @@ int qemu_set_fd_handler(int fd, if (tramp->tag != 0) { g_io_channel_unref(tramp->chan); g_source_remove(tramp->tag); + tramp->tag = 0; } - if (opaque) { + if (fd_read || fd_write || opaque) { GIOCondition cond = 0; tramp->fd_read = fd_read;