Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp3279784iob; Mon, 16 May 2022 18:00:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycBHm7OY3awg3Wk6pOfgorLi+715Vq4ZLjk2M8Rzeb9BCpzGRWOD3Ka5nSVteqjHpTxHiU X-Received: by 2002:a17:907:7ea9:b0:6f3:de9c:c6fb with SMTP id qb41-20020a1709077ea900b006f3de9cc6fbmr17769195ejc.304.1652749236863; Mon, 16 May 2022 18:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652749236; cv=none; d=google.com; s=arc-20160816; b=DJVb0l9+Bl0QZ2uPBW91hX0NkDSDrOgavORMzCTj+B4eICiy6HoN3ONocre1SZVoOp b9ZlysekTBL279T0vEDFVyNgZI2Y9jaZM38bDz7zZXjGmo2QqTUSs+NT81cP9+LlHH2F z3M81gfp08HmehOOY1tXvgaC53A0nB2770xssY0+dF/a185VtvFS9A26cipPbOQNELCY tGO9aEpy2vKcpqHDV8HBgYQBaMbVluW+oG1r1ey5yNrNIJtvwm+SYs26r3oQmS92RsZt elscIhM0II5yJDr3SByTgp3hizo6YHgW3sq61HLNC76IkDVHpLHS0pPzP8YRDDWVYS8k OzZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zvJp5J5EXAaqv32ErXjOEUXhGbpNvyF8PMA9j4WI5i4=; b=ZTp5XHmXZYSAqXQGFzOw3Df+BD0wqMRw041tBcBOFZjc4bJL0fwRt6f432sogtu1nZ NBRTAHfnaU6/J+8nt0xB4QyQbRYY+M7qrYW1Pd+Vt1yTNPmdq5gAiYUjLAIG2bymkCm3 NfX5LhxmPp6Zk1WA3xm62MdA4vDQQngzGWWpYYkCM0yw1DetkAjyvyx+hJ1Pg7ma3Rwr nriYe9LZhRp90uxlNCCtEA55v52BUvFLmLjcFfbf8iTJjyEJe651Hmc1q94gTtfhbES7 Rv03bLMpm0pkBZYjrg9ZsMfoCEGiR/9rvG8ahs3L6UBTSxkphYB5ZhKwsiyHkaStpI7p 0M2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Cq9INTqZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g12-20020a1709065d0c00b006f2724540cbsi1285770ejt.417.2022.05.16.18.00.10; Mon, 16 May 2022 18:00:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Cq9INTqZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348707AbiEPT6s (ORCPT + 99 others); Mon, 16 May 2022 15:58:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348563AbiEPTwz (ORCPT ); Mon, 16 May 2022 15:52:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C21246148; Mon, 16 May 2022 12:48:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1904F60BAD; Mon, 16 May 2022 19:48:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1C62C385AA; Mon, 16 May 2022 19:48:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1652730519; bh=p6ago/YST1g5eL3V30HoLhU7ZufykKWvRgnn7qiaM9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cq9INTqZGJ8J5Zoit1Y1dL8NAbC+vHfYMBgXzT28RsQjbGw7yEC8m9usCM58XTwNy RRcIZDKQDCOLlGh31XU/Czci4bjSjL/2h6ged7CaV7IqNgiRL3j0oyOa29Ktogxl9v /019QXkJ8f+leNaiEGhfeX4XEB3whior189uXVs8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yang Yingliang , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 025/102] ionic: fix missing pci_release_regions() on error in ionic_probe() Date: Mon, 16 May 2022 21:35:59 +0200 Message-Id: <20220516193624.722496486@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220516193623.989270214@linuxfoundation.org> References: <20220516193623.989270214@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yang Yingliang [ Upstream commit e4b1045bf9cfec6f70ac6d3783be06c3a88dcb25 ] If ionic_map_bars() fails, pci_release_regions() need be called. Fixes: fbfb8031533c ("ionic: Add hardware init and device commands") Signed-off-by: Yang Yingliang Link: https://lore.kernel.org/r/20220506034040.2614129-1-yangyingliang@huawei.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c index 40fa5bce2ac2..d324c292318b 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c @@ -255,7 +255,7 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err = ionic_map_bars(ionic); if (err) - goto err_out_pci_disable_device; + goto err_out_pci_release_regions; /* Configure the device */ err = ionic_setup(ionic); @@ -359,6 +359,7 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err_out_unmap_bars: ionic_unmap_bars(ionic); +err_out_pci_release_regions: pci_release_regions(pdev); err_out_pci_disable_device: pci_disable_device(pdev); -- 2.35.1