From: Dan Carpenter <error27@gmail.com>

Date: Mon, 27 Feb 2023 13:06:50 +0300

Subject: [PATCH] thermal: intel: quark_dts: fix error pointer dereference

References: bsc#1012628

Patch-mainline: 6.2.5

Git-commit: f1b930e740811d416de4d2074da48b6633a672c8

[ Upstream commit f1b930e740811d416de4d2074da48b6633a672c8 ]

If alloc_soc_dts() fails, then we can just return.  Trying to free

"soc_dts" will lead to an Oops.

Fixes: 8c1876939663 ("thermal: intel Quark SoC X1000 DTS thermal driver")

Signed-off-by: Dan Carpenter <error27@gmail.com>

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/thermal/intel/intel_quark_dts_thermal.c | 12 ++----------

 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/thermal/intel/intel_quark_dts_thermal.c b/drivers/thermal/intel/intel_quark_dts_thermal.c

index 3eafc6b0..b43fbd5e 100644

--- a/drivers/thermal/intel/intel_quark_dts_thermal.c

+++ b/drivers/thermal/intel/intel_quark_dts_thermal.c

@@ -415,22 +415,14 @@ MODULE_DEVICE_TABLE(x86cpu, qrk_thermal_ids);

 static int __init intel_quark_thermal_init(void)

 {

-	int err = 0;

-

 	if (!x86_match_cpu(qrk_thermal_ids) || !iosf_mbi_available())

 		return -ENODEV;

 	soc_dts = alloc_soc_dts();

-	if (IS_ERR(soc_dts)) {

-		err = PTR_ERR(soc_dts);

-		goto err_free;

-	}

+	if (IS_ERR(soc_dts))

+		return PTR_ERR(soc_dts);

 	return 0;

-

-err_free:

-	free_soc_dts(soc_dts);

-	return err;

 }

 static void __exit intel_quark_thermal_exit(void)

-- 

2.35.3