* [PATCH] mmc: host: Fix mmc_alloc_host() error path
@ 2015-06-12 4:39 Fabio Estevam
2015-06-12 7:22 ` Adrian Hunter
0 siblings, 1 reply; 3+ messages in thread
From: Fabio Estevam @ 2015-06-12 4:39 UTC (permalink / raw)
To: ulf.hansson; +Cc: adrian.hunter, linux-mmc, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
If mmc_gpio_alloc() fails we miss to call 'kfree(host)', so rearrange
the error path to fix it.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/mmc/core/host.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 99a9c90..01fa1ed 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -566,10 +566,8 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
host->index = err;
spin_unlock(&mmc_host_lock);
idr_preload_end();
- if (err < 0) {
- kfree(host);
- return NULL;
- }
+ if (err < 0)
+ goto err_kfree;
dev_set_name(&host->class_dev, "mmc%d", host->index);
@@ -578,10 +576,8 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
host->class_dev.class = &mmc_host_class;
device_initialize(&host->class_dev);
- if (mmc_gpio_alloc(host)) {
- put_device(&host->class_dev);
- return NULL;
- }
+ if (mmc_gpio_alloc(host))
+ goto err_put_device;
mmc_host_clk_init(host);
@@ -605,6 +601,12 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
host->max_blk_count = PAGE_CACHE_SIZE / 512;
return host;
+
+err_put_device:
+ put_device(&host->class_dev);
+err_kfree:
+ kfree(host);
+ return NULL;
}
EXPORT_SYMBOL(mmc_alloc_host);
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mmc: host: Fix mmc_alloc_host() error path
2015-06-12 4:39 [PATCH] mmc: host: Fix mmc_alloc_host() error path Fabio Estevam
@ 2015-06-12 7:22 ` Adrian Hunter
2015-06-15 13:03 ` Fabio Estevam
0 siblings, 1 reply; 3+ messages in thread
From: Adrian Hunter @ 2015-06-12 7:22 UTC (permalink / raw)
To: Fabio Estevam, ulf.hansson; +Cc: linux-mmc, Fabio Estevam
On 12/06/15 07:39, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> If mmc_gpio_alloc() fails we miss to call 'kfree(host)', so rearrange
> the error path to fix it.
Are you sure it doesn't get freed through put_device()?
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> drivers/mmc/core/host.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
> index 99a9c90..01fa1ed 100644
> --- a/drivers/mmc/core/host.c
> +++ b/drivers/mmc/core/host.c
> @@ -566,10 +566,8 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
> host->index = err;
> spin_unlock(&mmc_host_lock);
> idr_preload_end();
> - if (err < 0) {
> - kfree(host);
> - return NULL;
> - }
> + if (err < 0)
> + goto err_kfree;
>
> dev_set_name(&host->class_dev, "mmc%d", host->index);
>
> @@ -578,10 +576,8 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
> host->class_dev.class = &mmc_host_class;
> device_initialize(&host->class_dev);
>
> - if (mmc_gpio_alloc(host)) {
> - put_device(&host->class_dev);
> - return NULL;
> - }
> + if (mmc_gpio_alloc(host))
> + goto err_put_device;
>
> mmc_host_clk_init(host);
>
> @@ -605,6 +601,12 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
> host->max_blk_count = PAGE_CACHE_SIZE / 512;
>
> return host;
> +
> +err_put_device:
> + put_device(&host->class_dev);
> +err_kfree:
> + kfree(host);
> + return NULL;
> }
>
> EXPORT_SYMBOL(mmc_alloc_host);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mmc: host: Fix mmc_alloc_host() error path
2015-06-12 7:22 ` Adrian Hunter
@ 2015-06-15 13:03 ` Fabio Estevam
0 siblings, 0 replies; 3+ messages in thread
From: Fabio Estevam @ 2015-06-15 13:03 UTC (permalink / raw)
To: Adrian Hunter; +Cc: Ulf Hansson, linux-mmc@vger.kernel.org, Fabio Estevam
On Fri, Jun 12, 2015 at 4:22 AM, Adrian Hunter <adrian.hunter@intel.com> wrote:
> On 12/06/15 07:39, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>
>> If mmc_gpio_alloc() fails we miss to call 'kfree(host)', so rearrange
>> the error path to fix it.
>
> Are you sure it doesn't get freed through put_device()?
Yes, you are right. Sorry for the noise.
Thanks
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-15 13:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-12 4:39 [PATCH] mmc: host: Fix mmc_alloc_host() error path Fabio Estevam
2015-06-12 7:22 ` Adrian Hunter
2015-06-15 13:03 ` Fabio Estevam
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox