Commit 10d4879f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull thermal control fixes from Rafael Wysocki:
 "Fix two issues introduced recently and one driver problem leading to a
  NULL pointer dereference in some cases.

  Specifics:

   - Add missing EXPORT_SYMBOL_GPL in the thermal core and add back the
     required 'trips' property to the thermal zone DT bindings (Daniel
     Lezcano)

   - Prevent the int340x_thermal driver from crashing when a package
     with a buffer of 0 length is returned by an ACPI control method
     evaluated by it (Lee, Chun-Yi)"

* tag 'thermal-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal/int340x_thermal: handle data_vault when the value is ZERO_SIZE_PTR
  dt-bindings: thermal: Fix missing required property
  thermal/core: Add missing EXPORT_SYMBOL_GPL
parents b98f602d 3bf1b157

Documentation/devicetree/bindings/thermal/thermal-zones.yaml

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ patternProperties: 
      - polling-delay

      - polling-delay-passive

      - thermal-sensors

      - trips



    additionalProperties: false

drivers/thermal/intel/int340x_thermal/int3400_thermal.c

+5 −4
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static void int3400_setup_gddv(struct int3400_thermal_priv *priv) 
	priv->data_vault = kmemdup(obj->package.elements[0].buffer.pointer,

				   obj->package.elements[0].buffer.length,

				   GFP_KERNEL);

	if (!priv->data_vault)

	if (ZERO_OR_NULL_PTR(priv->data_vault))

		goto out_free;



	bin_attr_data_vault.private = priv->data_vault;
@@ -597,7 +597,7 @@ static int int3400_thermal_probe(struct platform_device *pdev) 
			goto free_imok;

	}



	if (priv->data_vault) {

	if (!ZERO_OR_NULL_PTR(priv->data_vault)) {

		result = sysfs_create_group(&pdev->dev.kobj,

					    &data_attribute_group);

		if (result)
@@ -615,6 +615,7 @@ static int int3400_thermal_probe(struct platform_device *pdev) 
free_sysfs:

	cleanup_odvp(priv);

	if (priv->data_vault) {

		if (!ZERO_OR_NULL_PTR(priv->data_vault))

			sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group);

		kfree(priv->data_vault);

	}
@@ -647,7 +648,7 @@ static int int3400_thermal_remove(struct platform_device *pdev) 
	if (!priv->rel_misc_dev_res)

		acpi_thermal_rel_misc_device_remove(priv->adev->handle);



	if (priv->data_vault)

	if (!ZERO_OR_NULL_PTR(priv->data_vault))

		sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group);

	sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group);

	sysfs_remove_group(&pdev->dev.kobj, &imok_attribute_group);

drivers/thermal/thermal_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1329,6 +1329,7 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t 
	kfree(tz);

	return ERR_PTR(result);

}

EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips);



struct thermal_zone_device *thermal_zone_device_register(const char *type, int ntrips, int mask,

							 void *devdata, struct thermal_zone_device_ops *ops,