lkml.org 
[lkml]   [2013]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] drivers: phy: fix memory leak in error handling
Hi Michael,

On Saturday 09 November 2013 10:58 AM, Michael Opdenacker wrote:
> This fixes a memory leak in the phy_create() function.
>
> If ida_simple_get() returns with an error, the code jumps
> to the "err0" label without freeing the "phy" pointer.
>
> This patch introduces a new error management label to address this.
>
> Issue found with Coverity (CID 1127219)
>
> Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>

A patch has already been sent for fixing this.

https://git.kernel.org/cgit/linux/kernel/git/kishon/linux-phy.git/commit/?h=fixes

Thanks
Kishon

> ---
> drivers/phy/phy-core.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
> index 03cf8fb81554..8ddffe84d905 100644
> --- a/drivers/phy/phy-core.c
> +++ b/drivers/phy/phy-core.c
> @@ -453,7 +453,7 @@ struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
> if (id < 0) {
> dev_err(dev, "unable to get id\n");
> ret = id;
> - goto err0;
> + goto err1;
> }
>
> device_initialize(&phy->dev);
> @@ -468,11 +468,11 @@ struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
>
> ret = dev_set_name(&phy->dev, "phy-%s.%d", dev_name(dev), id);
> if (ret)
> - goto err1;
> + goto err2;
>
> ret = device_add(&phy->dev);
> if (ret)
> - goto err1;
> + goto err2;
>
> if (pm_runtime_enabled(dev)) {
> pm_runtime_enable(&phy->dev);
> @@ -481,9 +481,11 @@ struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
>
> return phy;
>
> -err1:
> +err2:
> ida_remove(&phy_ida, phy->id);
> put_device(&phy->dev);
> +
> +err1:
> kfree(phy);
>
> err0:
>



\
 
 \ /
  Last update: 2013-11-11 10:21    [W:2.389 / U:0.320 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site