From: Colin Ian King <[email protected]> intel_menlow_memory_remove sanity checks to see if device is null, however, this check is performed after we have already passed device into a call to acpi_driver_data. If device is null, then acpi_driver_data will produce a null pointer dereference on device. The correct action is to sanity check device, then assign cdev, then check if cdev is null.
Signed-off-by: Colin Ian King <[email protected]> --- drivers/platform/x86/intel_menlow.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c index 0a919d8..185a1bd 100644 --- a/drivers/platform/x86/intel_menlow.c +++ b/drivers/platform/x86/intel_menlow.c @@ -196,9 +196,13 @@ static int intel_menlow_memory_add(struct acpi_device *device) static int intel_menlow_memory_remove(struct acpi_device *device) { - struct thermal_cooling_device *cdev = acpi_driver_data(device); + struct thermal_cooling_device *cdev; + + if (!device) + return -EINVAL; - if (!device || !cdev) + cdev = acpi_driver_data(device); + if (!cdev) return -EINVAL; sysfs_remove_link(&device->dev.kobj, "thermal_cooling"); -- 2.7.4
