[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1306788304-21794-1-git-send-email-andre.bartke@gmail.com>
Date: Mon, 30 May 2011 22:45:04 +0200
From: Andre Bartke <andre.bartke@...glemail.com>
To: mchehab@...hat.com
Cc: devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
Andre Bartke <andre.bartke@...il.com>
Subject: [PATCH] staging: altera-stapl: Fix memory leak of altera_init()
In case kzalloc() fails the second or third time
we should free the previous allocated resources.
Signed-off-by: Andre Bartke <andre.bartke@...il.com>
---
drivers/staging/altera-stapl/altera.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/altera-stapl/altera.c b/drivers/staging/altera-stapl/altera.c
index 05aad35..56ba557 100644
--- a/drivers/staging/altera-stapl/altera.c
+++ b/drivers/staging/altera-stapl/altera.c
@@ -2435,11 +2435,16 @@ int altera_init(struct altera_config *config, const struct firmware *fw)
if (!key)
return -ENOMEM;
value = kzalloc(257 * sizeof(char), GFP_KERNEL);
- if (!value)
+ if (!value) {
+ kfree(key);
return -ENOMEM;
+ }
astate = kzalloc(sizeof(struct altera_state), GFP_KERNEL);
- if (!astate)
+ if (!astate) {
+ kfree(key);
+ kfree(value);
return -ENOMEM;
+ }
astate->config = config;
if (!astate->config->jtag_io) {
--
1.7.5.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists