aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-03-28 19:39:22 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-04-07 04:00:40 -0400
commitab30f78c0afbb86584144925e25c7ca68ba9a91f (patch)
tree2ddd3972415c317c89b7c983463952721e04f5e4 /drivers
parent637a99022fb119b90fb281715d13172f0394fc12 (diff)
powerpc/pmac/windfarm: Correct potential double free
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/) // <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 <julia@diku.dk> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/macintosh/windfarm_pm91.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/macintosh/windfarm_pm91.c b/drivers/macintosh/windfarm_pm91.c
index bea99168ff35..344273235124 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)
687 wf_put_control(cpufreq_clamp); 687 wf_put_control(cpufreq_clamp);
688 688
689 /* Destroy control loops state structures */ 689 /* Destroy control loops state structures */
690 if (wf_smu_slots_fans) 690 kfree(wf_smu_slots_fans);
691 kfree(wf_smu_cpu_fans); 691 kfree(wf_smu_drive_fans);
692 if (wf_smu_drive_fans) 692 kfree(wf_smu_cpu_fans);
693 kfree(wf_smu_cpu_fans);
694 if (wf_smu_cpu_fans)
695 kfree(wf_smu_cpu_fans);
696 693
697 return 0; 694 return 0;
698} 695}