thermal: Add a sanity check for invalid state at stats update
PATCH 1/1 thermal: Add a sanity check for invalid state at stats update
The thermal sysfs handler keeps the statistics table with the fixed size that was determined from the initial max_states() call, and the table entry is updated at each sysfs cur_state write call. And, when the driver's set_cur_state() ops accepts the value given from user-space, the thermal sysfs core blindly applies it to the statistics table entry, which may overflow and cause an Oops. Although it's rather a bug in the driver's ops implementations, we shouldn't crash but rather give a proper warning instead.
This patch adds a sanity check for avoiding such an OOB access and warns with a stack trace to show the suspicious device in question.
---
We've hit some crash by stress tests, and this patch at least works around the crash itself. While the actual bug fix of the buggy driver is still being investigated, I submit the hardening in the core side at first.
drivers/thermal/thermal_sysfs.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/thermal/thermal_sysfs.c +5 -0
@@ -772,6 +772,11 @@ void thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev,spin_lock (&stats->lock); +if (dev_WARN_ONCE (&cdev->device, new_state >= stats->max_states, +"new state %ld exceeds max_state %ld" , + new_state, stats->max_states)) + goto unlock; +if (stats->state == new_state) goto unlock;
Signature · 1 line
2.16.4
Quoted 10 lines · Takashi Iwai
The thermal sysfs handler keeps the statistics table with the fixed size that was determined from the initial
max_states()call, and the table entry is updated at each sysfscur_statewrite call. And, when the driver'sset_cur_state()ops accepts the value given from user-space, the thermal sysfs core blindly applies it to the statistics table entry, which may overflow and cause an Oops. Although it's rather a bug in the driver's ops implementations, we shouldn't crash but rather give a proper warning instead.
Quoted 2 lines
This patch adds a sanity check for avoiding such an OOB access and warns with a stack trace to show the suspicious device in question.
Hi Takashi,
Instead of this warning, I think we should reject such input when writing to cur_state.
See attached patch. If you think this OK, I'll submit it.
Regards,
Amit
Quoted 28 lines
Signed-off-by Takashi Iwai <[email protected]>---
We've hit some crash by stress tests, and this patch at least works around the crash itself. While the actual bug fix of the buggy driver is still being investigated, I submit the hardening in the core side at first.
drivers/thermal/thermal_sysfs.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/thermal/thermal_sysfs.c +5
-1@@ -772,6 +772,11 @@ void thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev,spin_lock (&stats->lock); +if (dev_WARN_ONCE (&cdev->device, new_state >= stats->max_states, +"new state %ld exceeds max_state %ld" , + new_state, stats->max_states)) + goto unlock; +if (stats->state == new_state) goto unlock; --
Quoted 2 lines
2.16.4
From 54266260d483ab4476510dd4461a1cafc611e17d Mon Sep 17 00:00:00 2001
Message-Id: <54266260d483ab4476510dd4461a1cafc611e17d.1586266224.git.amit.kucheria@linaro.org>
From: Amit Kucheria <[email protected]>
Date: Tue, 7 Apr 2020 18:48:14 +0530
Subject: [PATCH] thermal: Reject invalid cur_state input from userspace
We don't check if the cur_state value input in sysfs is greater than the maximum cooling state that the cooling device supports. This can cause access to unallocated memory in case THERMAL_STATISTICS in enabled and could also crash cooling devices that don't check for an invalid state in their set_cur_state() callback.
Return an error if the state being requested in greater than the maximum cooling state the device supports.
--- drivers/thermal/thermal_sysfs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/thermal/thermal_sysfs.c +8 -1
@@ -703,7 +703,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 )
@@ -712,6 +712,13 @@ cur_state_store(struct device *dev, struct device_attribute *attr,if ((long )state <0 )return -EINVAL ; + result = cdev->ops->get_max_state (cdev, &max_state); +if (result) +return result; + +if (state >= max_state) +return -EINVAL ; +mutex_lock (&cdev->lock); result = cdev->ops->set_cur_state (cdev, state);
Signature · 1 line
2.20.1
Quoted 15 lines · Amit Kucheria
Quoted 10 lines · Takashi Iwai
The thermal sysfs handler keeps the statistics table with the fixed size that was determined from the initial
max_states()call, and the table entry is updated at each sysfscur_statewrite call. And, when the driver'sset_cur_state()ops accepts the value given from user-space, the thermal sysfs core blindly applies it to the statistics table entry, which may overflow and cause an Oops. Although it's rather a bug in the driver's ops implementations, we shouldn't crash but rather give a proper warning instead.Quoted 2 lines
This patch adds a sanity check for avoiding such an OOB access and warns with a stack trace to show the suspicious device in question.
Quoted 6 lines
Hi Takashi,
Instead of this warning, I think we should reject such input when writing to
cur_state.See attached patch. If you think this OK, I'll submit it.
Actually the input value itself is correct, the problem is rather about the max_states that may vary depending on other driver. So IMO, we don't want to refuse the input completely.
Please see the thread:
https://lore.kernel.org/linux-acpi/[email protected]/
thanks,
Takashi
Quoted 85 lines
Regards,
AmitQuoted 28 lines
Signed-off-by Takashi Iwai <[email protected]>---
We've hit some crash by stress tests, and this patch at least works around the crash itself. While the actual bug fix of the buggy driver is still being investigated, I submit the hardening in the core side at first.
drivers/thermal/thermal_sysfs.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/thermal/thermal_sysfs.c +5
-1@@ -772,6 +772,11 @@ void thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev,spin_lock (&stats->lock); +if (dev_WARN_ONCE (&cdev->device, new_state >= stats->max_states, +"new state %ld exceeds max_state %ld" , + new_state, stats->max_states)) + goto unlock; +if (stats->state == new_state) goto unlock; --Quoted 2 lines
2.16.4
From
54266260d483ab4476510dd4461a1cafc611e17dMon Sep 17 00:00:00 2001
Message-Id: <54266260d483ab4476510dd4461a1cafc611e17d.1586266224.git.amit.kucheria@linaro.org>
From: Amit Kucheria <[email protected]>
Date: Tue, 7 Apr 2020 18:48:14 +0530
Subject: [PATCH] thermal: Reject invalidcur_stateinput from userspaceWe don't check if the
cur_statevalue input in sysfs is greater than the maximum cooling state that the cooling device supports. This can cause access to unallocated memory in caseTHERMAL_STATISTICSin enabled and could also crash cooling devices that don't check for an invalid state in theirset_cur_state()callback.Return an error if the state being requested in greater than the maximum cooling state the device supports.
Reported-by Takashi Iwai <[email protected]>Signed-off-by Amit Kucheria <[email protected]>--- drivers/thermal/thermal_sysfs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)drivers/thermal/thermal_sysfs.c +8
-1@@ -703,7 +703,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 )@@ -712,6 +712,13 @@ cur_state_store(struct device *dev, struct device_attribute *attr,if ((long )state <0 )return -EINVAL ; + result = cdev->ops->get_max_state (cdev, &max_state); +if (result) +return result; + +if (state >= max_state) +return -EINVAL ; +mutex_lock (&cdev->lock); result = cdev->ops->set_cur_state (cdev, state);Signature · 1 line
2.20.1
Zhang, Rui
reviewerRight, I have a V2 patch series, which will be post soon.
Thanks,
rui
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Takashi Iwai
Sent: Tuesday, April 07, 2020 10:13 PM
To: Amit Kucheria <[email protected]>
Cc: Takashi Iwai <[email protected]>; Zhang, Rui <[email protected]>; Daniel Lezcano <[email protected]>; Linux PM list <[email protected]>; LKML <[email protected]>
Subject: Re: [PATCH] thermal: Add a sanity check for invalid state at stats update
Importance: High
Quoted 15 lines · Amit Kucheria
Quoted 10 lines · Takashi Iwai
The thermal sysfs handler keeps the statistics table with the fixed size that was determined from the initial
max_states()call, and the table entry is updated at each sysfscur_statewrite call. And, when the driver'sset_cur_state()ops accepts the value given from user-space, the thermal sysfs core blindly applies it to the statistics table entry, which may overflow and cause an Oops. Although it's rather a bug in the driver's ops implementations, we shouldn't crash but rather give a proper warning instead.Quoted 2 lines
This patch adds a sanity check for avoiding such an OOB access and warns with a stack trace to show the suspicious device in question.
Quoted 6 lines
Hi Takashi,
Instead of this warning, I think we should reject such input when writing to
cur_state.See attached patch. If you think this OK, I'll submit it.
Actually the input value itself is correct, the problem is rather about the max_states that may vary depending on other driver. So IMO, we don't want to refuse the input completely.
Please see the thread:
https://lore.kernel.org/linux-acpi/[email protected]/
thanks,
Takashi
Quoted 91 lines
Regards,
AmitQuoted 30 lines
Signed-off-by Takashi Iwai <[email protected]>---
We've hit some crash by stress tests, and this patch at least works around the crash itself. While the actual bug fix of the buggy driver is still being investigated, I submit the hardening in the core side at first.
drivers/thermal/thermal_sysfs.c | 5 +++++ 1 file changed, 5 insertions(+)(quoted diff) +0
-0
b/drivers/thermal/thermal_sysfs.cindexaa99edb4dff7..a23c4e701d63100644drivers/thermal/thermal_sysfs.c +5
-1@@ -772,6 +772,11 @@ void thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev,spin_lock (&stats->lock); +if (dev_WARN_ONCE (&cdev->device, new_state >= stats->max_states, +"new state %ld exceeds max_state %ld" , + new_state, stats->max_states)) + goto unlock; +if (stats->state == new_state) goto unlock; --Quoted 2 lines
2.16.4
From
54266260d483ab4476510dd4461a1cafc611e17dMon Sep 17 00:00:00 2001 Message-Id:
<54266260d483ab4476510dd4461a1cafc611e17d.1586266224.git.amit.kucheria @linaro.org>
From: Amit Kucheria <[email protected]>
Date: Tue, 7 Apr 2020 18:48:14 +0530
Subject: [PATCH] thermal: Reject invalidcur_stateinput from userspaceWe don't check if the
cur_statevalue input in sysfs is greater than the maximum cooling state that the cooling device supports. This can cause access to unallocated memory in caseTHERMAL_STATISTICSin enabled and could also crash cooling devices that don't check for an invalid state in theirset_cur_state()callback.Return an error if the state being requested in greater than the maximum cooling state the device supports.
Reported-by Takashi Iwai <[email protected]>Signed-off-by Amit Kucheria <[email protected]>--- drivers/thermal/thermal_sysfs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/thermal/thermal_sysfs.cindex7e1d11bdd258..8033e5a9386a100644drivers/thermal/thermal_sysfs.c +1
-1@@ -703,7 +703,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) @@ -712,6 +712,13 @@cur_state_store(struct device *dev, struct
device_attribute*attr,drivers/thermal/thermal_sysfs.c +7
-1if ((long )state <0 )return -EINVAL ; + result = cdev->ops->get_max_state (cdev, &max_state); +if (result) +return result; + +if (state >= max_state) +return -EINVAL ; +mutex_lock (&cdev->lock); result = cdev->ops->set_cur_state (cdev, state); --2.20.1
Zhang, Rui
reviewerToo late for me to post it out by this midnight, will post it out tomorrow.
Thanks,
rui
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Zhang, Rui
Sent: Tuesday, April 07, 2020 10:17 PM
To: Takashi Iwai <[email protected]>; Amit Kucheria <[email protected]>
Cc: Daniel Lezcano <[email protected]>; Linux PM list <[email protected]>; LKML <[email protected]>
Subject: RE: [PATCH] thermal: Add a sanity check for invalid state at stats update
Right, I have a V2 patch series, which will be post soon.
Thanks,
rui
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Takashi Iwai
Sent: Tuesday, April 07, 2020 10:13 PM
To: Amit Kucheria <[email protected]>
Cc: Takashi Iwai <[email protected]>; Zhang, Rui <[email protected]>; Daniel Lezcano <[email protected]>; Linux PM list <[email protected]>; LKML <[email protected]>
Subject: Re: [PATCH] thermal: Add a sanity check for invalid state at stats update
Importance: High
Quoted 15 lines · Amit Kucheria
Quoted 10 lines · Takashi Iwai
The thermal sysfs handler keeps the statistics table with the fixed size that was determined from the initial
max_states()call, and the table entry is updated at each sysfscur_statewrite call. And, when the driver'sset_cur_state()ops accepts the value given from user-space, the thermal sysfs core blindly applies it to the statistics table entry, which may overflow and cause an Oops. Although it's rather a bug in the driver's ops implementations, we shouldn't crash but rather give a proper warning instead.Quoted 2 lines
This patch adds a sanity check for avoiding such an OOB access and warns with a stack trace to show the suspicious device in question.
Quoted 6 lines
Hi Takashi,
Instead of this warning, I think we should reject such input when writing to
cur_state.See attached patch. If you think this OK, I'll submit it.
Actually the input value itself is correct, the problem is rather about the max_states that may vary depending on other driver. So IMO, we don't want to refuse the input completely.
Please see the thread:
https://lore.kernel.org/linux-acpi/[email protected]/
thanks,
Takashi
Quoted 91 lines
Regards,
AmitQuoted 30 lines
Signed-off-by Takashi Iwai <[email protected]>---
We've hit some crash by stress tests, and this patch at least works around the crash itself. While the actual bug fix of the buggy driver is still being investigated, I submit the hardening in the core side at first.
drivers/thermal/thermal_sysfs.c | 5 +++++ 1 file changed, 5 insertions(+)(quoted diff) +0
-0
b/drivers/thermal/thermal_sysfs.cindexaa99edb4dff7..a23c4e701d63100644drivers/thermal/thermal_sysfs.c +5
-1@@ -772,6 +772,11 @@ void thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev,spin_lock (&stats->lock); +if (dev_WARN_ONCE (&cdev->device, new_state >= stats->max_states, +"new state %ld exceeds max_state %ld" , + new_state, stats->max_states)) + goto unlock; +if (stats->state == new_state) goto unlock; --Quoted 2 lines
2.16.4
From
54266260d483ab4476510dd4461a1cafc611e17dMon Sep 17 00:00:00 2001 Message-Id:
<54266260d483ab4476510dd4461a1cafc611e17d.1586266224.git.amit.kucheria @linaro.org>
From: Amit Kucheria <[email protected]>
Date: Tue, 7 Apr 2020 18:48:14 +0530
Subject: [PATCH] thermal: Reject invalidcur_stateinput from userspaceWe don't check if the
cur_statevalue input in sysfs is greater than the maximum cooling state that the cooling device supports. This can cause access to unallocated memory in caseTHERMAL_STATISTICSin enabled and could also crash cooling devices that don't check for an invalid state in theirset_cur_state()callback.Return an error if the state being requested in greater than the maximum cooling state the device supports.
Reported-by Takashi Iwai <[email protected]>Signed-off-by Amit Kucheria <[email protected]>--- drivers/thermal/thermal_sysfs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/thermal/thermal_sysfs.cindex7e1d11bdd258..8033e5a9386a100644drivers/thermal/thermal_sysfs.c +1
-1@@ -703,7 +703,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) @@ -712,6 +712,13 @@cur_state_store(struct device *dev, struct
device_attribute*attr,drivers/thermal/thermal_sysfs.c +7
-1if ((long )state <0 )return -EINVAL ; + result = cdev->ops->get_max_state (cdev, &max_state); +if (result) +return result; + +if (state >= max_state) +return -EINVAL ; +mutex_lock (&cdev->lock); result = cdev->ops->set_cur_state (cdev, state); --2.20.1