Commit cdc06f91 authored by Johan Hovold's avatar Johan Hovold Committed by Rafael J. Wysocki
Browse files

cpuidle: qcom-spm: fix device and OF node leaks at probe 



Make sure to drop the reference to the saw device taken by
of_find_device_by_node() after retrieving its driver data during
probe().

Also drop the reference to the CPU node sooner to avoid leaking it in
case there is no saw node or device.

Fixes: 60f3692b ("cpuidle: qcom_spm: Detach state machine from main SPM handling")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 91418337

drivers/cpuidle/cpuidle-qcom-spm.c

+5 −2
Original line number Diff line number Diff line
@@ -96,20 +96,23 @@ static int spm_cpuidle_register(struct device *cpuidle_dev, int cpu) 
		return -ENODEV;



	saw_node = of_parse_phandle(cpu_node, "qcom,saw", 0);

	of_node_put(cpu_node);

	if (!saw_node)

		return -ENODEV;



	pdev = of_find_device_by_node(saw_node);

	of_node_put(saw_node);

	of_node_put(cpu_node);

	if (!pdev)

		return -ENODEV;



	data = devm_kzalloc(cpuidle_dev, sizeof(*data), GFP_KERNEL);

	if (!data)

	if (!data) {

		put_device(&pdev->dev);

		return -ENOMEM;

	}



	data->spm = dev_get_drvdata(&pdev->dev);

	put_device(&pdev->dev);

	if (!data->spm)

		return -EINVAL;