diff options
| author | Pali Rohár <pali.rohar@gmail.com> | 2015-06-23 10:11:19 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-08-04 16:52:30 +0200 |
| commit | 6fefe16344a1f6b4618610a0908345969401bfbc (patch) | |
| tree | f89ce0b71a3dbd98169db8a131d3aa5ed71f007c /drivers | |
| parent | 3b1221b1eccef318d19b917ec78e8b30c8a75df6 (diff) | |
dell-laptop: Fix allocating & freeing SMI buffer page
commit b8830a4e71b15d0364ac8e6c55301eea73f211da 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: Pali Rohár <pali.rohar@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/x86/dell-laptop.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index bb77e18b3dd4..a974c2761b5f 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -264,7 +264,6 @@ static struct dmi_system_id dell_quirks[] = { }; static struct calling_interface_buffer *buffer; -static struct page *bufferpage; static DEFINE_MUTEX(buffer_mutex); static int hwswitch_state; @@ -550,12 +549,11 @@ static int __init dell_init(void) * Allocate buffer below 4GB for SMI data--only 32-bit physical addr * is passed to SMI handler. */ - bufferpage = alloc_page(GFP_KERNEL | GFP_DMA32); - if (!bufferpage) { + buffer = (void *)__get_free_page(GFP_KERNEL | GFP_DMA32); + if (!buffer) { ret = -ENOMEM; goto fail_buffer; } - buffer = page_address(bufferpage); if (quirks && quirks->touchpad_led) touchpad_led_init(&platform_device->dev); @@ -603,7 +601,7 @@ static int __init dell_init(void) return 0; fail_backlight: - free_page((unsigned long)bufferpage); + free_page((unsigned long)buffer); fail_buffer: platform_device_del(platform_device); fail_platform_device2: |