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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 ED9A4C282CE for ; Wed, 22 May 2019 19:56:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1EA720856 for ; Wed, 22 May 2019 19:56:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558554989; bh=ETLlPykd7qdit+Y5rPiKSeeToPSyuaGOPQXuntGT5pY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uhO9UaeNGyPwwqs+VPQG9edIxsnYOhiIcoJ82ZzjeAUUm3/zPlCAbk6dbyFIMtZNT sRo/HP7SGUq+SviLAW9caH0kuoGQ7AkT0e94yFBOUbUH1SemhWwmrzW3pkk+UC/kMQ oHrYG1THAOwkdAfwbGqg8nZpasxHPK4cW0VhFg6w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731452AbfEVTY4 (ORCPT ); Wed, 22 May 2019 15:24:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:46180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730713AbfEVTYz (ORCPT ); Wed, 22 May 2019 15:24:55 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1550D217D7; Wed, 22 May 2019 19:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558553094; bh=ETLlPykd7qdit+Y5rPiKSeeToPSyuaGOPQXuntGT5pY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UrRNLFUkHoHoXms9fUGpP1RXG0h2LRXgp3F1+yuIZ8Hwd6gTvn1ec5LPW9l5PbAbL CsZ8wVEhE5TXiQj+Kz8ZiTqndHR92rrOYu1opG1I9qX/krdSlB2hHBVynlF17P1UNS tEi+ZvFqG39/NKAxvcqXewrVgMhQXzY7G6LcZR8Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bart Van Assche , Himanshu Madhani , Giridhar Malavali , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.0 044/317] scsi: qla2xxx: Fix a qla24xx_enable_msix() error path Date: Wed, 22 May 2019 15:19:05 -0400 Message-Id: <20190522192338.23715-44-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522192338.23715-1-sashal@kernel.org> References: <20190522192338.23715-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bart Van Assche [ 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 1a20e5d8f0575..51df171b32ed3 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -3454,7 +3454,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; @@ -3537,6 +3537,10 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) msix_out: return ret; + +free_irqs: + pci_free_irq_vectors(ha->pdev); + goto msix_out; } int -- 2.20.1