linux-kernel - Re: [PATCH 1/1] PCI: Cleanup convoluted logic in pci_create

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]

Message-ID: <20241004220333.GA363904@bhelgaas>
Date: Fri, 4 Oct 2024 17:03:33 -0500
From: Bjorn Helgaas <helgaas@...nel.org>
To: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
Cc: Lukas Wunner <lukas@...ner.de>,
	Krzysztof Wilczyński <kw@...ux.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
	Rob Herring <robh@...nel.org>, Bjorn Helgaas <bhelgaas@...gle.com>,
	linux-pci@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/1] PCI: Cleanup convoluted logic in pci_create_slot()

On Fri, Oct 04, 2024 at 06:22:40PM +0300, Ilpo Järvinen wrote:
> pci_create_slot() has an if () which can be made simpler by splitting
> it into two parts. In order to not duplicate error handling, add a new
> label too to handle kobj put.
> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>

Applied to pci/misc for v6.13, thank you!

> ---
>  drivers/pci/slot.c | 20 +++++++++++---------
>  1 file changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
> index 0f87cade10f7..9ac5a4f26794 100644
> --- a/drivers/pci/slot.c
> +++ b/drivers/pci/slot.c
> @@ -244,12 +244,13 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr,
>  	slot = get_slot(parent, slot_nr);
>  	if (slot) {
>  		if (hotplug) {
> -			if ((err = slot->hotplug ? -EBUSY : 0)
> -			     || (err = rename_slot(slot, name))) {
> -				kobject_put(&slot->kobj);
> -				slot = NULL;
> -				goto err;
> +			if (slot->hotplug) {
> +				err = -EBUSY;
> +				goto put_slot;
>  			}
> +			err = rename_slot(slot, name);
> +			if (err)
> +				goto put_slot;
>  		}
>  		goto out;
>  	}
> @@ -278,10 +279,8 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr,
>  
>  	err = kobject_init_and_add(&slot->kobj, &pci_slot_ktype, NULL,
>  				   "%s", slot_name);
> -	if (err) {
> -		kobject_put(&slot->kobj);
> -		goto err;
> -	}
> +	if (err)
> +		goto put_slot;
>  
>  	down_read(&pci_bus_sem);
>  	list_for_each_entry(dev, &parent->devices, bus_list)
> @@ -296,6 +295,9 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr,
>  	kfree(slot_name);
>  	mutex_unlock(&pci_slot_mutex);
>  	return slot;
> +
> +put_slot:
> +	kobject_put(&slot->kobj);
>  err:
>  	slot = ERR_PTR(err);
>  	goto out;
> -- 
> 2.39.5
>