From patchwork Mon Aug 3 12:19:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 266885 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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 2F711C433E1 for ; Mon, 3 Aug 2020 12:32:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 04A322076E for ; Mon, 3 Aug 2020 12:32:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596457942; bh=V7Inx25FIvEikDAopzfi5kQvEeEprUMdU4v0oZ/86O0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HPoT4/binDJnOjqe216KhPaUVwJFrA+032ZvNF4TKJzJ0mqS7kIYvw8+1x+gNuLbU mrI1nBMBT2TjbiknN3UT7Lpt9LKPGvqFnK9upvroyIIk7FCYplLtiuZd5hNhUXqanO 09s5+mb7Fiy41AkxqQyi60DSJpZRfPTowuH/R2mI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729298AbgHCMcU (ORCPT ); Mon, 3 Aug 2020 08:32:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:60198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729296AbgHCMcU (ORCPT ); Mon, 3 Aug 2020 08:32:20 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 C37012054F; Mon, 3 Aug 2020 12:32:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596457939; bh=V7Inx25FIvEikDAopzfi5kQvEeEprUMdU4v0oZ/86O0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RFu34zHQ98/vKCJlze06+22CBtnXjsoYHmZzsBrDc5XQE+RVyD2PQkz3fCR78gXi1 VeAXNEQUy2R69t84SIP3Te5CMPfQSpv2cLOZeaIAx45zQoGtZdW8YIdVJLNA9NOw0l BchttlkJOJxVagG5aAtrGHc5QuthluY5KRlo5vCs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Falcon , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 37/56] ibmvnic: Fix IRQ mapping disposal in error path Date: Mon, 3 Aug 2020 14:19:52 +0200 Message-Id: <20200803121852.140146290@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200803121850.306734207@linuxfoundation.org> References: <20200803121850.306734207@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thomas Falcon [ Upstream commit 27a2145d6f826d1fad9de06ac541b1016ced3427 ] RX queue IRQ mappings are disposed in both the TX IRQ and RX IRQ error paths. Fix this and dispose of TX IRQ mappings correctly in case of an error. Fixes: ea22d51a7831 ("ibmvnic: simplify and improve driver probe function") Signed-off-by: Thomas Falcon Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 5e9e45befc875..d8115a9333e05 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -2926,7 +2926,7 @@ req_rx_irq_failed: req_tx_irq_failed: for (j = 0; j < i; j++) { free_irq(adapter->tx_scrq[j]->irq, adapter->tx_scrq[j]); - irq_dispose_mapping(adapter->rx_scrq[j]->irq); + irq_dispose_mapping(adapter->tx_scrq[j]->irq); } release_sub_crqs(adapter, 1); return rc;