Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13b86f50 authored by Hans de Goede's avatar Hans de Goede Committed by Zhang Rui
Browse files

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: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 6d08b06e

drivers/thermal/int340x_thermal/int3403_thermal.c

+1 −2
Original line number Diff line number Diff line
@@ -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 */