lkml.org 
[lkml]   [2012]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] ISP1704 USB Charger: Fix use-after-free error in isp1704_charger_probe()
Date
Dear Jesper Juhl,

> In isp1704_charger_probe() at the 'fail0:' label we kfree(isp) and
> then subsequently call isp1704_charger_set_power(isp, 0). That's a
> problem since isp1704_charger_set_power() dereferences the pointer it
> is passed as its first argument, which is 'isp', which we already
> freed.
>
> Fixed by simply swapping the order of the two calls so that we only
> kfree() *after* the call to isp1704_charger_set_power().
>
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> ---
> drivers/power/isp1704_charger.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/power/isp1704_charger.c
> b/drivers/power/isp1704_charger.c index 39eb50f..8a610da 100644
> --- a/drivers/power/isp1704_charger.c
> +++ b/drivers/power/isp1704_charger.c
> @@ -476,11 +476,9 @@ fail2:
> fail1:
> usb_put_transceiver(isp->phy);
> fail0:
> - kfree(isp);
> -
> dev_err(&pdev->dev, "failed to register isp1704 with error %d\n", ret);
> -
> isp1704_charger_set_power(isp, 0);
> + kfree(isp);

Use devm_kzalloc() and be done with all this goo?

> return ret;
> }

Best regards,
Marek Vasut


\
 
 \ /
  Last update: 2012-04-22 22:39    [W:0.067 / U:0.812 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site