[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100219163246.376039962@kvm.kroah.org>
Date: Fri, 19 Feb 2010 08:29:49 -0800
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Len Brown <len.brown@...el.com>,
Anisse Astier <anisse@...ier.eu>,
Randy Dunlap <randy.dunlap@...cle.com>,
Carlos Corbacho <carlos@...angeworlds.co.uk>,
Chuck Ebbert <cebbert@...hat.com>
Subject: [56/93] wmi: Free the allocated acpi objects through wmi_get_event_data
2.6.32-stable review patch. If anyone has any objections, please let us know.
------------------
From: Anisse Astier <anisse@...ier.eu>
commit 3e9b988e4edf065d39c1343937f717319b1c1065 upstream
[ backported to 2.6.32 ]
These function allocate an acpi object by calling wmi_get_event_data, which
then calls acpi_evaluate_object, and it is not freed afterwards.
And kernel doc is fixed for parameters of wmi_get_event_data.
Signed-off-by: Anisse Astier <anisse@...ier.eu>
Acked-by: Randy Dunlap <randy.dunlap@...cle.com>
Acked-by: Carlos Corbacho <carlos@...angeworlds.co.uk>
Signed-off-by: Len Brown <len.brown@...el.com>
Cc: Chuck Ebbert <cebbert@...hat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
drivers/platform/x86/dell-wmi.c | 1 +
drivers/platform/x86/hp-wmi.c | 2 ++
drivers/platform/x86/wmi.c | 4 ++--
3 files changed, 5 insertions(+), 2 deletions(-)
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -180,6 +180,7 @@ static void dell_wmi_notify(u32 value, v
printk(KERN_INFO "dell-wmi: Unknown key %x pressed\n",
buffer[1] & 0xFFFF);
}
+ kfree(obj);
}
static int __init dell_wmi_input_setup(void)
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -377,6 +377,8 @@ static void hp_wmi_notify(u32 value, voi
eventcode);
} else
printk(KERN_INFO "HP WMI: Unknown response received\n");
+
+ kfree(obj);
}
static int __init hp_wmi_input_setup(void)
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -510,8 +510,8 @@ EXPORT_SYMBOL_GPL(wmi_remove_notify_hand
/**
* wmi_get_event_data - Get WMI data associated with an event
*
- * @event - Event to find
- * &out - Buffer to hold event data
+ * @event: Event to find
+ * @out: Buffer to hold event data. out->pointer should be freed with kfree()
*
* Returns extra data associated with an event in WMI.
*/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists