Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PM / devfreq: Fix buffer overflow in trans_stat_show

Browse source 
commit 08e23d05fa6dc4fc13da0ccf09defdd4bbc92ff4 upstream.

Fix buffer overflow in trans_stat_show().

Convert simple snprintf to the more secure scnprintf with size of
PAGE_SIZE.

Add condition checking if we are exceeding PAGE_SIZE and exit early from
loop. Also add at the end a warning that we exceeded PAGE_SIZE and that
stats is disabled.

Return -EFBIG in the case where we don't have enough space to write the
full transition table.

Also document in the ABI that this function can return -EFBIG error.

Link: https://lore.kernel.org/all/20231024183016.14648-2-ansuelsmth@gmail.com/
Cc: stable@vger.kernel.org
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218041
Fixes: e552bbaf5b98 ("PM / devfreq: Add sysfs node for representing frequency transition information.")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Marangi 2023-10-24 20:30:15 +02:00 committed by Ksawlii
parent d1c499bdf6
commit 5a5d3a7e42
2 changed files with 43 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Documentation/ABI/testing/sysfs-class-devfreq
View file

@ -66,6 +66,9 @@ Description:
echo 0 > /sys/class/devfreq/.../trans_stat echo 0 > /sys/class/devfreq/.../trans_stat
If the transition table is bigger than PAGE_SIZE, reading
this will return an -EFBIG error.
What: /sys/class/devfreq/.../userspace/set_freq What: /sys/class/devfreq/.../userspace/set_freq
Date: September 2011 Date: September 2011
Contact: MyungJoo Ham <myungjoo.ham@samsung.com> Contact: MyungJoo Ham <myungjoo.ham@samsung.com>

59
drivers/devfreq/devfreq.c
View file

@ -1641,7 +1641,7 @@ static ssize_t trans_stat_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct devfreq *df = to_devfreq(dev); struct devfreq *df = to_devfreq(dev);
ssize_t len; ssize_t len = 0;
int i, j; int i, j;
unsigned int max_state; unsigned int max_state;
@ -1650,7 +1650,7 @@ static ssize_t trans_stat_show(struct device *dev,
max_state = df->profile->max_state; max_state = df->profile->max_state;
if (max_state == 0) if (max_state == 0)
return sprintf(buf, "Not Supported.\n"); return scnprintf(buf, PAGE_SIZE, "Not Supported.\n");
mutex_lock(&df->lock); mutex_lock(&df->lock);
if (!df->stop_polling && if (!df->stop_polling &&
@ -1660,33 +1660,54 @@ static ssize_t trans_stat_show(struct device *dev,
} }
mutex_unlock(&df->lock); mutex_unlock(&df->lock);
len = sprintf(buf, " From : To\n"); len += scnprintf(buf + len, PAGE_SIZE - len, " From : To\n");
len += sprintf(buf + len, " :"); len += scnprintf(buf + len, PAGE_SIZE - len, " :");
for (i = 0; i < max_state; i++) for (i = 0; i < max_state; i++) {
len += sprintf(buf + len, "%10lu", if (len >= PAGE_SIZE - 1)
df->profile->freq_table[i]); break;
len += scnprintf(buf + len, PAGE_SIZE - len, "%10lu",
df->profile->freq_table[i]);
}
if (len >= PAGE_SIZE - 1)
return PAGE_SIZE - 1;
len += sprintf(buf + len, " time(ms)\n"); len += scnprintf(buf + len, PAGE_SIZE - len, " time(ms)\n");
for (i = 0; i < max_state; i++) { for (i = 0; i < max_state; i++) {
if (len >= PAGE_SIZE - 1)
break;
if (df->profile->freq_table[i] if (df->profile->freq_table[i]
== df->previous_freq) { == df->previous_freq) {
len += sprintf(buf + len, "*"); len += scnprintf(buf + len, PAGE_SIZE - len, "*");
} else { } else {
len += sprintf(buf + len, " "); len += scnprintf(buf + len, PAGE_SIZE - len, " ");
} }
len += sprintf(buf + len, "%10lu:", if (len >= PAGE_SIZE - 1)
df->profile->freq_table[i]); break;
for (j = 0; j < max_state; j++)
len += sprintf(buf + len, "%10u",
df->stats.trans_table[(i * max_state) + j]);
len += sprintf(buf + len, "%10llu\n", (u64) len += scnprintf(buf + len, PAGE_SIZE - len, "%10lu:",
jiffies64_to_msecs(df->stats.time_in_state[i])); df->profile->freq_table[i]);
for (j = 0; j < max_state; j++) {
if (len >= PAGE_SIZE - 1)
break;
len += scnprintf(buf + len, PAGE_SIZE - len, "%10u",
df->stats.trans_table[(i * max_state) + j]);
}
if (len >= PAGE_SIZE - 1)
break;
len += scnprintf(buf + len, PAGE_SIZE - len, "%10llu\n", (u64)
jiffies64_to_msecs(df->stats.time_in_state[i]));
}
if (len < PAGE_SIZE - 1)
len += scnprintf(buf + len, PAGE_SIZE - len, "Total transition : %u\n",
df->stats.total_trans);
if (len >= PAGE_SIZE - 1) {
pr_warn_once("devfreq transition table exceeds PAGE_SIZE. Disabling\n");
return -EFBIG;
} }
len += sprintf(buf + len, "Total transition : %u\n",
df->stats.total_trans);
return len; return len;
} }