Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A021470102; Tue, 21 Jul 2026 20:01:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784664097; cv=none; b=hugWDgsoxdkwgKHDDN1RSCRjuq72oRzuaxmsjKPG1aBvJz7T/bwLuYZr2nR5p5Rix4v6zK1RKKFSgJOOQKtBxTikXyxTjIjlqagTx67D8U1gUEk904ZE94TR4vOW8S9F7bM1vFiPq4QBbXLCuVe4FRXlx1RWJkRCoyjwREx+FXY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784664097; c=relaxed/simple; bh=ywTZ1qeoQZ9fRfgCCAQlk2Az1YZjfgYVObtfse+2Xl4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vq1U+J8JVvqq3dvY2xjEmaDiP94Cs1x5jScPqGMt39sIGC4qNhXNQpvenDpNhcnPI791ppBc1iCzsOc7/O/LpjapsLgaN8b/7Bp3g6sOsaneYBTnWvqbkOg8AAF7d/3OWW9EJJYp/SSn+EZ4VbpKybAR2cZ1sE/YCCvaJcMfF4Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FA1BprCu; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FA1BprCu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A27B51F00A3A; Tue, 21 Jul 2026 20:01:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784664096; bh=s9F7FS/OjHyhPpUzGOlyuyIdJZ/ub825kn1GPt+3TO4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FA1BprCu+3Ipwe7W32dTiJLE9mcpDHqPbXlkvgtCfTgQx3k6yQDAhUH2iNek7FQg0 5CY7up++vhkuq+ZDhoknb4H/0JXlFS+WUN4mhdUffbmu343Dl8nymysJpxVsMmlAyg +FZNwto08FHYh5cLda4M520bPPCYgeeJiM/+4ps4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Haoxiang Li , Larysa Zaremba , Jakub Kicinski Subject: [PATCH 6.12 1072/1276] net: liquidio: fix BAR resource leak on PF number failure Date: Tue, 21 Jul 2026 17:25:15 +0200 Message-ID: <20260721152509.976273465@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152446.065700225@linuxfoundation.org> References: <20260721152446.065700225@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haoxiang Li commit c63ee62a3c4ac1a1542f4c1a4b87e2f41df5a496 upstream. If cn23xx_get_pf_num() fails, the function returns without unmapping either BAR. Unmap both BARs before returning from the error path. Found by manual code review. Fixes: 0c45d7fe12c7 ("liquidio: fix use of pf in pass-through mode in a virtual machine") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Reviewed-by: Larysa Zaremba Link: https://patch.msgid.link/20260624064013.2809570-1-haoxiang_li2024@163.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c | 18 ++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) --- a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c +++ b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c @@ -1332,18 +1332,14 @@ int setup_cn23xx_octeon_pf_device(struct if (octeon_map_pci_barx(oct, 1, MAX_BAR1_IOREMAP_SIZE)) { dev_err(&oct->pci_dev->dev, "%s CN23XX BAR1 map failed\n", __func__); - octeon_unmap_pci_barx(oct, 0); - return 1; + goto err_unmap_bar0; } if (cn23xx_get_pf_num(oct) != 0) - return 1; + goto err_unmap_bar1; - if (cn23xx_sriov_config(oct)) { - octeon_unmap_pci_barx(oct, 0); - octeon_unmap_pci_barx(oct, 1); - return 1; - } + if (cn23xx_sriov_config(oct)) + goto err_unmap_bar1; octeon_write_csr64(oct, CN23XX_SLI_MAC_CREDIT_CNT, 0x3F802080802080ULL); @@ -1374,6 +1370,12 @@ int setup_cn23xx_octeon_pf_device(struct oct->coproc_clock_rate = 1000000ULL * cn23xx_coprocessor_clock(oct); return 0; + +err_unmap_bar1: + octeon_unmap_pci_barx(oct, 1); +err_unmap_bar0: + octeon_unmap_pci_barx(oct, 0); + return 1; } EXPORT_SYMBOL_GPL(setup_cn23xx_octeon_pf_device);