linux-kernel - Re: [PATCH] PCI/pwrctrl: Fix double cleanup on devm_add_action_or

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]

Message-ID: <tghehtcxc45rtdnt4mj6td4zziebckwfclbu665mtmcwvz562u@q24eds5pn4bn>
Date: Wed, 4 Jun 2025 22:53:26 +0530
From: Manivannan Sadhasivam <manivannan.sadhasivam@...aro.org>
To: Geert Uytterhoeven <geert+renesas@...der.be>
Cc: Bartosz Golaszewski <brgl@...ev.pl>, 
	Bjorn Helgaas <bhelgaas@...gle.com>, Krzysztof Wilczyński <kwilczynski@...nel.org>, 
	Marek Vasut <marek.vasut+renesas@...lbox.org>, linux-pci@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] PCI/pwrctrl: Fix double cleanup on
 devm_add_action_or_reset() failure

On Wed, Jun 04, 2025 at 10:38:33AM +0200, Geert Uytterhoeven wrote:
> When devm_add_action_or_reset() fails, it calls the passed cleanup
> function.  Hence the caller must not repeat that cleanup.
> 
> Replace the "goto err_regulator_free" by the actual freeing, as there
> will never be a need again for a second user of this label.
> 
> Fixes: 75996c92f4de309f ("PCI/pwrctrl: Add pwrctrl driver for PCI slots")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@...der.be>

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@...aro.org>

- Mani

> ---
> Compile-tested only.
> ---
>  drivers/pci/pwrctrl/slot.c | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/pci/pwrctrl/slot.c b/drivers/pci/pwrctrl/slot.c
> index 18becc144913e047..26b21746da50baa4 100644
> --- a/drivers/pci/pwrctrl/slot.c
> +++ b/drivers/pci/pwrctrl/slot.c
> @@ -47,13 +47,14 @@ static int pci_pwrctrl_slot_probe(struct platform_device *pdev)
>  	ret = regulator_bulk_enable(slot->num_supplies, slot->supplies);
>  	if (ret < 0) {
>  		dev_err_probe(dev, ret, "Failed to enable slot regulators\n");
> -		goto err_regulator_free;
> +		regulator_bulk_free(slot->num_supplies, slot->supplies);
> +		return ret;
>  	}
>  
>  	ret = devm_add_action_or_reset(dev, devm_pci_pwrctrl_slot_power_off,
>  				       slot);
>  	if (ret)
> -		goto err_regulator_disable;
> +		return ret;
>  
>  	pci_pwrctrl_init(&slot->ctx, dev);
>  
> @@ -62,13 +63,6 @@ static int pci_pwrctrl_slot_probe(struct platform_device *pdev)
>  		return dev_err_probe(dev, ret, "Failed to register pwrctrl driver\n");
>  
>  	return 0;
> -
> -err_regulator_disable:
> -	regulator_bulk_disable(slot->num_supplies, slot->supplies);
> -err_regulator_free:
> -	regulator_bulk_free(slot->num_supplies, slot->supplies);
> -
> -	return ret;
>  }
>  
>  static const struct of_device_id pci_pwrctrl_slot_of_match[] = {
> -- 
> 2.43.0
> 

-- 
மணிவண்ணன் சதாசிவம்