Skip to content

Commit

Permalink
dell-laptop: fix a use-after-free error on the failure path
Browse files Browse the repository at this point in the history
dell_setup_rfkill() already cleans up the rfkill devices on failure.
So if it returns an error, we should not try to unregister the rfkill
devices.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Acked-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Alan Jenkins authored and Len Brown committed Dec 10, 2009
1 parent e1fbf34 commit 71e9dc7
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/platform/x86/dell-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ static int __init dell_init(void)

if (ret) {
printk(KERN_WARNING "dell-laptop: Unable to setup rfkill\n");
goto out;
goto fail_rfkill;
}

#ifdef CONFIG_ACPI
Expand Down Expand Up @@ -358,7 +358,7 @@ static int __init dell_init(void)
if (IS_ERR(dell_backlight_device)) {
ret = PTR_ERR(dell_backlight_device);
dell_backlight_device = NULL;
goto out;
goto fail_backlight;
}

dell_backlight_device->props.max_brightness = max_intensity;
Expand All @@ -368,13 +368,15 @@ static int __init dell_init(void)
}

return 0;
out:

fail_backlight:
if (wifi_rfkill)
rfkill_unregister(wifi_rfkill);
if (bluetooth_rfkill)
rfkill_unregister(bluetooth_rfkill);
if (wwan_rfkill)
rfkill_unregister(wwan_rfkill);
fail_rfkill:
kfree(da_tokens);
return ret;
}
Expand Down

0 comments on commit 71e9dc7

Please sign in to comment.