iio: Use scnprintf() for avoiding potential buffer overflow
cover iio: Use scnprintf() for avoiding potential buffer overflow
Hi,
a trivial patchset to replace snprintf() calls with the safer scnprintf() calls for avoiding potential buffer overflows.
Takashi
===
Takashi Iwai (2):
iio: core: Use scnprintf() for avoiding potential buffer overflow
iio: tsl2772: Use scnprintf() for avoiding potential buffer overflow
drivers/iio/industrialio-core.c | 34 +++++++++++++++++----------------- drivers/iio/light/tsl2772.c | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-)
Signature · 1 line
2.16.4
PATCH 1/2 iio: core: 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/iio/industrialio-core.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/iio/industrialio-core.c +17 -17
@@ -559,46 +559,46 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type,switch (type) {case IIO_VAL_INT : -return snprintf (buf, len,"%d" , vals[0 ]); +return scnprintf (buf, len,"%d" , vals[0 ]);case IIO_VAL_INT_PLUS_MICRO_DB : scale_db = true;/* fall through */ case IIO_VAL_INT_PLUS_MICRO :if (vals[1 ] <0 ) -return snprintf (buf, len,"-%d.%06u%s" ,abs (vals[0 ]), +return scnprintf (buf, len,"-%d.%06u%s" ,abs (vals[0 ]), -vals[1 ], scale_db ?" dB" :"" );else -return snprintf (buf, len,"%d.%06u%s" , vals[0 ], vals[1 ], +return scnprintf (buf, len,"%d.%06u%s" , vals[0 ], vals[1 ], scale_db ?" dB" :"" );case IIO_VAL_INT_PLUS_NANO :if (vals[1 ] <0 ) -return snprintf (buf, len,"-%d.%09u" ,abs (vals[0 ]), +return scnprintf (buf, len,"-%d.%09u" ,abs (vals[0 ]), -vals[1 ]);else -return snprintf (buf, len,"%d.%09u" , vals[0 ], vals[1 ]); +return scnprintf (buf, len,"%d.%09u" , vals[0 ], vals[1 ]);case IIO_VAL_FRACTIONAL : tmp =div_s64 ((s64 )vals[0 ] *1000000000LL , vals[1 ]); tmp1 = vals[1 ]; tmp0 = (int )div_s64_rem (tmp,1000000000 , &tmp1); -return snprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1)); +return scnprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1));case IIO_VAL_FRACTIONAL_LOG2 : tmp =shift_right ((s64 )vals[0 ] *1000000000LL , vals[1 ]); tmp0 = (int )div_s64_rem (tmp,1000000000LL , &tmp1); -return snprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1)); +return scnprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1));case IIO_VAL_INT_MULTIPLE : {int i;int l =0 ;for (i =0 ; i < size; ++i) { - l +=snprintf (&buf[l], len - l,"%d " , vals[i]); + l +=scnprintf (&buf[l], len - l,"%d " , vals[i]);if (l >= len)break ; }return l; }case IIO_VAL_CHAR : -return snprintf (buf, len,"%c" , (char )vals[0 ]); +return scnprintf (buf, len,"%c" , (char )vals[0 ]);default :return 0 ; }
@@ -669,10 +669,10 @@ static ssize_t iio_format_avail_list(char *buf, const int *vals,if (len >=PAGE_SIZE )return -EFBIG ;if (i < length -1 ) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len," " );else - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"\n" );if (len >=PAGE_SIZE )return -EFBIG ;
@@ -685,10 +685,10 @@ static ssize_t iio_format_avail_list(char *buf, const int *vals,if (len >=PAGE_SIZE )return -EFBIG ;if (i < length /2 -1 ) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len," " );else - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"\n" );if (len >=PAGE_SIZE )return -EFBIG ;
@@ -712,10 +712,10 @@ static ssize_t iio_format_avail_range(char *buf, const int *vals, int type)if (len >=PAGE_SIZE )return -EFBIG ;if (i <2 ) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len," " );else - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"]\n" );if (len >=PAGE_SIZE )return -EFBIG ;
@@ -728,10 +728,10 @@ static ssize_t iio_format_avail_range(char *buf, const int *vals, int type)if (len >=PAGE_SIZE )return -EFBIG ;if (i <2 ) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len," " );else - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"]\n" );if (len >=PAGE_SIZE )return -EFBIG ;
Signature · 1 line
2.16.4
Jonathan Cameron
maintainerRe: [PATCH 1/2] iio: core: Use scnprintf() for avoiding potential buffer overflow
Quoted 3 lines · On Wed, 11 Mar 2020 08:43:24 +0100 Takashi Iwai <[email protected]> wrote:
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().
Hmm. This is definitely in the somewhat theoretical bug category, but given it can be called to print a list of values that is defined in a driver, fair enough - it's good protection.
I'm not going to rush this in given we don't have any drivers that are known to run into this. Hence I've queued it up for the togreg branch of iio.git targeting the merge window rather than as a fix.
Thanks,
Jonathan
Quoted 118 lines
Signed-off-by Takashi Iwai <[email protected]>--- drivers/iio/industrialio-core.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)drivers/iio/industrialio-core.c +17
-17@@ -559,46 +559,46 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type,switch (type) {case IIO_VAL_INT : -return snprintf (buf, len,"%d" , vals[0 ]); +return scnprintf (buf, len,"%d" , vals[0 ]);case IIO_VAL_INT_PLUS_MICRO_DB : scale_db = true;/* fall through */ case IIO_VAL_INT_PLUS_MICRO :if (vals[1 ] <0 ) -return snprintf (buf, len,"-%d.%06u%s" ,abs (vals[0 ]), +return scnprintf (buf, len,"-%d.%06u%s" ,abs (vals[0 ]), -vals[1 ], scale_db ?" dB" :"" );else -return snprintf (buf, len,"%d.%06u%s" , vals[0 ], vals[1 ], +return scnprintf (buf, len,"%d.%06u%s" , vals[0 ], vals[1 ], scale_db ?" dB" :"" );case IIO_VAL_INT_PLUS_NANO :if (vals[1 ] <0 ) -return snprintf (buf, len,"-%d.%09u" ,abs (vals[0 ]), +return scnprintf (buf, len,"-%d.%09u" ,abs (vals[0 ]), -vals[1 ]);else -return snprintf (buf, len,"%d.%09u" , vals[0 ], vals[1 ]); +return scnprintf (buf, len,"%d.%09u" , vals[0 ], vals[1 ]);case IIO_VAL_FRACTIONAL : tmp =div_s64 ((s64 )vals[0 ] *1000000000LL , vals[1 ]); tmp1 = vals[1 ]; tmp0 = (int )div_s64_rem (tmp,1000000000 , &tmp1); -return snprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1)); +return scnprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1));case IIO_VAL_FRACTIONAL_LOG2 : tmp =shift_right ((s64 )vals[0 ] *1000000000LL , vals[1 ]); tmp0 = (int )div_s64_rem (tmp,1000000000LL , &tmp1); -return snprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1)); +return scnprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1));case IIO_VAL_INT_MULTIPLE : {int i;int l =0 ;for (i =0 ; i < size; ++i) { - l +=snprintf (&buf[l], len - l,"%d " , vals[i]); + l +=scnprintf (&buf[l], len - l,"%d " , vals[i]);if (l >= len)break ; }return l; }case IIO_VAL_CHAR : -return snprintf (buf, len,"%c" , (char )vals[0 ]); +return scnprintf (buf, len,"%c" , (char )vals[0 ]);default :return 0 ; }@@ -669,10 +669,10 @@ static ssize_t iio_format_avail_list(char *buf, const int *vals,if (len >=PAGE_SIZE )return -EFBIG ;if (i < length -1 ) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len," " );else - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"\n" );if (len >=PAGE_SIZE )return -EFBIG ;@@ -685,10 +685,10 @@ static ssize_t iio_format_avail_list(char *buf, const int *vals,if (len >=PAGE_SIZE )return -EFBIG ;if (i < length /2 -1 ) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len," " );else - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"\n" );if (len >=PAGE_SIZE )return -EFBIG ;@@ -712,10 +712,10 @@ static ssize_t iio_format_avail_range(char *buf, const int *vals, int type)if (len >=PAGE_SIZE )return -EFBIG ;if (i <2 ) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len," " );else - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"]\n" );if (len >=PAGE_SIZE )return -EFBIG ;@@ -728,10 +728,10 @@ static ssize_t iio_format_avail_range(char *buf, const int *vals, int type)if (len >=PAGE_SIZE )return -EFBIG ;if (i <2 ) - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len," " );else - len +=snprintf (buf + len,PAGE_SIZE - len, + len +=scnprintf (buf + len,PAGE_SIZE - len,"]\n" );if (len >=PAGE_SIZE )return -EFBIG ;
Re: [PATCH 1/2] iio: core: Use scnprintf() for avoiding potential buffer overflow
Quoted 8 lines · Jonathan Cameron
Quoted 3 lines · On Wed, 11 Mar 2020 08:43:24 +0100 Takashi Iwai <[email protected]> wrote:
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().
Quoted 8 lines
Hmm. This is definitely in the somewhat theoretical bug category, but given it can be called to print a list of values that is defined in a driver, fair enough - it's good protection.
I'm not going to rush this in given we don't have any drivers that are known to run into this. Hence I've queued it up for the togreg branch of iio.git targeting the merge window rather than as a fix.
Thanks, that's fine, the patches are just precautions.
Takashi
PATCH 2/2 iio: tsl2772: Use scnprintf() for avoiding potential buffer overflow
In reply to Takashi IwaiSince 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/iio/light/tsl2772.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/light/tsl2772.c +2 -2
@@ -986,7 +986,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev,int offset =0 ;while (i <TSL2772_MAX_LUX_TABLE_SIZE ) { - offset +=snprintf (buf + offset,PAGE_SIZE ,"%u,%u," , + offset +=scnprintf (buf + offset,PAGE_SIZE ,"%u,%u," , chip->tsl2772_device_lux[i].ch0, chip->tsl2772_device_lux[i].ch1);if (chip->tsl2772_device_lux[i].ch0 ==0 ) {
@@ -1000,7 +1000,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev, i++; } - offset +=snprintf (buf + offset,PAGE_SIZE ,"\n" ); + offset +=scnprintf (buf + offset,PAGE_SIZE ,"\n" );return offset; }
Signature · 1 line
2.16.4
Jonathan Cameron
maintainerRe: [PATCH 2/2] iio: tsl2772: Use scnprintf() for avoiding potential buffer overflow
Quoted 5 lines · On Wed, 11 Mar 2020 08:43:25 +0100 Takashi Iwai <[email protected]> wrote:
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]>
This one is printing a short well defined list of values. No way they go anywhere near the smallest possible PAGE_SIZE buffer that it's printing into.
Which is handy given the remaining space isn't adjusted as we add items to the string. Hence even with scnprintf it would overflow.
Brian, can you take a look at this when you get a moment?
Thanks,
Jonathan
Quoted 26 lines
--- drivers/iio/light/tsl2772.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iio/light/tsl2772.c +2
-2@@ -986,7 +986,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev,int offset =0 ;while (i <TSL2772_MAX_LUX_TABLE_SIZE ) { - offset +=snprintf (buf + offset,PAGE_SIZE ,"%u,%u," , + offset +=scnprintf (buf + offset,PAGE_SIZE ,"%u,%u," , chip->tsl2772_device_lux[i].ch0, chip->tsl2772_device_lux[i].ch1);if (chip->tsl2772_device_lux[i].ch0 ==0 ) {@@ -1000,7 +1000,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev, i++; } - offset +=snprintf (buf + offset,PAGE_SIZE ,"\n" ); + offset +=scnprintf (buf + offset,PAGE_SIZE ,"\n" );return offset; }
Re: [PATCH 2/2] iio: tsl2772: Use scnprintf() for avoiding potential buffer overflow
Quoted 8 lines · Jonathan Cameron
Quoted 4 lines · On Wed, 11 Mar 2020 08:43:25 +0100 Takashi Iwai <[email protected]> wrote:
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().
Quoted 8 lines
Quoted 1 line
Signed-off-by Takashi Iwai <[email protected]>This one is printing a short well defined list of values. No way they go anywhere near the smallest possible
PAGE_SIZEbuffer that it's printing into.Which is handy given the remaining space isn't adjusted as we add items to the string. Hence even with scnprintf it would overflow.
Well, the issue handled here isn't whether the string is truncated. Rather whether the pointer passed to the function go beyond the boundary.
In short, the call pattern like
pos += snprintf(buf, limit - pos, ...);
is wrong per design of snprintf(), unless you check the return value at each time. snprintf() doesn't return the actually truncated length but the length that would be. So, concatenating with snprintf() can go beyond the limit.
Meanwhile, simply replacing it with scnprintf() avoids the wrong pointer increment effectively, as it returns the actual output size, so it'd return zero if it's all truncated.
Practically seen, the current code should "work", but it's a wrong usage of snprintf(), as found in many other places. I've already submitted the patches to each subsystem to cover at least the concatenating cases like the above, and this is one of them.
thanks,
Takashi
Quoted 34 lines
Brian, can you take a look at this when you get a moment?
Thanks,
Jonathan
Quoted 26 lines
--- drivers/iio/light/tsl2772.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iio/light/tsl2772.c +2
-2@@ -986,7 +986,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev,int offset =0 ;while (i <TSL2772_MAX_LUX_TABLE_SIZE ) { - offset +=snprintf (buf + offset,PAGE_SIZE ,"%u,%u," , + offset +=scnprintf (buf + offset,PAGE_SIZE ,"%u,%u," , chip->tsl2772_device_lux[i].ch0, chip->tsl2772_device_lux[i].ch1);if (chip->tsl2772_device_lux[i].ch0 ==0 ) {@@ -1000,7 +1000,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev, i++; } - offset +=snprintf (buf + offset,PAGE_SIZE ,"\n" ); + offset +=scnprintf (buf + offset,PAGE_SIZE ,"\n" );return offset; }
Re: [PATCH 2/2] iio: tsl2772: Use scnprintf() for avoiding potential buffer overflow
In reply to Jonathan CameronQuoted 9 lines · Jonathan Cameron
Quoted 5 lines · On Wed, 11 Mar 2020 08:43:25 +0100 Takashi Iwai <[email protected]> wrote:
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]>
Quoted 8 lines
This one is printing a short well defined list of values. No way they go anywhere near the smallest possible
PAGE_SIZEbuffer that it's printing into.Which is handy given the remaining space isn't adjusted as we add items to the string. Hence even with scnprintf it would overflow.
Brian, can you take a look at this when you get a moment?
I also agree that this won't overflow in practice, however we should fix this up. Maybe the scnprintf() calls should be this:
offset += scnprintf(buf + offset, PAGE_SIZE - offset, ...);
Brian
Quoted 31 lines
Thanks,
Jonathan
Quoted 26 lines
--- drivers/iio/light/tsl2772.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iio/light/tsl2772.c +2
-2@@ -986,7 +986,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev,int offset =0 ;while (i <TSL2772_MAX_LUX_TABLE_SIZE ) { - offset +=snprintf (buf + offset,PAGE_SIZE ,"%u,%u," , + offset +=scnprintf (buf + offset,PAGE_SIZE ,"%u,%u," , chip->tsl2772_device_lux[i].ch0, chip->tsl2772_device_lux[i].ch1);if (chip->tsl2772_device_lux[i].ch0 ==0 ) {@@ -1000,7 +1000,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev, i++; } - offset +=snprintf (buf + offset,PAGE_SIZE ,"\n" ); + offset +=scnprintf (buf + offset,PAGE_SIZE ,"\n" );return offset; }
Jonathan Cameron
maintainerRe: [PATCH 2/2] iio: tsl2772: Use scnprintf() for avoiding potential buffer overflow
Quoted 17 lines · On Sun, 15 Mar 2020 06:33:58 -0400 Brian Masney <[email protected]> wrote:
Quoted 16 lines · Jonathan Cameron
Quoted 5 lines · On Wed, 11 Mar 2020 08:43:25 +0100 Takashi Iwai <[email protected]> wrote:
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]>This one is printing a short well defined list of values. No way they go anywhere near the smallest possible
PAGE_SIZEbuffer that it's printing into.Which is handy given the remaining space isn't adjusted as we add items to the string. Hence even with scnprintf it would overflow.
Quoted 6 lines
Quoted 1 line
Brian, can you take a look at this when you get a moment?
I also agree that this won't overflow in practice, however we should fix this up. Maybe the
scnprintf()calls should be this:offset += scnprintf(buf + offset, PAGE_SIZE - offset, ...);
Agreed.
Jonathan
Quoted 35 lines
Brian
Quoted 31 lines
Thanks,
Jonathan
Quoted 26 lines
--- drivers/iio/light/tsl2772.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iio/light/tsl2772.c +2
-2@@ -986,7 +986,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev,int offset =0 ;while (i <TSL2772_MAX_LUX_TABLE_SIZE ) { - offset +=snprintf (buf + offset,PAGE_SIZE ,"%u,%u," , + offset +=scnprintf (buf + offset,PAGE_SIZE ,"%u,%u," , chip->tsl2772_device_lux[i].ch0, chip->tsl2772_device_lux[i].ch1);if (chip->tsl2772_device_lux[i].ch0 ==0 ) {@@ -1000,7 +1000,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev, i++; } - offset +=snprintf (buf + offset,PAGE_SIZE ,"\n" ); + offset +=scnprintf (buf + offset,PAGE_SIZE ,"\n" );return offset; }
Re: [PATCH 2/2] iio: tsl2772: Use scnprintf() for avoiding potential buffer overflow
Quoted 21 lines · Jonathan Cameron
Quoted 17 lines · On Sun, 15 Mar 2020 06:33:58 -0400 Brian Masney <[email protected]> wrote:
Quoted 16 lines · Jonathan Cameron
Quoted 5 lines · On Wed, 11 Mar 2020 08:43:25 +0100 Takashi Iwai <[email protected]> wrote:
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]>This one is printing a short well defined list of values. No way they go anywhere near the smallest possible
PAGE_SIZEbuffer that it's printing into.Which is handy given the remaining space isn't adjusted as we add items to the string. Hence even with scnprintf it would overflow.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Brian, can you take a look at this when you get a moment?
I also agree that this won't overflow in practice, however we should fix this up. Maybe the
scnprintf()calls should be this:offset += scnprintf(buf + offset, PAGE_SIZE - offset, ...);Agreed.
Oh indeed, that must be. This was the totally overlooked point. So the code has to be corrected altogether.
Shall I respin the patch with that change?
thanks,
Takashi
Quoted 39 lines
Jonathan
Quoted 35 lines
Brian
Quoted 31 lines
Thanks,
Jonathan
Quoted 26 lines
--- drivers/iio/light/tsl2772.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iio/light/tsl2772.c +2
-2@@ -986,7 +986,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev,int offset =0 ;while (i <TSL2772_MAX_LUX_TABLE_SIZE ) { - offset +=snprintf (buf + offset,PAGE_SIZE ,"%u,%u," , + offset +=scnprintf (buf + offset,PAGE_SIZE ,"%u,%u," , chip->tsl2772_device_lux[i].ch0, chip->tsl2772_device_lux[i].ch1);if (chip->tsl2772_device_lux[i].ch0 ==0 ) {@@ -1000,7 +1000,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev, i++; } - offset +=snprintf (buf + offset,PAGE_SIZE ,"\n" ); + offset +=scnprintf (buf + offset,PAGE_SIZE ,"\n" );return offset; }
Re: [PATCH 2/2] iio: tsl2772: Use scnprintf() for avoiding potential buffer overflow
Quoted 28 lines · On Mon, 16 Mar 2020 09:04:46 +0100 Takashi Iwai <[email protected]> wrote:
Quoted 26 lines · Jonathan Cameron
Quoted 22 lines · On Sun, 15 Mar 2020 06:33:58 -0400 Brian Masney <[email protected]> wrote:
Quoted 9 lines · Jonathan Cameron
Quoted 5 lines · On Wed, 11 Mar 2020 08:43:25 +0100 Takashi Iwai <[email protected]> wrote:
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]>Quoted 8 lines
This one is printing a short well defined list of values. No way they go anywhere near the smallest possible
PAGE_SIZEbuffer that it's printing into.Which is handy given the remaining space isn't adjusted as we add items to the string. Hence even with scnprintf it would overflow.
Brian, can you take a look at this when you get a moment?
I also agree that this won't overflow in practice, however we should fix this up. Maybe the
scnprintf()calls should be this:
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
offset += scnprintf(buf + offset, PAGE_SIZE - offset, ...);Agreed.
Oh indeed, that must be. This was the totally overlooked point. So the code has to be corrected altogether.
Shall I respin the patch with that change?
That would be great!
It's always amazing what turns up once you start looking closely at a few lines of code :)
Jonathan
Quoted 45 lines
thanks,
Takashi
Quoted 39 lines
Jonathan
Quoted 35 lines
Brian
Quoted 31 lines
Thanks,
Jonathan
Quoted 26 lines
--- drivers/iio/light/tsl2772.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iio/light/tsl2772.c +2
-2@@ -986,7 +986,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev,int offset =0 ;while (i <TSL2772_MAX_LUX_TABLE_SIZE ) { - offset +=snprintf (buf + offset,PAGE_SIZE ,"%u,%u," , + offset +=scnprintf (buf + offset,PAGE_SIZE ,"%u,%u," , chip->tsl2772_device_lux[i].ch0, chip->tsl2772_device_lux[i].ch1);if (chip->tsl2772_device_lux[i].ch0 ==0 ) {@@ -1000,7 +1000,7 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev, i++; } - offset +=snprintf (buf + offset,PAGE_SIZE ,"\n" ); + offset +=scnprintf (buf + offset,PAGE_SIZE ,"\n" );return offset; }