From patchwork Thu Aug 11 18:35:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 9275761 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 5CEAC6022E for ; Thu, 11 Aug 2016 18:36:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FB0D28775 for ; Thu, 11 Aug 2016 18:36:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 44BEF28777; Thu, 11 Aug 2016 18:36:09 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 E004D28775 for ; Thu, 11 Aug 2016 18:36:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752279AbcHKSgH (ORCPT ); Thu, 11 Aug 2016 14:36:07 -0400 Received: from mail-qk0-f177.google.com ([209.85.220.177]:33533 "EHLO mail-qk0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751652AbcHKSgC (ORCPT ); Thu, 11 Aug 2016 14:36:02 -0400 Received: by mail-qk0-f177.google.com with SMTP id t7so4361533qkh.0 for ; Thu, 11 Aug 2016 11:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=date:from:to:subject:message-id:user-agent:mime-version :content-transfer-encoding; bh=u24KUekRl8TLcvPBTQgKRjyKMeODlQTG9n2B7ZrW9o0=; b=Siis6jcMSh8tSNv48QeIuHlQ8nZGXX17K28Vxi8zkK3Erc5p3sTvtR5mVsUXyFU7Se cNFisajHHJaIfc7jgpBVs3uk0D+jjOPf4UoR9RSua/FcgX7ng/wZbmmGZCvKhLgEQcj0 NXQep8MFTtJmJ7AHdY3uyIYrMecWgohAk73/g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:user-agent :mime-version:content-transfer-encoding; bh=u24KUekRl8TLcvPBTQgKRjyKMeODlQTG9n2B7ZrW9o0=; b=OH53MK1y6LE6KbMSffWr7tVP4Zs/5fooSuemaSv1toQntg4WpL11vRkclJ/GCaoVDB v0eA5nEZ0PAKhH8ZWKza6VkvKYJCY50KcotRL67VTJ8EhjJg6QvMJKL0V5GvPaM+IuSC AOYRsjgGAui03J7wjOWgTui5huoxgFohd5u9jvYxG/cxg+zJ8BLAhONGD5mG0vd+B+mv LyD1CwMshHi4R2BRdfwRbaAOY8ASES8Nh3A95H+G/SK+05RF1jePqWu1Q5LMegVHmW21 Jx/gRthESaA/FZK56f1nza6gWvTnrU5Bqk0K9Tug4l0AUS1iy1ANrgv7P7K6SSVUQGB4 gTSQ== X-Gm-Message-State: AEkoouuj0sWyq1CzAH/nXLQbMwFj9q7t93TD53waqt+6RP9WpgJpknU17AR2dCkdV8Ot5eZV X-Received: by 10.55.131.198 with SMTP id f189mr13485625qkd.137.1470940560505; Thu, 11 Aug 2016 11:36:00 -0700 (PDT) Received: from flash ([192.19.245.250]) by smtp.gmail.com with ESMTPSA id w185sm955659qkd.23.2016.08.11.11.35.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Aug 2016 11:36:00 -0700 (PDT) Date: Thu, 11 Aug 2016 11:35:58 -0700 From: james.smart@broadcom.com (James Smart) To: linux-scsi@vger.kernel.org Subject: [PATCH 11/14] lpfc: Fix crash on adapter reinit Message-ID: <57acc58e.tA8AOPGQuf/YmboW%james.smart@broadcom.com> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 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 Fix crash on adapter reinit Had unset fields passed to pci_pool_destroy() on teardown. Signed-off-by: Dick Kennedy Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_mem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c index 3fa6533..62b295d 100644 --- a/drivers/scsi/lpfc/lpfc_mem.c +++ b/drivers/scsi/lpfc/lpfc_mem.c @@ -254,11 +254,13 @@ lpfc_mem_free(struct lpfc_hba *phba) pool->elements[i].phys); kfree(pool->elements); - pci_pool_destroy(phba->lpfc_mbuf_pool); + if (phba->lpfc_mbuf_pool) + pci_pool_destroy(phba->lpfc_mbuf_pool); phba->lpfc_mbuf_pool = NULL; /* Free DMA buffer memory pool */ - pci_pool_destroy(phba->lpfc_scsi_dma_buf_pool); + if (phba->lpfc_scsi_dma_buf_pool) + pci_pool_destroy(phba->lpfc_scsi_dma_buf_pool); phba->lpfc_scsi_dma_buf_pool = NULL; /* Free Device Data memory pool */