drivers/base/cpu: Use scnprintf() for avoiding potential buffer overflow
PATCH 1/1 drivers/base/cpu: Use scnprintf() for avoiding potential buffer overflow
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().
--- drivers/base/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/base/cpu.c +4 -4
@@ -231,7 +231,7 @@ static struct cpu_attr cpu_attrs[] = {static ssize_t print_cpus_kernel_max (struct device *dev,struct device_attribute *attr,char *buf) { -int n =snprintf (buf,PAGE_SIZE -2 ,"%d\n" ,NR_CPUS -1 ); +int n =scnprintf (buf,PAGE_SIZE -2 ,"%d\n" ,NR_CPUS -1 );return n; } static DEVICE_ATTR(kernel_max, 0444, print_cpus_kernel_max, NULL);
@@ -258,13 +258,13 @@ static ssize_t print_cpus_offline(struct device *dev, buf[n++] =',' ;if (nr_cpu_ids == total_cpus-1 ) - n +=snprintf (&buf[n], len - n,"%u" , nr_cpu_ids); + n +=scnprintf (&buf[n], len - n,"%u" , nr_cpu_ids);else - n +=snprintf (&buf[n], len - n,"%u-%d" , + n +=scnprintf (&buf[n], len - n,"%u-%d" , nr_cpu_ids, total_cpus-1 ); } - n +=snprintf (&buf[n], len - n,"\n" ); + n +=scnprintf (&buf[n], len - n,"\n" );return n; } static DEVICE_ATTR(offline, 0444, print_cpus_offline, NULL);
Signature · 1 line
2.16.4
Greg Kroah-Hartman
maintainerQuoted 14 lines · Takashi Iwai
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 withscnprintf().Signed-off-by Takashi Iwai <[email protected]>--- drivers/base/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/base/cpu.c +0
-0
drivers/base/cpu.c static struct cpu_attr cpu_attrs[] = { · line 234
Quoted 5 lines
drivers/base/cpu.c +1
-1@@ -231,7 +231,7 @@ static struct cpu_attr cpu_attrs[] = {static ssize_t print_cpus_kernel_max (struct device *dev,struct device_attribute *attr,char *buf) { -int n =snprintf (buf,PAGE_SIZE -2 ,"%d\n" ,NR_CPUS -1 ); +int n =scnprintf (buf,PAGE_SIZE -2 ,"%d\n" ,NR_CPUS -1 );
This should just be "sprintf()" as we "know" that fitting a single number will work.
Quoted 7 lines
drivers/base/cpu.c +0
-0return n; } static DEVICE_ATTR(kernel_max, 0444, print_cpus_kernel_max, NULL);@@ -258,13 +258,13 @@ static ssize_t print_cpus_offline(struct device *dev, buf[n++] =',' ;if (nr_cpu_ids == total_cpus-1 )
drivers/base/cpu.c static ssize_t print_cpus_offline(struct device *dev, · line 267
Quoted 10 lines
drivers/base/cpu.c +3
-3- n +=snprintf (&buf[n], len - n,"%u" , nr_cpu_ids); + n +=scnprintf (&buf[n], len - n,"%u" , nr_cpu_ids); else - n += snprintf(&buf[n], len - n, "%u-%d", + n += scnprintf(&buf[n], len - n, "%u-%d", nr_cpu_ids, total_cpus-1); } - n +=snprintf (&buf[n], len - n,"\n" ); + n +=scnprintf (&buf[n], len - n,"\n" );
this part looks sane, can you respin this?
thanks,
greg k-h
Quoted 40 lines · Greg Kroah-Hartman
Quoted 14 lines · Takashi Iwai
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 withscnprintf().Signed-off-by Takashi Iwai <[email protected]>--- drivers/base/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/base/cpu.c +0
-0drivers/base/cpu.c static struct cpu_attr cpu_attrs[] = { · line 234
Quoted 5 lines
drivers/base/cpu.c +1
-1@@ -231,7 +231,7 @@ static struct cpu_attr cpu_attrs[] = {static ssize_t print_cpus_kernel_max (struct device *dev,struct device_attribute *attr,char *buf) { -int n =snprintf (buf,PAGE_SIZE -2 ,"%d\n" ,NR_CPUS -1 ); +int n =scnprintf (buf,PAGE_SIZE -2 ,"%d\n" ,NR_CPUS -1 );This should just be "
sprintf()" as we "know" that fitting a single number will work.Quoted 15 lines
drivers/base/cpu.c +2
-2return n; } static DEVICE_ATTR(kernel_max, 0444, print_cpus_kernel_max, NULL);@@ -258,13 +258,13 @@ static ssize_t print_cpus_offline(struct device *dev, buf[n++] =',' ;if (nr_cpu_ids == total_cpus-1 ) - n +=snprintf (&buf[n], len - n,"%u" , nr_cpu_ids); + n +=scnprintf (&buf[n], len - n,"%u" , nr_cpu_ids);else - n +=snprintf (&buf[n], len - n,"%u-%d" , + n +=scnprintf (&buf[n], len - n,"%u-%d" , nr_cpu_ids, total_cpus-1 ); }
Quoted 4 lines
drivers/base/cpu.c static ssize_t print_cpus_offline(struct device *dev, · line 267
Quoted 2 lines
drivers/base/cpu.c +1
-1- n +=snprintf (&buf[n], len - n,"\n" ); + n +=scnprintf (&buf[n], len - n,"\n" );this part looks sane, can you respin this?
OK, will do it.
Thanks for a quick review!
Takashi