Skip to contentSkip to conversation

msi-wmi: Fix memory leak

PATCH In review [email protected] 3 participants 3 messages Apr 6, 2013 – Apr 11, 2013 x86 platform drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 msi-wmi: Fix memory leak

From: Maxim Mikityanskiy <[email protected]>

This patch looks like it should be in the 3.8-stable tree, should we apply it?

------------------

From: "Maxim Mikityanskiy <[email protected]>"

commit 51c94491c82c3d9029f6e87a1a153db321d88e35 upstream

Fix memory leak - don't forget to kfree ACPI object when returning from msi_wmi_notify() after suppressing key event.

---
 drivers/platform/x86/msi-wmi.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/platform/x86/msi-wmi.c +3 -1
index 2264331..b96766b 100644
@@ -176,7 +176,7 @@ static void msi_wmi_notify(u32 value, void *context)
 				pr_debug("Suppressed key event 0x%X - "
 					 "Last press was %lld us ago\n",
 					 key->code, ktime_to_us(diff));
-				return;
+				goto msi_wmi_notify_exit;
 			}
 			last_pressed[key->code - SCANCODE_BASE] = cur;
 
@@ -195,6 +195,8 @@ static void msi_wmi_notify(u32 value, void *context)
 			pr_info("Unknown key pressed - %x\n", eventcode);
 	} else
 		pr_info("Unknown event received\n");
+
+msi_wmi_notify_exit:
 	kfree(response.pointer);
 }
 
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 4 lines · On Sat, Apr 6, 2013 at 2:43 PM, <[email protected]> wrote:

From: Maxim Mikityanskiy <[email protected]>

This patch looks like it should be in the 3.8-stable tree, should we apply it?

Looks like stable-material to me.

Quoted 41 lines

------------------

From: "Maxim Mikityanskiy <[email protected]>"

commit 51c94491c82c3d9029f6e87a1a153db321d88e35 upstream

Fix memory leak - don't forget to kfree ACPI object when returning from msi_wmi_notify() after suppressing key event.

---
 drivers/platform/x86/msi-wmi.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/platform/x86/msi-wmi.c +3 -2
index 2264331..b96766b 100644
@@ -176,7 +176,7 @@ static void msi_wmi_notify(u32 value, void *context)
                                pr_debug("Suppressed key event 0x%X - "
                                         "Last press was %lld us ago\n",
                                         key->code, ktime_to_us(diff));
-                               return;
+                               goto msi_wmi_notify_exit;
                        }
                        last_pressed[key->code - SCANCODE_BASE] = cur;
 
@@ -195,6 +195,8 @@ static void msi_wmi_notify(u32 value, void *context)
                        pr_info("Unknown key pressed - %x\n", eventcode);
        } else
                pr_info("Unknown event received\n");
+
+msi_wmi_notify_exit:
        kfree(response.pointer);
 }
 
--
Quoted 2 lines

1.7.10.4

(sorry for the resend, first one was rejected by vger due to html from my mobile).

#2 lore raw
In reply to [email protected]
Quoted 4 lines · On Sat, Apr 06, 2013 at 09:43:57PM +0900, [email protected] wrote:

From: Maxim Mikityanskiy <[email protected]>

This patch looks like it should be in the 3.8-stable tree, should we apply it?

I believe this is also applicable to 3.5 kernels. I'm queuing it.

Cheers,
--
Luis

Quoted 48 lines

------------------

From: "Maxim Mikityanskiy <[email protected]>"

commit 51c94491c82c3d9029f6e87a1a153db321d88e35 upstream

Fix memory leak - don't forget to kfree ACPI object when returning from msi_wmi_notify() after suppressing key event.

---
 drivers/platform/x86/msi-wmi.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/platform/x86/msi-wmi.c +3 -1
index 2264331..b96766b 100644
@@ -176,7 +176,7 @@ static void msi_wmi_notify(u32 value, void *context)
 				pr_debug("Suppressed key event 0x%X - "
 					 "Last press was %lld us ago\n",
 					 key->code, ktime_to_us(diff));
-				return;
+				goto msi_wmi_notify_exit;
 			}
 			last_pressed[key->code - SCANCODE_BASE] = cur;
 
@@ -195,6 +195,8 @@ static void msi_wmi_notify(u32 value, void *context)
 			pr_info("Unknown key pressed - %x\n", eventcode);
 	} else
 		pr_info("Unknown event received\n");
+
+msi_wmi_notify_exit:
 	kfree(response.pointer);
 }
 
Signature · 6 lines
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html