Skip to contentSkip to conversation

fix memory leak media IR keytable

PATCH In review Yoichi Yuasa 2 participants 2 messages Feb 4, 2010 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix memory leak media IR keytable

---
 drivers/media/IR/ir-keytable.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/media/IR/ir-keytable.c +3 -1
index b521ed9..44501d9 100644
@@ -422,8 +422,10 @@ int ir_input_register(struct input_dev *input_dev,
 	ir_dev->rc_tab.size = ir_roundup_tablesize(rc_tab->size);
 	ir_dev->rc_tab.scan = kzalloc(ir_dev->rc_tab.size *
 				    sizeof(struct ir_scancode), GFP_KERNEL);
-	if (!ir_dev->rc_tab.scan)
+	if (!ir_dev->rc_tab.scan) {
+		kfree(ir_dev);
 		return -ENOMEM;
+	}
 
 	IR_dprintk(1, "Allocated space for %d keycode entries (%zd bytes)\n",
 		ir_dev->rc_tab.size,
Signature · 1 line
1.6.6.1
#1 lore raw

Hi Yoichi,

Quoted 10 lines · Yoichi Yuasa
---
 drivers/media/IR/ir-keytable.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/media/IR/ir-keytable.c +0 -0
index b521ed9..44501d9 100644

drivers/media/IR/ir-keytable.c int ir_input_register(struct input_dev *input_dev, · line 428

Quoted 8 lines
drivers/media/IR/ir-keytable.c +3 -1
@@ -422,8 +422,10 @@ int ir_input_register(struct input_dev *input_dev,
 	ir_dev->rc_tab.size = ir_roundup_tablesize(rc_tab->size);
 	ir_dev->rc_tab.scan = kzalloc(ir_dev->rc_tab.size *
 				    sizeof(struct ir_scancode), GFP_KERNEL);
-	if (!ir_dev->rc_tab.scan)
+	if (!ir_dev->rc_tab.scan) {
+		kfree(ir_dev);
 		return -ENOMEM;
+	}

Thanks for the patch, but we've received and applied an identical fix at the development tree.

Signature · 2 lines
Cheers,
Mauro