OSDN Git Service

platform/x86: dell-laptop: Allocate buffer before rfkill use
authorMario Limonciello <mario.limonciello@dell.com>
Wed, 15 Nov 2017 20:21:13 +0000 (14:21 -0600)
committerDarren Hart (VMware) <dvhart@infradead.org>
Fri, 17 Nov 2017 01:49:49 +0000 (17:49 -0800)
On machines using rfkill interface the buffer needs to have been
allocated before the initial use (memset) of it.

Reported-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
Tested-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
drivers/platform/x86/dell-laptop.c

index c4903c5..2d70436 100644 (file)
@@ -2073,6 +2073,11 @@ static int __init dell_init(void)
        if (ret)
                goto fail_platform_device2;
 
+       buffer = kzalloc(sizeof(struct calling_interface_buffer), GFP_KERNEL);
+       if (!buffer)
+               goto fail_buffer;
+
+
        ret = dell_setup_rfkill();
 
        if (ret) {
@@ -2080,10 +2085,6 @@ static int __init dell_init(void)
                goto fail_rfkill;
        }
 
-       buffer = kzalloc(sizeof(struct calling_interface_buffer), GFP_KERNEL);
-       if (!buffer)
-               goto fail_buffer;
-
        if (quirks && quirks->touchpad_led)
                touchpad_led_init(&platform_device->dev);