From: Varad Gautam <varadgautam@google.com>
To: linux-kernel@vger.kernel.org
Cc: "Rafael J . Wysocki" <rafael@kernel.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Amit Kucheria <amitk@kernel.org>, Zhang Rui <rui.zhang@intel.com>,
linux-pm@vger.kernel.org, Varad Gautam <varadgautam@google.com>,
stable@vger.kernel.org
Subject: [PATCH] thermal: sysfs: Perform bounds check when storing thermal states
Date: Tue, 5 Jul 2022 15:00:02 +0000 [thread overview]
Message-ID: <20220705150002.2016207-1-varadgautam@google.com> (raw)
Check that a user-provided thermal state is within the maximum
thermal states supported by a given driver before attempting to
apply it. This prevents a subsequent OOB access in
thermal_cooling_device_stats_update() while performing
state-transition accounting on drivers that do not have this check
in their set_cur_state() handle.
Signed-off-by: Varad Gautam <varadgautam@google.com>
Cc: stable@vger.kernel.org
---
drivers/thermal/thermal_sysfs.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index 1c4aac8464a7..0c6b0223b133 100644
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -607,7 +607,7 @@ cur_state_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
struct thermal_cooling_device *cdev = to_cooling_device(dev);
- unsigned long state;
+ unsigned long state, max_state;
int result;
if (sscanf(buf, "%ld\n", &state) != 1)
@@ -618,10 +618,20 @@ cur_state_store(struct device *dev, struct device_attribute *attr,
mutex_lock(&cdev->lock);
+ result = cdev->ops->get_max_state(cdev, &max_state);
+ if (result)
+ goto unlock;
+
+ if (state > max_state) {
+ result = -EINVAL;
+ goto unlock;
+ }
+
result = cdev->ops->set_cur_state(cdev, state);
if (!result)
thermal_cooling_device_stats_update(cdev, state);
+unlock:
mutex_unlock(&cdev->lock);
return result ? result : count;
}
--
2.37.0.rc0.161.g10f37bed90-goog
next reply other threads:[~2022-07-05 15:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-05 15:00 Varad Gautam [this message]
2022-07-05 16:18 ` [PATCH] thermal: sysfs: Perform bounds check when storing thermal states Greg KH
2022-07-05 21:02 ` Varad Gautam
2022-07-06 6:45 ` Greg KH
2022-07-06 7:16 ` Varad Gautam
2022-07-06 8:51 ` Zhang Rui
2022-07-06 9:21 ` Greg KH
2022-07-06 10:01 ` Varad Gautam
2022-07-06 10:21 ` Greg KH
2022-07-06 12:30 ` Varad Gautam
2022-07-06 12:51 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220705150002.2016207-1-varadgautam@google.com \
--to=varadgautam@google.com \
--cc=amitk@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rui.zhang@intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox