3.4-stable review patch.  If anyone has any objections, please let me know.

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

From: Maxim Mikityanskiy <maxtra...@gmail.com>

commit 51c94491c82c3d9029f6e87a1a153db321d88e35 upstream.

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

Signed-off-by: Maxim Mikityanskiy <maxtra...@gmail.com>
Acked-by: Anisse Astier <ani...@astier.eu>
Signed-off-by: Lee, Chun-Yi <j...@suse.com>
Signed-off-by: Matthew Garrett <matthew.garr...@nebula.com>
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
Cc: Qiang Huang <h.huangqi...@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/platform/x86/msi-wmi.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/drivers/platform/x86/msi-wmi.c
+++ b/drivers/platform/x86/msi-wmi.c
@@ -176,7 +176,7 @@ static void msi_wmi_notify(u32 value, vo
                                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, vo
                        pr_info("Unknown key pressed - %x\n", eventcode);
        } else
                pr_info("Unknown event received\n");
+
+msi_wmi_notify_exit:
        kfree(response.pointer);
 }
 


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to