From patchwork Wed Jun 18 13:26:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 361477 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2E5C714007D for ; Wed, 18 Jun 2014 23:29:46 +1000 (EST) Received: from localhost ([::1]:57307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxFvs-0005kL-CB for incoming@patchwork.ozlabs.org; Wed, 18 Jun 2014 09:29:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxFtS-0002Ls-FE for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:27:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxFtM-00020k-QA for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:27:14 -0400 Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]:46462) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxFtM-00020Y-Bg for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:27:08 -0400 Received: by mail-wi0-f172.google.com with SMTP id hi2so7629248wib.11 for ; Wed, 18 Jun 2014 06:27:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=sdycyB+ulHGvRo24Q2Si3oNWsGiUZTKE5SapXZZzcdE=; b=0/IjBT1nHu34KaXrQuv3EdE4M1ARog0q5rk2R11aYpQd5X+s7cawuQcFqb3xE1oxBT hrnXnlSJVF2E+jOeV438pXgVg+YxEQsuOYkPx5h7RQp2ojPJEsYijvmb08UVcG0vKeDy 1Y2FsVUuzz7MYzR4R8YgbmJs/fS8fiQ9oOOCJcsL/wdIGUG3s0hjAVAz8FaUrYL4JldT 4OQ70Bwww/J4zHV7VZxEDmMVs9PgAJt7uku6YM9850wJLarwKQwvhmZB9aP5ewDYzG3I fPZhP8ysAMy7gvTemjyBhTrDGq32uek2osXgitoqIx1WCHuaFSRL5X2ubc6FJJHQdH8P eECA== X-Received: by 10.194.7.36 with SMTP id g4mr48278650wja.37.1403098027593; Wed, 18 Jun 2014 06:27:07 -0700 (PDT) Received: from yakj.station (net-37-117-140-88.cust.vodafonedsl.it. [37.117.140.88]) by mx.google.com with ESMTPSA id l5sm3853238wif.22.2014.06.18.06.27.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2014 06:27:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 18 Jun 2014 15:26:42 +0200 Message-Id: <1403098014-1522-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403098014-1522-1-git-send-email-pbonzini@redhat.com> References: <1403098014-1522-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22c Cc: Peter Lieven Subject: [Qemu-devel] [PULL 02/14] block/iscsi: fix potential segfault on early callback 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 From: Peter Lieven it might happen in the future that a function directly invokes its callback. In this case we end up in a segfault because the iTask is gone when the BH is scheduled. Signed-off-by: Peter Lieven Signed-off-by: Paolo Bonzini --- block/iscsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index e64659f..09485fe 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -144,6 +144,7 @@ iscsi_schedule_bh(IscsiAIOCB *acb) static void iscsi_co_generic_bh_cb(void *opaque) { struct IscsiTask *iTask = opaque; + iTask->complete = 1; qemu_bh_delete(iTask->bh); qemu_coroutine_enter(iTask->co, NULL); } @@ -151,6 +152,7 @@ static void iscsi_co_generic_bh_cb(void *opaque) static void iscsi_retry_timer_expired(void *opaque) { struct IscsiTask *iTask = opaque; + iTask->complete = 1; if (iTask->co) { qemu_coroutine_enter(iTask->co, NULL); } @@ -168,7 +170,6 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, struct IscsiTask *iTask = opaque; struct scsi_task *task = command_data; - iTask->complete = 1; iTask->status = status; iTask->do_retry = 0; iTask->task = task; @@ -205,6 +206,8 @@ out: iTask->bh = aio_bh_new(iTask->iscsilun->aio_context, iscsi_co_generic_bh_cb, iTask); qemu_bh_schedule(iTask->bh); + } else { + iTask->complete = 1; } }