diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2018-04-22 19:56:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-06-21 04:02:47 +0900 |
| commit | b1d0907c6feddcfe13f26b901d7e28c22d6650c0 (patch) | |
| tree | 67bb8c263e39112e2dfa9fd29a39b43fba25ee49 /drivers | |
| parent | 56dfe52e04a287eb8c1d25d8fcfaef9e32fcd2e8 (diff) | |
| download | linux-b1d0907c6feddcfe13f26b901d7e28c22d6650c0.tar.gz linux-b1d0907c6feddcfe13f26b901d7e28c22d6650c0.tar.bz2 linux-b1d0907c6feddcfe13f26b901d7e28c22d6650c0.zip | |
thermal: int3403_thermal: Fix NULL pointer deref on module load / probe
[ Upstream commit 13b86f50eaaddaea4bdd2fe476fd12e6a0951add ]
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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/thermal/int340x_thermal/int3403_thermal.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/thermal/int340x_thermal/int3403_thermal.c b/drivers/thermal/int340x_thermal/int3403_thermal.c index 8a7f24dd9315..0c19fcd56a0d 100644 --- a/drivers/thermal/int340x_thermal/int3403_thermal.c +++ b/drivers/thermal/int340x_thermal/int3403_thermal.c @@ -194,6 +194,7 @@ static int int3403_cdev_add(struct int3403_priv *priv) return -EFAULT; } + priv->priv = obj; obj->max_state = p->package.count - 1; obj->cdev = 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)) result = PTR_ERR(obj->cdev); - priv->priv = obj; - kfree(buf.pointer); /* TODO: add ACPI notification support */ |