Commit 800e58ae authored by Pali Rohár's avatar Pali Rohár Committed by Zefan Li

dell-laptop: Fix allocating & freeing SMI buffer page

commit b8830a4e upstream.

This commit fix kernel crash when probing for rfkill devices in dell-laptop
driver failed. Function free_page() was incorrectly used on struct page *
instead of virtual address of SMI buffer.

This commit also simplify allocating page for SMI buffer by using
__get_free_page() function instead of sequential call of functions
alloc_page() and page_address().
Signed-off-by: default avatarPali Rohár <pali.rohar@gmail.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
[lizf: Backported to 3.4: adjust context]
Signed-off-by: default avatarZefan Li <lizefan@huawei.com>
parent 019db118
...@@ -216,7 +216,6 @@ static struct dmi_system_id __devinitdata dell_quirks[] = { ...@@ -216,7 +216,6 @@ static struct dmi_system_id __devinitdata dell_quirks[] = {
}; };
static struct calling_interface_buffer *buffer; static struct calling_interface_buffer *buffer;
static struct page *bufferpage;
static DEFINE_MUTEX(buffer_mutex); static DEFINE_MUTEX(buffer_mutex);
static int hwswitch_state; static int hwswitch_state;
...@@ -714,11 +713,10 @@ static int __init dell_init(void) ...@@ -714,11 +713,10 @@ static int __init dell_init(void)
* Allocate buffer below 4GB for SMI data--only 32-bit physical addr * Allocate buffer below 4GB for SMI data--only 32-bit physical addr
* is passed to SMI handler. * is passed to SMI handler.
*/ */
bufferpage = alloc_page(GFP_KERNEL | GFP_DMA32); buffer = (void *)__get_free_page(GFP_KERNEL | GFP_DMA32);
if (!bufferpage) if (!buffer)
goto fail_buffer; goto fail_buffer;
buffer = page_address(bufferpage);
ret = dell_setup_rfkill(); ret = dell_setup_rfkill();
...@@ -787,7 +785,7 @@ static int __init dell_init(void) ...@@ -787,7 +785,7 @@ static int __init dell_init(void)
fail_filter: fail_filter:
dell_cleanup_rfkill(); dell_cleanup_rfkill();
fail_rfkill: fail_rfkill:
free_page((unsigned long)bufferpage); free_page((unsigned long)buffer);
fail_buffer: fail_buffer:
platform_device_del(platform_device); platform_device_del(platform_device);
fail_platform_device2: fail_platform_device2:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment