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 ACEB038910F; Tue, 21 Jul 2026 18:40:10 +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=1784659211; cv=none; b=fpNuaUmGz9G7Jwj50OuR6wwGaML1EsuDbs++ctZkh0cVRHf/l+6AvPq2Ja/ZBKzbSBuxgSbIb47q4vCljnyUcgvK3AmQyAQ92M9kW2HLQMlxod3UkalkI2XTVYNT/mIbSlLOAHHpfvP8xwwQa7L80cNG5LZbawyKGdnpFi3MhhE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784659211; c=relaxed/simple; bh=tZ1nTV/RlIHNJ90RXm+X8TQDSDwQut8+/yoIaFdNrM4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bpBjC/KWyoKLpS/AVYhEFL+nUTlTJJtqgVGH2YFSNISJeEr8qbwzA6GjdaID9ha7k8nhHZxafXOQR8DXU8mUuVeZUTaguCBHYQsGqMjDqk6b6igyBkaRFDhh9XrW8LKaD+jc7o8jVgVc9wNrc+WTWHmc8W30ephZ8rG4yxANSLQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y3E5dPGK; 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="Y3E5dPGK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19F551F000E9; Tue, 21 Jul 2026 18:40:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784659210; bh=dtGSpIpgnXfaBPxY7VAjYS87UOqlWE9ubTeM1Wjmf1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Y3E5dPGKfnN99+VpItoCdmu7PQxfPMJ3ywWL/eJMjgaVQ4SkO9C/YMcVwsEdHhKKM scsZHbULl8yBJbUy79wbaZIE7izz2ct+WTHIdNlSjcGIhvw53PcBPS3vlVoe13+8uU 06Jx1IYDiRsshr3/yCzed0dmf7ulkDi5puGLvAe8= 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.18 1433/1611] net: liquidio: fix BAR resource leak on PF number failure Date: Tue, 21 Jul 2026 17:25:49 +0200 Message-ID: <20260721152547.674578491@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@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.18-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 @@ -1163,18 +1163,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); @@ -1205,6 +1201,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);