X86 platform drivers
 help / color / mirror / Atom feed
From: Luis Henriques <luis.henriques@canonical.com>
To: jhbird.choi@gmail.com
Cc: Anisse Astier <anisse@astier.eu>,
	Matthew Garrett <matthew.garrett@nebula.com>,
	Maxim Mikityanskiy <maxtram95@gmail.com>,
	stable@vger.kernel.org, platform-driver-x86@vger.kernel.org,
	"Lee, Chun-Yi" <jlee@suse.com>,
	Jonghwan Choi <jhbird.choi@samsung.com>
Subject: Re: [PATCH 3.8-stable] msi-wmi: Fix memory leak
Date: Thu, 11 Apr 2013 13:41:11 +0100	[thread overview]
Message-ID: <20130411124111.GB13039@hercules> (raw)
In-Reply-To: <516018d4.41e1440a.5308.fffff9f2@mx.google.com>

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

      parent reply	other threads:[~2013-04-11 12:41 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-06 12:43 [PATCH 3.8-stable] msi-wmi: Fix memory leak jhbird.choi
2013-04-06 17:50 ` Anisse Astier
2013-04-11 12:41 ` Luis Henriques [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130411124111.GB13039@hercules \
    --to=luis.henriques@canonical.com \
    --cc=anisse@astier.eu \
    --cc=jhbird.choi@gmail.com \
    --cc=jhbird.choi@samsung.com \
    --cc=jlee@suse.com \
    --cc=matthew.garrett@nebula.com \
    --cc=maxtram95@gmail.com \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox