diff options
| author | Pali Rohár <pali.rohar@gmail.com> | 2015-06-23 10:11:19 +0200 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2015-06-24 20:22:02 -0700 |
| commit | b8830a4e71b15d0364ac8e6c55301eea73f211da (patch) | |
| tree | 606cb40e27418e25a19e99c01bbee1361e213fb3 /drivers/platform | |
| parent | 2e19f93fecc502e68131e4433ef8d57ffa22bc3b (diff) | |
| download | linux-stable-b8830a4e71b15d0364ac8e6c55301eea73f211da.tar.gz linux-stable-b8830a4e71b15d0364ac8e6c55301eea73f211da.tar.bz2 linux-stable-b8830a4e71b15d0364ac8e6c55301eea73f211da.zip | |
dell-laptop: Fix allocating & freeing SMI buffer page
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>
Cc: stable@vger.kernel.org
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers/platform')
| -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 9724613c28a6..35758cbc6bc8 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -306,7 +306,6 @@ static const struct dmi_system_id dell_quirks[] __initconst = { }; static struct calling_interface_buffer *buffer; -static struct page *bufferpage; static DEFINE_MUTEX(buffer_mutex); static int hwswitch_state; @@ -2068,12 +2067,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); ret = dell_setup_rfkill(); @@ -2135,7 +2133,7 @@ static int __init dell_init(void) fail_backlight: dell_cleanup_rfkill(); fail_rfkill: - free_page((unsigned long)bufferpage); + free_page((unsigned long)buffer); fail_buffer: platform_device_del(platform_device); fail_platform_device2: |