Re: [PATCH net v2] net: liquidio: fix BAR resource leak on PF number failure

[Larysa Zaremba]

On Wed, Jun 24, 2026 at 02:40:13PM +0800, Haoxiang Li wrote:
> 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@xxxxxxxxxxxxxxx
> Signed-off-by: Haoxiang Li <haoxiang_li2024@xxxxxxx>

Reviewed-by: Larysa Zaremba <larysa.zaremba@xxxxxxxxx>

> ---
> Changes in v2:
>  - Modify the commit message.
>  - Introduce goto unwind path to do the cleanup. Thanks, Simon!
> ---
>  .../cavium/liquidio/cn23xx_pf_device.c         | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
> index 75f22f74774c..06b4424e778e 100644
> --- 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 octeon_device *oct)
>  	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 octeon_device *oct)
>  	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);
>  
> -- 
> 2.25.1
> 
>