From patchwork Fri Jun 2 04:07:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 9761547 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 CD43E60363 for ; Fri, 2 Jun 2017 04:08:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFA5B28563 for ; Fri, 2 Jun 2017 04:08:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B329328579; Fri, 2 Jun 2017 04:08:01 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5709D28563 for ; Fri, 2 Jun 2017 04:08:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751189AbdFBEH6 (ORCPT ); Fri, 2 Jun 2017 00:07:58 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:34734 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751164AbdFBEHy (ORCPT ); Fri, 2 Jun 2017 00:07:54 -0400 Received: by mail-qt0-f194.google.com with SMTP id o21so106869qtb.1 for ; Thu, 01 Jun 2017 21:07:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=q6c+qpFTrTQs7v9d+dpgl/YtQ3lsE4vwiR+INj6oe+4=; b=BE9BGVoy5wX27sZYP8jZ3lwj537I7l1NwXaBLGCfVDwTuPY+nEassBvqAgQSVhJpiE BxvjKxdQNeNjerrqaRQhqZ9yd9CZegve6HnvdT0WSt+Pfa6d++J8Mpb/TYzIM/XDydHA xsTy9zGn+/PReOzBv1mU/4x+B/R9KE2eXjtiaoDQiMyI4kCiLY4Rz79Wl9t945moDxCg dtJQWwWfqtB2dhMXzha8TMRM9CVvRje0SkeXvApN9YJChkK3n4rrFtnbhcgbRT3x1DFT brE1vIlndRvf/GKX5mqE63hLfKhspmLQHMlLupzbvaiyghw8kar1PhTLN2Y8QUmXO9XA weAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=q6c+qpFTrTQs7v9d+dpgl/YtQ3lsE4vwiR+INj6oe+4=; b=OV/TBA4sgbX/IscwCJfRaYPYgSijxzerRV9VmpjOvymcDPwhaV088ufJK8xanHinNb Xx9bBFqTTHHqXxD70KzIg3b21/+hqi0A9cWg3f6+frrcgsbe5Q82vm4uVNAyL09lykgE Chr5Y8ufieRfVNBoDq7QjHKPnqpD6nQ1eD1HyRj01YIW926It3LYDMMjxF7+IpThXyWl JL8yHvfqyOx5VLp0wv6y1DDMZA+XvUAViKNSqLhFLmtuk47LvbT3whdonyOQDiUScgLu XpZF0WKEzHVke+fvdnajiqq5/rH4o016OURYj0djyh1Sa2nRkt/GQ65WAIyG4iO5CnjG eV+g== X-Gm-Message-State: AODbwcC9cSPGnhczm4apE0ZpKmvRwJkUgHQqxF4fekzXZtTNnNyZWmIw E/8VffF0O/UDDBrp X-Received: by 10.200.36.15 with SMTP id c15mr6656490qtc.124.1496376473470; Thu, 01 Jun 2017 21:07:53 -0700 (PDT) Received: from localhost.localdomain ([192.19.224.250]) by smtp.gmail.com with ESMTPSA id x27sm14180802qtb.54.2017.06.01.21.07.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Jun 2017 21:07:51 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , Dick Kennedy , James Smart Subject: [PATCH v2 10/17] lpfc: Fix crash on powering off BFS VM with passthrough device Date: Thu, 1 Jun 2017 21:07:04 -0700 Message-Id: <20170602040711.21046-11-jsmart2021@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170602040711.21046-1-jsmart2021@gmail.com> References: <20170602040711.21046-1-jsmart2021@gmail.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Null pointer dereference when BFS VM is powered off The driver incorrectly uses sli3_ring on SLI-4 adapters Use the correct ring structure based on sli_rev Signed-off-by: Dick Kennedy Signed-off-by: James Smart Tested-by: Raphael Silva --- drivers/scsi/lpfc/lpfc_sli.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index e81fa7d4deb5..c4ceef69bd6b 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -10951,6 +10951,7 @@ lpfc_sli_abort_iocb(struct lpfc_vport *vport, struct lpfc_sli_ring *pring, struct lpfc_hba *phba = vport->phba; struct lpfc_iocbq *iocbq; struct lpfc_iocbq *abtsiocb; + struct lpfc_sli_ring *pring_s4; IOCB_t *cmd = NULL; int errcnt = 0, ret_val = 0; int i; @@ -11004,8 +11005,15 @@ lpfc_sli_abort_iocb(struct lpfc_vport *vport, struct lpfc_sli_ring *pring, /* Setup callback routine and issue the command. */ abtsiocb->iocb_cmpl = lpfc_sli_abort_fcp_cmpl; - ret_val = lpfc_sli_issue_iocb(phba, pring->ringno, - abtsiocb, 0); + if (phba->sli_rev == LPFC_SLI_REV4) { + pring_s4 = lpfc_sli4_calc_ring(phba, iocbq); + if (!pring_s4) + continue; + ret_val = lpfc_sli_issue_iocb(phba, pring_s4->ringno, + abtsiocb, 0); + } else + ret_val = lpfc_sli_issue_iocb(phba, pring->ringno, + abtsiocb, 0); if (ret_val == IOCB_ERROR) { lpfc_sli_release_iocbq(phba, abtsiocb); errcnt++;