From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8718EC28CC0 for ; Thu, 30 May 2019 03:20:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 572FE24958 for ; Thu, 30 May 2019 03:20:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186443; bh=mJ3WEGFWJdMmxHdtIJV7q75kzWy9rOu8DeMkV6y1NIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yf1duXyC/KMBYA9nxqMIoEqGi7YbG/sRgE6NmDK7czWIJLntoY5ddniIMfoxIXvXS kZaQtEFxkkwS5oK+BzAcMRL4KAfCvyuCYFOtyWzns7M8ZjOI/OCG18W4uFUs03E1/p hbIaB7+0On4Wgy3K0VNo0G+WYtu8jkit/9whdZnE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732297AbfE3DUm (ORCPT ); Wed, 29 May 2019 23:20:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:59426 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732289AbfE3DUl (ORCPT ); Wed, 29 May 2019 23:20:41 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5D5AA24934; Thu, 30 May 2019 03:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186441; bh=mJ3WEGFWJdMmxHdtIJV7q75kzWy9rOu8DeMkV6y1NIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bHmeseG9+iF/MxIp6XcI0+ABBpYDak1ujqULuha5T58jIobcuWmd5Xg1/SSNwwswT M+BEFJMzVMsn5US+CroB1O86zzs3Jqa/hvYzlKC0YvMKuZkU5THeM8sVkl1O32rdTn MGJ1aTIMqnkRte0nPFG9Zwhqjla4/ZVhBzhFSyEg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Himanshu Madhani , Giridhar Malavali , Bart Van Assche , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.9 036/128] scsi: qla2xxx: Fix a qla24xx_enable_msix() error path Date: Wed, 29 May 2019 20:06:08 -0700 Message-Id: <20190530030440.746493565@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030432.977908967@linuxfoundation.org> References: <20190530030432.977908967@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 24afabdbd0b3553963a2bbf465895492b14d1107 ] Make sure that the allocated interrupts are freed if allocating memory for the msix_entries array fails. Cc: Himanshu Madhani Cc: Giridhar Malavali Signed-off-by: Bart Van Assche Acked-by: Himanshu Madhani Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qla2xxx/qla_isr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 73c99f237b10c..f0fcff032f8ac 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -3089,7 +3089,7 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) ql_log(ql_log_fatal, vha, 0x00c8, "Failed to allocate memory for ha->msix_entries.\n"); ret = -ENOMEM; - goto msix_out; + goto free_irqs; } ha->flags.msix_enabled = 1; @@ -3177,6 +3177,10 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) msix_out: kfree(entries); return ret; + +free_irqs: + pci_free_irq_vectors(ha->pdev); + goto msix_out; } int -- 2.20.1