From patchwork Fri Jan 12 11:31:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 859827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mzCL/kNh"; dkim-atps=neutral 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 3zJ1qN6wkcz9sNw for ; Fri, 12 Jan 2018 23:13:20 +1100 (AEDT) Received: from localhost ([::1]:36338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZyD1-00034D-1y for incoming@patchwork.ozlabs.org; Fri, 12 Jan 2018 07:13:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZxZN-00082t-LQ for qemu-devel@nongnu.org; Fri, 12 Jan 2018 06:32:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZxZK-00063f-09 for qemu-devel@nongnu.org; Fri, 12 Jan 2018 06:32:21 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:44059) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eZxZJ-000636-Pz for qemu-devel@nongnu.org; Fri, 12 Jan 2018 06:32:17 -0500 Received: by mail-wr0-x241.google.com with SMTP id w50so5008647wrc.11 for ; Fri, 12 Jan 2018 03:32:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=033LkzDn7bO2+4XP5OOr0CJLAPcCHZ4nUls9z7Z3jVw=; b=mzCL/kNh2fPIKDj8EgOD/vNBTtInCvUcT18lEShbyjLbGdzWDQZHr/WErwlMJ5Qls+ nVOUL8E4+Ky9Er0eqS2SKzBvLQ0Ss3Hh5LlBQ+ofATIFV+oXpvIb4uHECx6ZNn2CQhtQ GlpbZubSZeBwCTyEHr5BUDCVWR5yhY0vN5lhE4uM+TlIlf2OwOT4W3s4guMYSHmzqrnV FfOWPLEgTa9Hss6VkUoEJAN1dH95J1EeaFdB1uRc7LzMQ52+sHoqChWU7v0L/t1n90Jo xPwmkO/sxp1j/utd3tIbwImATq/bCBH8MoDknEFXyZkrYCEQMLRQWhFI3uU0PDWps0Nl UF1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=033LkzDn7bO2+4XP5OOr0CJLAPcCHZ4nUls9z7Z3jVw=; b=oYSt9qCP8KDcY9Dgh0/vHbumCHsmhSqrXvtqCIJ0w0VH3lv11cz8KsL97fOsy3ywKT aT2LCZsHXdG8fK6fSd81pfI3jx8cf06l+bFCfE/oQkg5SLzJvuq53hMRdr4Ctk3FONGl KFoKznPNmyBkEI2VS9isNTqz8WWJm2tqn2crF3+6ekevkgQkRaVkq0I2IqkTclcW4RaZ c9efOZYAA5WZ6iRlxCZAOSv2gL8K8kTuFCHDoHihNPa6GVzAjPn8mU4845XZqNBGHMW8 kNZN7QsrL2YS2RvyEM/9F3+wIQzBclQAXumAe5l2D+buUlt7YVwSFTVMCjogSJFdPM5F 6Oxw== X-Gm-Message-State: AKwxyteDvU337Up/gN4FQomQ8snXF5UatdZTsmXJsnv1C3dukMIXP7/e ZZtW+4L0huufaPW+I92hn9tzksD5 X-Google-Smtp-Source: ACJfBotuoXMmND1iF1ypZLMLAaEDvp0NMsSp/Scd4/0E0A7/e/k2CJCc/8XEgqXCeTr5CAqv0COcZw== X-Received: by 10.223.185.124 with SMTP id b57mr10501089wrg.13.1515756736371; Fri, 12 Jan 2018 03:32:16 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-229-84.clienti.tiscali.it. [78.12.229.84]) by smtp.gmail.com with ESMTPSA id l8sm2732271wmg.46.2018.01.12.03.32.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 03:32:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 12 Jan 2018 12:31:13 +0100 Message-Id: <1515756676-3860-50-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1515756676-3860-1-git-send-email-pbonzini@redhat.com> References: <1515756676-3860-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 49/52] block/iscsi: fix initialization of iTask in iscsi_co_get_block_status X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Lieven Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Peter Lieven in case of unaligned requests or on a target that does not support block provisioning we leave iTask uninitialized and check iTask.task for NULL later. Fixes: e38bc23454ef763deb4405ebdee6a1081aa00bc8 Signed-off-by: Peter Lieven Reviewed-by: Eric Blake Message-Id: <1515425247-21730-1-git-send-email-pl@kamp.de> Signed-off-by: Paolo Bonzini --- block/iscsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index 5c0a9e5..6a1c537 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -658,6 +658,8 @@ static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs, uint64_t lba; int64_t ret; + iscsi_co_init_iscsitask(iscsilun, &iTask); + if (!is_sector_request_lun_aligned(sector_num, nb_sectors, iscsilun)) { ret = -EINVAL; goto out; @@ -675,7 +677,6 @@ static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs, lba = sector_qemu2lun(sector_num, iscsilun); - iscsi_co_init_iscsitask(iscsilun, &iTask); qemu_mutex_lock(&iscsilun->mutex); retry: if (iscsi_get_lba_status_task(iscsilun->iscsi, iscsilun->lun,