mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
To: Rolf Evers-Fischer <embedded24@evers-fischer.de>
Cc: kishon@ti.com, bhelgaas@google.com, linux-pci@vger.kernel.org,
	linux-kernel@vger.kernel.org, andy.shevchenko@gmail.com,
	Rolf Evers-Fischer <rolf.evers.fischer@aptiv.com>
Subject: Re: [PATCH v4 3/3] PCI: endpoint: pci_epf_create: remove goto labels
Date: Wed, 28 Feb 2018 13:33:23 +0000	[thread overview]
Message-ID: <20180228133323.GB21854@e107981-ln.cambridge.arm.com> (raw)
In-Reply-To: <20180228130719.31218-4-embedded24@evers-fischer.de>

On Wed, Feb 28, 2018 at 02:07:19PM +0100, Rolf Evers-Fischer wrote:
> From: Rolf Evers-Fischer <rolf.evers.fischer@aptiv.com>
> 
> Removes the goto labels completely, handles the errors at the
> respective call site and just returns instead of jumping around.
> 
> Signed-off-by: Rolf Evers-Fischer <rolf.evers.fischer@aptiv.com>
> ---
>  drivers/pci/endpoint/pci-epf-core.c | 30 +++++++++---------------------
>  1 file changed, 9 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c
> index 1878a6776519..cf2c4f6590a0 100644
> --- a/drivers/pci/endpoint/pci-epf-core.c
> +++ b/drivers/pci/endpoint/pci-epf-core.c
> @@ -203,16 +203,14 @@ struct pci_epf *pci_epf_create(const char *name)
>  	int len;
>  
>  	epf = kzalloc(sizeof(*epf), GFP_KERNEL);
> -	if (!epf) {
> -		ret = -ENOMEM;
> -		goto err_ret;
> -	}
> +	if (!epf)
> +		return ERR_PTR(-ENOMEM);
>  
>  	len = strchrnul(name, '.') - name;
>  	epf->name = kstrndup(name, len, GFP_KERNEL);
>  	if (!epf->name) {
> -		ret = -ENOMEM;
> -		goto free_epf;
> +		kfree(epf);
> +		return ERR_PTR(-ENOMEM);
>  	}
>  
>  	dev = &epf->dev;
> @@ -221,24 +219,14 @@ struct pci_epf *pci_epf_create(const char *name)
>  	dev->type = &pci_epf_type;
>  
>  	ret = dev_set_name(dev, "%s", name);
> -	if (ret)
> -		goto put_dev;
> -
> -	ret = device_add(dev);
> -	if (ret)
> -		goto put_dev;
> -
> -	return epf;
> +	if (!ret) {
> +		ret = device_add(dev);
> +		if (!ret)
> +			return epf;
> +	}

This is ugly, sorry. I should have been more explicit, I prefer
this construct:

ret = dev_set_name(dev, "%s", name);
if (ret) {
	kfree(epf->name);
	kfree(epf);
	return ERR_PTR(ret);
}

ret = device_add(dev);
if (ret) {
	put_device(dev);
	return ERR_PTR(ret);
}

return epf;

Please send a v5 and let's be done with it.

Thanks,
Lorenzo

> -put_dev:
>  	put_device(dev);
>  	return ERR_PTR(ret);
> -
> -free_epf:
> -	kfree(epf);
> -
> -err_ret:
> -	return ERR_PTR(ret);
>  }
>  EXPORT_SYMBOL_GPL(pci_epf_create);
>  
> -- 
> 2.16.2
> 

  parent reply	other threads:[~2018-02-28 13:34 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-28 13:07 [PATCH v4 0/3] pci: endpoint: Fix double free in pci_epf_create() Rolf Evers-Fischer
2018-02-28 13:07 ` [PATCH v4 1/3] PCI: endpoint: Simplify name allocation for EPF device Rolf Evers-Fischer
2018-02-28 13:07 ` [PATCH v4 2/3] PCI: endpoint: Fix kernel panic after put_device() Rolf Evers-Fischer
2018-02-28 13:07 ` [PATCH v4 3/3] PCI: endpoint: pci_epf_create: remove goto labels Rolf Evers-Fischer
2018-02-28 13:27   ` Kishon Vijay Abraham I
2018-02-28 13:33   ` Lorenzo Pieralisi [this message]
2018-02-28 14:46     ` Rolf Evers-Fischer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180228133323.GB21854@e107981-ln.cambridge.arm.com \
    --to=lorenzo.pieralisi@arm.com \
    --cc=andy.shevchenko@gmail.com \
    --cc=bhelgaas@google.com \
    --cc=embedded24@evers-fischer.de \
    --cc=kishon@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=rolf.evers.fischer@aptiv.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®