hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

platform/x86: 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 <92siuyang@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
Young Xiao 2019-05-29 09:55:51 +08:00 committed by Andy Shevchenko
parent 8d4b2daff2
commit 92a74ce3c4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/platform/x86/intel_menlow.c
View File

@ -180,9 +180,13 @@ static int intel_menlow_memory_add(struct acpi_device *device)
static int intel_menlow_memory_remove(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 || !cdev) if (!device)
return -EINVAL;
cdev = acpi_driver_data(device);
if (!cdev)
return -EINVAL; return -EINVAL;
sysfs_remove_link(&device->dev.kobj, "thermal_cooling"); sysfs_remove_link(&device->dev.kobj, "thermal_cooling");