xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwmon: (ibmpowernv) Use scnprintf() for avoiding potential buffer overflow

Browse Source 
Since snprintf() returns the would-be-output size instead of the
actual output size, the succeeding calls may go beyond the given
buffer limit.  Fix it by replacing with scnprintf().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Takashi Iwai
2020-03-11 08:39:44 +01:00
committed by Guenter Roeck
parent 86da28eed4
commit 6a096871b2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/hwmon/ibmpowernv.c
View File

@@ -186,7 +186,7 @@ static void make_sensor_label(struct device_node *np,
u32 id; u32 id;
size_t n; size_t n;
n = snprintf(sdata->label, sizeof(sdata->label), "%s", label); n = scnprintf(sdata->label, sizeof(sdata->label), "%s", label);
/* /*
* Core temp pretty print * Core temp pretty print
@@ -199,11 +199,11 @@ static void make_sensor_label(struct device_node *np,
* The digital thermal sensors are associated * The digital thermal sensors are associated
* with a core. * with a core.
*/ */
n += snprintf(sdata->label + n, n += scnprintf(sdata->label + n,
sizeof(sdata->label) - n, " %d", sizeof(sdata->label) - n, " %d",
cpuid); cpuid);
else else
n += snprintf(sdata->label + n, n += scnprintf(sdata->label + n,
sizeof(sdata->label) - n, " phy%d", id); sizeof(sdata->label) - n, " phy%d", id);
} }
@@ -211,7 +211,7 @@ static void make_sensor_label(struct device_node *np,
* Membuffer pretty print * Membuffer pretty print
*/ */
if (!of_property_read_u32(np, "ibm,chip-id", &id)) if (!of_property_read_u32(np, "ibm,chip-id", &id))
n += snprintf(sdata->label + n, sizeof(sdata->label) - n, n += scnprintf(sdata->label + n, sizeof(sdata->label) - n,
" %d", id & 0xffff); " %d", id & 0xffff);
} }