wmi: fix memory leak in parse_wdg

This patch properly kfree out.pointer and gblock in error path.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index e4eaa14ed987973e980bab9a93e5d96dea499116..582b5cdd3f4368b8fb9a1f5827be388dffc20e94 100644 (file)
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -827,8 +827,10 @@ static __init acpi_status parse_wdg(acpi_handle handle)
        total = obj->buffer.length / sizeof(struct guid_block);
 
        gblock = kmemdup(obj->buffer.pointer, obj->buffer.length, GFP_KERNEL);
-       if (!gblock)
-               return AE_NO_MEMORY;
+       if (!gblock) {
+               status = AE_NO_MEMORY;
+               goto out_free_pointer;
+       }
 
        for (i = 0; i < total; i++) {
                /*
@@ -848,8 +850,10 @@ static __init acpi_status parse_wdg(acpi_handle handle)
                        wmi_dump_wdg(&gblock[i]);
 
                wblock = kzalloc(sizeof(struct wmi_block), GFP_KERNEL);
-               if (!wblock)
-                       return AE_NO_MEMORY;
+               if (!wblock) {
+                       status = AE_NO_MEMORY;
+                       goto out_free_gblock;
+               }
 
                wblock->gblock = gblock[i];
                wblock->handle = handle;
@@ -860,8 +864,10 @@ static __init acpi_status parse_wdg(acpi_handle handle)
                list_add_tail(&wblock->list, &wmi_blocks.list);
        }
 
-       kfree(out.pointer);
+out_free_gblock:
        kfree(gblock);
+out_free_pointer:
+       kfree(out.pointer);
 
        return status;
 }