aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-06-28 23:09:47 -0400
committerMatthew Garrett <mjg@redhat.com>2010-08-03 09:48:51 -0400
commitd8eca1105fe2039e102c6a8a915d0af937b1b593 (patch)
tree5892ef1f6d5b536cc65adb9c217c11cfaf4c5e16 /drivers
parent1492616a434dae1908d0da2d6ee6605ca5a77e6f (diff)
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 <axel.lin@gmail.com> Acked-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/asus-laptop.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index efe8f6388906..4af5709f8317 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)
1397 } 1397 }
1398 } 1398 }
1399 asus->name = kstrdup(string, GFP_KERNEL); 1399 asus->name = kstrdup(string, GFP_KERNEL);
1400 if (!asus->name) 1400 if (!asus->name) {
1401 kfree(buffer.pointer);
1401 return -ENOMEM; 1402 return -ENOMEM;
1403 }
1402 1404
1403 if (*string) 1405 if (*string)
1404 pr_notice(" %s model detected\n", string); 1406 pr_notice(" %s model detected\n", string);