Re: kernel problem 2.6.33-rc2

Re: kernel problem 2.6.33-rc2

[Len Brown]

> dell_wmi_init

Please try this patch.

>From d11e073ee3e3091d9190dace97ce480e960cca1b Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Fri, 25 Dec 2009 23:14:26 -0500
Subject: [PATCH] Revert "wmi: Free the allocated acpi objects through wmi_get_event_data"
X-Patchwork-Hint: ignore

This reverts commit 3e9b988e4edf065d39c1343937f717319b1c1065.

Reported-by: Sedat Dilek <sedat.dilek@googlemail.com>
Tested-by Maciej Rutecki <maciej.rutecki@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/platform/x86/dell-wmi.c |    1 -
 drivers/platform/x86/hp-wmi.c   |    2 --
 drivers/platform/x86/wmi.c      |    4 ++--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index 916ccb2..46244c6 100644
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -238,7 +238,6 @@ static void dell_wmi_notify(u32 value, void *context)
 			input_sync(dell_wmi_input_dev);
 		}
 	}
-	kfree(obj);
 }
 
 
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 8781d8f..222ab57 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -388,8 +388,6 @@ static void hp_wmi_notify(u32 value, void *context)
 	} else
 		printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n",
 			eventcode);
-
-	kfree(obj);
 }
 
 static int __init hp_wmi_input_setup(void)
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 9f93d6c..e425a86 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -540,8 +540,8 @@ EXPORT_SYMBOL_GPL(wmi_remove_notify_handler);
 /**
  * wmi_get_event_data - Get WMI data associated with an event
  *
- * @event: Event to find
- * @out: Buffer to hold event data. out->pointer should be freed with kfree()
+ * @event - Event to find
+ * &out - Buffer to hold event data
  *
  * Returns extra data associated with an event in WMI.
  */
-- 
1.6.6.rc4.11.g129a5

Re: kernel problem 2.6.33-rc2

[Randy Dunlap]

On Fri, 25 Dec 2009 23:18:57 -0500 (EST) Len Brown wrote:

> > dell_wmi_init
> 
> Please try this patch.
> 
> From d11e073ee3e3091d9190dace97ce480e960cca1b Mon Sep 17 00:00:00 2001
> From: Len Brown <len.brown@intel.com>
> Date: Fri, 25 Dec 2009 23:14:26 -0500
> Subject: [PATCH] Revert "wmi: Free the allocated acpi objects through wmi_get_event_data"
> X-Patchwork-Hint: ignore
> 
> This reverts commit 3e9b988e4edf065d39c1343937f717319b1c1065.
> 
> Reported-by: Sedat Dilek <sedat.dilek@googlemail.com>
> Tested-by Maciej Rutecki <maciej.rutecki@gmail.com>
> Signed-off-by: Len Brown <len.brown@intel.com>
> ---
>  drivers/platform/x86/dell-wmi.c |    1 -
>  drivers/platform/x86/hp-wmi.c   |    2 --
>  drivers/platform/x86/wmi.c      |    4 ++--
>  3 files changed, 2 insertions(+), 5 deletions(-)

> diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
> index 9f93d6c..e425a86 100644
> --- a/drivers/platform/x86/wmi.c
> +++ b/drivers/platform/x86/wmi.c
> @@ -540,8 +540,8 @@ EXPORT_SYMBOL_GPL(wmi_remove_notify_handler);
>  /**
>   * wmi_get_event_data - Get WMI data associated with an event
>   *
> - * @event: Event to find
> - * @out: Buffer to hold event data. out->pointer should be freed with kfree()
> + * @event - Event to find
> + * &out - Buffer to hold event data

The '+' kernel-doc formatting is incorrect.
Needs to use ':'s and @out.


>   *
>   * Returns extra data associated with an event in WMI.
>   */


---
~Randy

Re: kernel problem 2.6.33-rc2

[Anisse Astier]

On Fri, 25 Dec 2009 23:18:57 -0500 (EST), Len Brown <lenb@kernel.org> wrote :

> > dell_wmi_init
> 
> Please try this patch.
> 
> From d11e073ee3e3091d9190dace97ce480e960cca1b Mon Sep 17 00:00:00 2001
> From: Len Brown <len.brown@intel.com>
> Date: Fri, 25 Dec 2009 23:14:26 -0500
> Subject: [PATCH] Revert "wmi: Free the allocated acpi objects through wmi_get_event_data"
> X-Patchwork-Hint: ignore
> 
> This reverts commit 3e9b988e4edf065d39c1343937f717319b1c1065.
> 
> Reported-by: Sedat Dilek <sedat.dilek@googlemail.com>
> Tested-by Maciej Rutecki <maciej.rutecki@gmail.com>
> Signed-off-by: Len Brown <len.brown@intel.com>

Hi, please try this patch as well. This should be the proper fix.


From: Anisse Astier <anisse@astier.eu>
Date: Mon, 28 Dec 2009 10:27:30 +0100
Subject: [PATCH] hp-wmi: remove double free

Commit 3e9b988e4edf065d39c1343937f717319b1c1065 had the same purpose as commit
44ef00e6482e755f36629773abc2aee83a6f53e3 .
Signed-off-by: Anisse Astier <anisse@astier.eu>
Reported-by: Sedat Dilek <sedat.dilek@googlemail.com>

---
 drivers/platform/x86/hp-wmi.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 8781d8f..222ab57 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -388,8 +388,6 @@ static void hp_wmi_notify(u32 value, void *context)
 	} else
 		printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n",
 			eventcode);
-
-	kfree(obj);
 }
 
 static int __init hp_wmi_input_setup(void)
-- 
1.6.5.7