From patchwork Wed May 10 11:13:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 9719685 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9240660365 for ; Wed, 10 May 2017 11:15:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B1D227F88 for ; Wed, 10 May 2017 11:15:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D6702857B; Wed, 10 May 2017 11:15:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A376B27F88 for ; Wed, 10 May 2017 11:14:58 +0000 (UTC) Received: from localhost ([::1]:41856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8Pa5-0003NB-Qp for patchwork-qemu-devel@patchwork.kernel.org; Wed, 10 May 2017 07:14:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8PZK-0003L5-FZ for qemu-devel@nongnu.org; Wed, 10 May 2017 07:14:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8PZG-0004yb-3T for qemu-devel@nongnu.org; Wed, 10 May 2017 07:14:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44592) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d8PZF-0004yQ-T8 for qemu-devel@nongnu.org; Wed, 10 May 2017 07:14:06 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AB43361D1D; Wed, 10 May 2017 11:14:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AB43361D1D Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ppandit@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com AB43361D1D Received: from localhost.localdomain (ovpn-116-2.gru2.redhat.com [10.97.116.2]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E98B98ACEF; Wed, 10 May 2017 11:13:58 +0000 (UTC) From: P J P To: Qemu Developers Date: Wed, 10 May 2017 16:43:50 +0530 Message-Id: <20170510111350.18422-1-ppandit@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 10 May 2017 11:14:04 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] scsi: megasas: check request object in MegasasCmd 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: Paolo Bonzini , Zhangyanyu , Prasad J Pandit Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Prasad J Pandit When processing completed commands, if SCSIRequest object 'cmd->req' was null, it could lead to null pointer dereference in megasas_complete_command. Add check to avoid it. Reported-by: Zhangyanyu Signed-off-by: Prasad J Pandit --- hw/scsi/megasas.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 84b8caf..25e3541 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -580,9 +580,11 @@ static void megasas_complete_command(MegasasCmd *cmd) cmd->iov_size = 0; cmd->iov_offset = 0; - cmd->req->hba_private = NULL; - scsi_req_unref(cmd->req); - cmd->req = NULL; + if (cmd->req) { + cmd->req->hba_private = NULL; + scsi_req_unref(cmd->req); + cmd->req = NULL; + } megasas_unmap_frame(cmd->state, cmd); megasas_complete_frame(cmd->state, cmd->context);