From: Vasiliy Kulikov <segooon@gmail.com>
Date: Sun, 17 Oct 2010 14:51:57 +0000 (+0400)
Subject: staging: speakup: fix memory leak
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b3495cebaaa64c9e6df9ab663dfb75e86a08f9ce;p=linux-beck.git

staging: speakup: fix memory leak

speakup_init() didn't free first_console if speakup_kobj_init() fails.
Also propagate speakup_kobj_init()'s return code.

Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index a64704bd19bf..4b7a9c2b965f 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -2259,8 +2259,11 @@ static int __init speakup_init(void)
 	first_console = kzalloc(sizeof(*first_console), GFP_KERNEL);
 	if (!first_console)
 		return -ENOMEM;
-	if (speakup_kobj_init() < 0)
-		return -ENOMEM;
+	err = speakup_kobj_init();
+	if (err) {
+		kfree(first_console);
+		return err;
+	}
 
 	reset_default_chars();
 	reset_default_chartab();