Commit b1d0907c authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman

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

[ Upstream commit 13b86f50 ]

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: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56dfe52e
...@@ -194,6 +194,7 @@ static int int3403_cdev_add(struct int3403_priv *priv) ...@@ -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) ...@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment