intel_menlow: avoid null pointer deference error
PATCH 1/1 intel_menlow: avoid null pointer deference error
Fix a null pointer deference by acpi_driver_data() if device is null (dereference before check). We should only set cdev and check this is OK after we are sure device is not null.
Signed-off-by Young Xiao <[email protected]>
--- drivers/platform/x86/intel_menlow.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/platform/x86/intel_menlow.c +6 -2
@@ -180,9 +180,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" );
Signature · 1 line
2.7.4
Quoted 5 lines · Young Xiao
Fix a null pointer deference by
acpi_driver_data()if device is null (dereference before check). We should only set cdev and check this is OK after we are sure device is not null.
Pushed to my review and testing queue, thanks!
Quoted 28 lines
Signed-off-by Young Xiao <[email protected]>--- drivers/platform/x86/intel_menlow.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/platform/x86/intel_menlow.c +6
-3@@ -180,9 +180,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
Signature · 2 lines
With Best Regards, Andy Shevchenko