Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

thermal: max77620: fix device-node reference imbalance

The thermal child device reuses the parent MFD-device device-tree node
when registering a thermal zone, but did not take a reference to the
node.

This leads to a reference imbalance, and potential use-after-free, when
the node reference is dropped by the platform-bus device destructor
(once for the child and later again for the parent).

Fix this by dropping any reference already held to a device-tree node
and getting a reference to the parent's node which will be balanced on
reprobe or on platform-device release, whichever comes first.

Note that simply clearing the of_node pointer on probe errors and on
driver unbind would not allow the use of device-managed resources as
specifically thermal_zone_of_sensor_unregister() claims that a valid
device-tree node pointer is needed during deregistration (even if it
currently does not seem to use it).

Fixes: ec4664b3fd6d ("thermal: max77620: Add thermal driver for reporting junction temp")
Cc: stable <stable@vger.kernel.org> # 4.9
Cc: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Johan Hovold and committed by
Greg Kroah-Hartman
c592fafb 2bf69867

+8 -2
+8 -2
drivers/thermal/max77620_thermal.c
··· 104 104 return -EINVAL; 105 105 } 106 106 107 - pdev->dev.of_node = pdev->dev.parent->of_node; 108 - 109 107 mtherm->dev = &pdev->dev; 110 108 mtherm->rmap = dev_get_regmap(pdev->dev.parent, NULL); 111 109 if (!mtherm->rmap) { 112 110 dev_err(&pdev->dev, "Failed to get parent regmap\n"); 113 111 return -ENODEV; 114 112 } 113 + 114 + /* 115 + * Drop any current reference to a device-tree node and get a 116 + * reference to the parent's node which will be balanced on reprobe or 117 + * on platform-device release. 118 + */ 119 + of_node_put(pdev->dev.of_node); 120 + pdev->dev.of_node = of_node_get(pdev->dev.parent->of_node); 115 121 116 122 mtherm->tz_device = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, 117 123 mtherm, &max77620_thermal_ops);