Commit 1569045e authored by Pali Rohár's avatar Pali Rohár Committed by Luis Henriques

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>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 9ab4ea7c
...@@ -272,7 +272,6 @@ static struct dmi_system_id dell_quirks[] = { ...@@ -272,7 +272,6 @@ static struct dmi_system_id 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;
...@@ -825,12 +824,11 @@ static int __init dell_init(void) ...@@ -825,12 +824,11 @@ 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) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail_buffer; goto fail_buffer;
} }
buffer = page_address(bufferpage);
ret = dell_setup_rfkill(); ret = dell_setup_rfkill();
...@@ -892,7 +890,7 @@ static int __init dell_init(void) ...@@ -892,7 +890,7 @@ static int __init dell_init(void)
cancel_delayed_work_sync(&dell_rfkill_work); cancel_delayed_work_sync(&dell_rfkill_work);
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