Re: [PATCH] drivers/macintosh: Correct potential double free
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2010-03-29 10:57:26
Also in:
kernel-janitors, lkml
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2010-03-29 10:57:26
Also in:
kernel-janitors, lkml
On Mon, 2010-03-29 at 11:39 +0200, Julia Lawall wrote:
From: Julia Lawall <redacted> The conditionals were testing different values, but then all freeing the same one, which could result in a double free. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/)
Thanks. I'll stick that in my -next branch as soon as I open it :-) Cheers, Ben.
// <smpl> @@ expression x,e; identifier f; iterator I; statement S; @@ *kfree(x); ... when != &x when != x = e when != I(x,...) S *x // </smpl> Signed-off-by: Julia Lawall <redacted> --- drivers/macintosh/windfarm_pm91.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)diff --git a/drivers/macintosh/windfarm_pm91.c b/drivers/macintosh/windfarm_pm91.c index bea9916..3442732 100644 --- a/drivers/macintosh/windfarm_pm91.c +++ b/drivers/macintosh/windfarm_pm91.c@@ -687,12 +687,9 @@ static int __devexit wf_smu_remove(struct platform_device *ddev) wf_put_control(cpufreq_clamp); /* Destroy control loops state structures */ - if (wf_smu_slots_fans) - kfree(wf_smu_cpu_fans); - if (wf_smu_drive_fans) - kfree(wf_smu_cpu_fans); - if (wf_smu_cpu_fans) - kfree(wf_smu_cpu_fans); + kfree(wf_smu_slots_fans); + kfree(wf_smu_drive_fans); + kfree(wf_smu_cpu_fans); return 0; }