2010-06-29 03:07:34

by Axel Lin

Subject: [PATCH] asus-laptop: fix a memory leak in asus_laptop_get_info error path

The callers of write_acpi_int_ret() pass ACPI_ALLOCATE_BUFFER,
the caller must kfree the returned buffer if AE_OK is returned.

This patch adds a missing kfree(buffer.pointer) before return -ENOMEM
if kstrdup fail.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/platform/x86/asus-laptop.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 71db2ef..3d76c6a 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -1397,8 +1397,10 @@ static int asus_laptop_get_info(struct asus_laptop *asus)
}
}
asus->name = kstrdup(string, GFP_KERNEL);
- if (!asus->name)
+ if (!asus->name) {
+ kfree(buffer.pointer);
return -ENOMEM;
+ }

if (*string)
pr_notice(" %s model detected\n", string);
--
1.5.4.3

2010-06-29 05:30:27

by Corentin Chary

Subject: Re: [PATCH] asus-laptop: fix a memory leak in asus_laptop_get_info error path

On Tue, Jun 29, 2010 at 5:09 AM, Axel Lin <[email protected]> wrote:
> The callers of write_acpi_int_ret() pass ACPI_ALLOCATE_BUFFER,
> the caller must kfree the returned buffer if AE_OK is returned.
>
> This patch adds a missing kfree(buffer.pointer) before return -ENOMEM
> if kstrdup fail.
>
> Signed-off-by: Axel Lin <[email protected]>
> ---
> ?drivers/platform/x86/asus-laptop.c | ? ?4 +++-
> ?1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
> index 71db2ef..3d76c6a 100644
> --- a/drivers/platform/x86/asus-laptop.c
> +++ b/drivers/platform/x86/asus-laptop.c
> @@ -1397,8 +1397,10 @@ static int asus_laptop_get_info(struct asus_laptop *asus)
> ? ? ? ? ? ? ? ?}
> ? ? ? ?}
> ? ? ? ?asus->name = kstrdup(string, GFP_KERNEL);
> - ? ? ? if (!asus->name)
> + ? ? ? if (!asus->name) {
> + ? ? ? ? ? ? ? kfree(buffer.pointer);
> ? ? ? ? ? ? ? ?return -ENOMEM;
> + ? ? ? }
>
> ? ? ? ?if (*string)
> ? ? ? ? ? ? ? ?pr_notice(" ?%s model detected\n", string);
> --
> 1.5.4.3
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
> the body of a message to [email protected]
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>

Acked-by: Corentin Chary <[email protected]>

--
Corentin Chary
http://xf.iksaif.net

2010-07-01 13:53:22

by Matthew Garrett

Subject: Re: [PATCH] asus-laptop: fix a memory leak in asus_laptop_get_info error path

On Tue, Jun 29, 2010 at 11:09:47AM +0800, Axel Lin wrote:
> The callers of write_acpi_int_ret() pass ACPI_ALLOCATE_BUFFER,
> the caller must kfree the returned buffer if AE_OK is returned.
>
> This patch adds a missing kfree(buffer.pointer) before return -ENOMEM
> if kstrdup fail.

Applied, thanks.

--
Matthew Garrett | [email protected]