public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: richard.gong@linux.intel.com, gregkh@linuxfoundation.org,
	atull@kernel.org, linux-kernel@vger.kernel.org,
	kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] firmware: stratix10-svc: Fix some error handling paths in 'stratix10_svc_drv_probe()'
Date: Tue, 28 Apr 2020 14:55:10 +0300	[thread overview]
Message-ID: <20200428115510.GA2014@kadam> (raw)
In-Reply-To: <20200426190307.40840-1-christophe.jaillet@wanadoo.fr>

On Sun, Apr 26, 2020 at 09:03:07PM +0200, Christophe JAILLET wrote:
> If an error occurs after calling 'kfifo_alloc()', the allocated memory
> should be freed with 'kfifo_free()', as already done in the remove
> function.
> 
> Fixes: b5dc75c915cd ("firmware: stratix10-svc: extend svc to support new RSU features")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/firmware/stratix10-svc.c | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
> index d5f0769f3761..cc9df9589195 100644
> --- a/drivers/firmware/stratix10-svc.c
> +++ b/drivers/firmware/stratix10-svc.c
> @@ -1043,24 +1043,31 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
>  
>  	/* add svc client device(s) */
>  	svc = devm_kzalloc(dev, sizeof(*svc), GFP_KERNEL);
> -	if (!svc)
> -		return -ENOMEM;
> +	if (!svc) {
> +		ret = -ENOMEM;
> +		goto err_free_kfifo;
> +	}
>  
>  	svc->stratix10_svc_rsu = platform_device_alloc(STRATIX10_RSU, 0);
>  	if (!svc->stratix10_svc_rsu) {
>  		dev_err(dev, "failed to allocate %s device\n", STRATIX10_RSU);
> -		return -ENOMEM;
> +		ret = -ENOMEM;
> +		goto err_free_kfifo;
>  	}
>  
>  	ret = platform_device_add(svc->stratix10_svc_rsu);
>  	if (ret) {
>  		platform_device_put(svc->stratix10_svc_rsu);

Why not move this to the unwind code as well and do "goto put_platform;"?

regards,
dan carpenter

> -		return ret;
> +		goto err_free_kfifo;
>  	}
>  	dev_set_drvdata(dev, svc);
>  
>  	pr_info("Intel Service Layer Driver Initialized\n");
>  
> +	return 0;
> +
> +err_free_kfifo:
> +	kfifo_free(&controller->svc_fifo);
>  	return ret;
>  }


  reply	other threads:[~2020-04-28 11:57 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-26 19:03 [PATCH] firmware: stratix10-svc: Fix some error handling paths in 'stratix10_svc_drv_probe()' Christophe JAILLET
2020-04-28 11:55 ` Dan Carpenter [this message]
2020-04-28 20:13   ` Christophe JAILLET
  -- strict thread matches above, loose matches on Subject: below --
2020-04-26 19:50 Markus Elfring

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=20200428115510.GA2014@kadam \
    --to=dan.carpenter@oracle.com \
    --cc=atull@kernel.org \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=gregkh@linuxfoundation.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=richard.gong@linux.intel.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