netdev - Re: [PATCH net 1/3] stmmac: dwmac-loongson: fix missing pci_disable

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Tue, 08 Nov 2022 11:50:41 +0100
From:   Paolo Abeni <pabeni@...hat.com>
To:     Yang Yingliang <yangyingliang@...wei.com>, netdev@...r.kernel.org
Cc:     peppe.cavallaro@...com, alexandre.torgue@...s.st.com,
        joabreu@...opsys.com, davem@...emloft.net, jiaxun.yang@...goat.com,
        zhangqing@...ngson.cn, liupeibao@...ngson.cn, andrew@...n.ch,
        kuba@...nel.org
Subject: Re: [PATCH net 1/3] stmmac: dwmac-loongson: fix missing
 pci_disable_msi() while module exiting

Hello,

On Sat, 2022-11-05 at 20:18 +0800, Yang Yingliang wrote:
> pci_enable_msi() has been called in loongson_dwmac_probe(),
> so pci_disable_msi() needs be called in remove path and error
> path of probe().
> 
> Fixes: 30bba69d7db4 ("stmmac: pci: Add dwmac support for Loongson")
> Signed-off-by: Yang Yingliang <yangyingliang@...wei.com>
> ---
>  drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
> index 79fa7870563b..dd292e71687b 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
> @@ -139,7 +139,15 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
>  		ret = -ENODEV;
>  	}
>  
> -	return stmmac_dvr_probe(&pdev->dev, plat, &res);
> +	ret = stmmac_dvr_probe(&pdev->dev, plat, &res);
> +	if (ret)
> +		goto err_disable_msi;
> +
> +	return ret;
> +
> +err_disable_msi:
> +	pci_disable_msi(pdev);
> +	return ret;
>  }

It looks like this patch is missing a couple of error paths, still
after pci_enable_msi(), which need 'goto err_disable_msi', too:

https://elixir.bootlin.com/linux/v6.1-rc4/source/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c#L127
https://elixir.bootlin.com/linux/v6.1-rc4/source/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c#L139

Cheers,

Paolo