[PATCH 3.8-stable] msi-wmi: Fix memory leak

[PATCH 3.8-stable] msi-wmi: Fix memory leak

[jhbird.choi]

From: Maxim Mikityanskiy <maxtram95@gmail.com>

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

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

From: "Maxim Mikityanskiy <maxtram95@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 <maxtram95@gmail.com>
Acked-by: Anisse Astier <anisse@astier.eu>
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
---
 drivers/platform/x86/msi-wmi.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
index 2264331..b96766b 100644
--- 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, 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);
 }
 
-- 
1.7.10.4

Re: [PATCH 3.8-stable] msi-wmi: Fix memory leak

[Anisse Astier]

On Sat, Apr 6, 2013 at 2:43 PM,  <jhbird.choi@gmail.com> wrote:
> From: Maxim Mikityanskiy <maxtram95@gmail.com>
>
> This patch looks like it should be in the 3.8-stable tree, should we apply
> it?

Looks like stable-material to me.



> ------------------
>
> From: "Maxim Mikityanskiy <maxtram95@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 <maxtram95@gmail.com>
> Acked-by: Anisse Astier <anisse@astier.eu>
> Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
> Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
> ---
>  drivers/platform/x86/msi-wmi.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
> index 2264331..b96766b 100644
> --- 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, 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);
>  }
>
> --
> 1.7.10.4
>

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

Re: [PATCH 3.8-stable] msi-wmi: Fix memory leak

[Luis Henriques]

On Sat, Apr 06, 2013 at 09:43:57PM +0900, jhbird.choi@gmail.com wrote:
> From: Maxim Mikityanskiy <maxtram95@gmail.com>
> 
> 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

> 
> ------------------
> 
> From: "Maxim Mikityanskiy <maxtram95@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 <maxtram95@gmail.com>
> Acked-by: Anisse Astier <anisse@astier.eu>
> Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
> Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
> ---
>  drivers/platform/x86/msi-wmi.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
> index 2264331..b96766b 100644
> --- 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, 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);
>  }
>  
> -- 
> 1.7.10.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html