p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

thermal: int3403_thermal: Fix NULL pointer deref on module load / probe 

Starting with kernel 4.17 thermal_cooling_device_register() will call the
get_max_state() op during register.

Since we deref priv->priv in int3403_get_max_state() this means we must
set priv->priv before calling thermal_cooling_device_register().

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
This commit is contained in:
Hans de Goede 2018-04-22 19:56:17 +02:00 committed by Zhang Rui
parent 6d08b06e67
commit 13b86f50ea
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/thermal/int340x_thermal/int3403_thermal.c
View File

@ -194,6 +194,7 @@ static int int3403_cdev_add(struct int3403_priv *priv)
return -EFAULT; return -EFAULT;
} }
priv->priv = obj;
obj->max_state = p->package.count - 1; obj->max_state = p->package.count - 1;
obj->cdev = obj->cdev =
thermal_cooling_device_register(acpi_device_bid(priv->adev), thermal_cooling_device_register(acpi_device_bid(priv->adev),
@ -201,8 +202,6 @@ static int int3403_cdev_add(struct int3403_priv *priv)
if (IS_ERR(obj->cdev)) if (IS_ERR(obj->cdev))
result = PTR_ERR(obj->cdev); result = PTR_ERR(obj->cdev);
priv->priv = obj;
kfree(buf.pointer); kfree(buf.pointer);
/* TODO: add ACPI notification support */ /* TODO: add ACPI notification support */