staging: speakup: fix memory leak

PATCH New Vasiliy Kulikov 1 participant 1 message Oct 17, 2010

Subsystems (2)

Staging Kernel janitors

lore

Share & tools

lore

Vasiliy Kulikov

author

2010-10-17 14:51 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 drivers/staging/speakup/main.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

drivers/staging/speakup/main.c +5 -2

index 2ef3b39..b02a61f 100644
@@ -2255,8 +2255,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();

Signature · 1 line

1.7.0.4