netdev - Re: [PATCH v2 14/15] ethernet: stmicro: stmmac: add missing of_node_put after calling of_parse

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] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 1 Aug 2016 09:37:24 +0200
From:	Alexandre Torgue <alexandre.torgue@...com>
To:	Peter Chen <peter.chen@....com>, <davem@...emloft.net>
CC:	<netdev@...r.kernel.org>, <vbridger@...nsource.altera.com>,
	<isubramanian@....com>, <kchudgar@....com>,
	<yisen.zhuang@...wei.com>, <salil.mehta@...wei.com>,
	<thomas.petazzoni@...e-electrons.com>,
	<sergei.shtylyov@...entembedded.com>, <peppe.cavallaro@...com>,
	<mugunthanvnm@...com>, <tremyfr@...il.com>, <wxt@...k-chips.com>,
	<arnd@...db.de>, <david.daney@...ium.com>,
	<huangdaode@...ilicon.com>, <jszhang@...vell.com>
Subject: Re: [PATCH v2 14/15] ethernet: stmicro: stmmac: add missing
 of_node_put after calling of_parse_phandle

Hi,

On 08/01/2016 09:02 AM, Peter Chen wrote:
> of_node_put needs to be called when the device node which is got
> from of_parse_phandle has finished using.
>
> This commit fixes both local (in stmmac_axi_setup) and global
> (plat->phy_node) device_node for this issue, and using the
> correct device node when tries to put node at stmmac_probe_config_dt
> for error path.
>
> Signed-off-by: Peter Chen <peter.chen@....com>
> ---
>  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c     | 1 +
>  drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 +++++--
>  2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index c23ccab..4c8c60a 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -3397,6 +3397,7 @@ int stmmac_dvr_remove(struct device *dev)
>  	stmmac_set_mac(priv->ioaddr, false);
>  	netif_carrier_off(ndev);
>  	unregister_netdev(ndev);
> +	of_node_put(priv->plat->phy_node);
>  	if (priv->stmmac_rst)
>  		reset_control_assert(priv->stmmac_rst);
>  	clk_disable_unprepare(priv->pclk);
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> index f7dfc0a..756bb54 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> @@ -113,8 +113,10 @@ static struct stmmac_axi *stmmac_axi_setup(struct platform_device *pdev)
>  		return NULL;
>
>  	axi = kzalloc(sizeof(*axi), GFP_KERNEL);
> -	if (!axi)
> +	if (!axi) {
> +		of_node_put(np);
>  		return ERR_PTR(-ENOMEM);
> +	}
>
>  	axi->axi_lpi_en = of_property_read_bool(np, "snps,lpi_en");
>  	axi->axi_xit_frm = of_property_read_bool(np, "snps,xit_frm");
> @@ -127,6 +129,7 @@ static struct stmmac_axi *stmmac_axi_setup(struct platform_device *pdev)
>  	of_property_read_u32(np, "snps,wr_osr_lmt", &axi->axi_wr_osr_lmt);
>  	of_property_read_u32(np, "snps,rd_osr_lmt", &axi->axi_rd_osr_lmt);
>  	of_property_read_u32_array(np, "snps,blen", axi->axi_blen, AXI_BLEN);
> +	of_node_put(np);
>
>  	return axi;
>  }
> @@ -302,7 +305,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
>  		dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg),
>  				       GFP_KERNEL);
>  		if (!dma_cfg) {
> -			of_node_put(np);
> +			of_node_put(plat->phy_node);
>  			return ERR_PTR(-ENOMEM);
>  		}
>  		plat->dma_cfg = dma_cfg;
>

You can add my:

Acked-by: Alexandre Torgue <alexandre.torgue@...com>

Regards

Alex