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

Commit 24aebadd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: thermal: validate cdev sysfs state request before using it"

parents d09499e9 73d583e7

drivers/thermal/cpu_cooling.c

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 *  Copyright (C) 2012  Amit Daniel <amit.kachhap@linaro.org>

 *

 *  Copyright (C) 2014  Viresh Kumar <viresh.kumar@linaro.org>

 *  Copyright (c) 2022  Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 *  This program is free software; you can redistribute it and/or modify
@@ -364,7 +365,7 @@ static int cpufreq_set_min_state(struct thermal_cooling_device *cdev, 
	unsigned int floor_freq;



	if (state > cpufreq_cdev->max_level)

		state = cpufreq_cdev->max_level;

		return -EINVAL;



	if (cpufreq_cdev->cpufreq_floor_state == state)

		return 0;

drivers/thermal/devfreq_cooling.c

+4 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *                  devfreq

 *

 * Copyright (C) 2014-2015 ARM Limited

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -140,14 +141,14 @@ static int devfreq_cooling_set_min_state(struct thermal_cooling_device *cdev, 
	struct device *dev = df->dev.parent;

	int ret;



	if (state >= dfc->freq_table_size)

		return -EINVAL;



	if (state == dfc->cooling_min_state)

		return 0;



	dev_dbg(dev, "Setting cooling min state %lu\n", state);



	if (state >= dfc->freq_table_size)

		state = dfc->freq_table_size - 1;



	ret = partition_enable_opps(dfc, dfc->cooling_state, state);

	if (ret)

		return ret;

drivers/thermal/qcom/qmi_cooling.c

+7 −6
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#define pr_fmt(fmt) "%s:%s " fmt, KBUILD_MODNAME, __func__
@@ -270,12 +271,12 @@ static int qmi_set_cur_state(struct thermal_cooling_device *cdev, 
	if (!qmi_cdev)

		return -EINVAL;



	if (qmi_cdev->type == QMI_CDEV_MIN_LIMIT_TYPE)

		return 0;



	if (state > qmi_cdev->max_level)

		return -EINVAL;



	if (qmi_cdev->type == QMI_CDEV_MIN_LIMIT_TYPE)

		return 0;



	return qmi_set_cur_or_min_state(qmi_cdev, state);

}
@@ -287,12 +288,12 @@ static int qmi_set_min_state(struct thermal_cooling_device *cdev, 
	if (!qmi_cdev)

		return -EINVAL;



	if (state > qmi_cdev->max_level)

		return -EINVAL;



	if (qmi_cdev->type == QMI_CDEV_MAX_LIMIT_TYPE)

		return 0;



	if (state > qmi_cdev->max_level)

		state = qmi_cdev->max_level;



	/* Convert state into QMI client expects for min state */

	state = qmi_cdev->max_level - state;

drivers/thermal/qcom/rpm_smd_cooling_device.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2018, 2021, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#define pr_fmt(fmt) "%s:%s " fmt, KBUILD_MODNAME, __func__
@@ -95,7 +96,7 @@ static int rpm_smd_set_cur_state(struct thermal_cooling_device *cdev, 
	int ret = 0;



	if (state > (RPM_SMD_TEMP_MAX_NR - 1))

		state = RPM_SMD_TEMP_MAX_NR - 1;

		return -EINVAL;



	ret = rpm_smd_send_request_to_rpm(rpm_smd_dev, (unsigned int)state);

	if (ret)