diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-09-03 08:42:27 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-09-10 14:48:30 -0400 |
commit | 5e40b1c1cc5ae9b949f96d40356afd2a31477365 (patch) | |
tree | 987c47aba51e8736855c54e48a05b77db8cdd5b9 /arch | |
parent | 55d512e245bc7699a8800e23df1a24195dd08217 (diff) |
gpio/omap: fix possible memory leak in omap2_gpio_dev_init()
pdata and pdata->regs have been allocated in this function and
should be freed before leaving it, and in the other error handling
cases too.
spatch with a semantic match is used to found this problem.
(http://coccinelle.lip6.fr/)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/gpio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 9ad7d489b0de..fe626e903dea 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c | |||
@@ -60,6 +60,7 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) | |||
60 | pdata->regs = kzalloc(sizeof(struct omap_gpio_reg_offs), GFP_KERNEL); | 60 | pdata->regs = kzalloc(sizeof(struct omap_gpio_reg_offs), GFP_KERNEL); |
61 | if (!pdata->regs) { | 61 | if (!pdata->regs) { |
62 | pr_err("gpio%d: Memory allocation failed\n", id); | 62 | pr_err("gpio%d: Memory allocation failed\n", id); |
63 | kfree(pdata); | ||
63 | return -ENOMEM; | 64 | return -ENOMEM; |
64 | } | 65 | } |
65 | 66 | ||
@@ -121,6 +122,7 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) | |||
121 | break; | 122 | break; |
122 | default: | 123 | default: |
123 | WARN(1, "Invalid gpio bank_type\n"); | 124 | WARN(1, "Invalid gpio bank_type\n"); |
125 | kfree(pdata->regs); | ||
124 | kfree(pdata); | 126 | kfree(pdata); |
125 | return -EINVAL; | 127 | return -EINVAL; |
126 | } | 128 | } |