From patchwork Wed Apr 17 21:44:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 10906221 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6CA8E17E0 for ; Wed, 17 Apr 2019 21:45:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5867E28BA9 for ; Wed, 17 Apr 2019 21:45:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CEB528BAB; Wed, 17 Apr 2019 21:45:17 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 6F11528BA9 for ; Wed, 17 Apr 2019 21:45:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387933AbfDQVpO (ORCPT ); Wed, 17 Apr 2019 17:45:14 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:36384 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387930AbfDQVpN (ORCPT ); Wed, 17 Apr 2019 17:45:13 -0400 Received: by mail-pf1-f194.google.com with SMTP id z5so85793pfn.3 for ; Wed, 17 Apr 2019 14:45:13 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=XKaokxoVqlt5goo8vGv5KMc+20acV1pgBEpTlqDpgRM=; b=qEomINi7eSqaXz0rll0obj4miHPx5XuqnyFrNMZp831zZBzE7uQetlaLzsQnIILod2 kQvWJTMlXmTV6DSqViJkfYsA1+NTaRJ5opKzcphH4+5xHw1z2VuOb6KYC2SUr/Rc9b18 Zff6M9wUmZBVze5Zlms8Llm3HhLYq3crIn9l9SOnp1KKh6Bmq8uxrUitJgCtZlxKGQw2 s1mmhrkxvMEYyv99HQnD5mudaWNVSHy1bUri78gnJXvPwCqkk7QIJrnLT4qnJn2nFiRd s0MBdUnoOAZMwq6M4+3ufiGi7WMSCDYhEynah6Kp+A7Trp5Lltv7oBJLVOmvycdLOS2A QZ7Q== X-Gm-Message-State: APjAAAUt7f2vNPBYnjXQM7KCfMjIusmrVMvynbWQr15r52gFEp24Dm+0 XrM6ZYCjGl3XbJmOeFlzs8Y= X-Google-Smtp-Source: APXvYqxOIvk43Knm9yqIs+lkf4HHF/J+QzzQtauiGZY2f4lonQKzACsjWcJYcEfDvvc8tbcSrrfmmg== X-Received: by 2002:a63:5b24:: with SMTP id p36mr40394975pgb.84.1555537512743; Wed, 17 Apr 2019 14:45:12 -0700 (PDT) Received: from desktop-bart.svl.corp.google.com ([2620:15c:2cd:203:5cdc:422c:7b28:ebb5]) by smtp.gmail.com with ESMTPSA id d68sm219314pfg.16.2019.04.17.14.45.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2019 14:45:11 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" , "James E . J . Bottomley" Cc: linux-scsi@vger.kernel.org, Christoph Hellwig , Bart Van Assche , Himanshu Madhani , Giridhar Malavali Subject: [PATCH 15/34] qla2xxx: Fix a qla24xx_enable_msix() error path Date: Wed, 17 Apr 2019 14:44:24 -0700 Message-Id: <20190417214443.243152-16-bvanassche@acm.org> X-Mailer: git-send-email 2.20.GIT In-Reply-To: <20190417214443.243152-1-bvanassche@acm.org> References: <20190417214443.243152-1-bvanassche@acm.org> 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 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 --- 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 b781e8a47f43..b015b405fdd9 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -3499,7 +3499,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; @@ -3582,6 +3582,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