From: Jonathan Cameron <jic23@kernel.org>
To: Takashi Iwai <tiwai@suse.de>
Cc: linux-iio@vger.kernel.org, Brian Masney <masneyb@onstation.org>
Subject: Re: [PATCH 2/2] iio: tsl2772: Use scnprintf() for avoiding potential buffer overflow
Date: Sun, 15 Mar 2020 09:58:34 +0000 [thread overview]
Message-ID: <20200315095834.76f50454@archlinux> (raw)
In-Reply-To: <20200311074325.7922-3-tiwai@suse.de>
On Wed, 11 Mar 2020 08:43:25 +0100
Takashi Iwai <tiwai@suse.de> 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 with scnprintf().
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
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
> ---
> drivers/iio/light/tsl2772.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/light/tsl2772.c b/drivers/iio/light/tsl2772.c
> index be37fcbd4654..44a0b56a558c 100644
> --- a/drivers/iio/light/tsl2772.c
> +++ b/drivers/iio/light/tsl2772.c
> @@ -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;
> }
>
next prev parent reply other threads:[~2020-03-15 9:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-11 7:43 [PATCH 0/2] iio: Use scnprintf() for avoiding potential buffer overflow Takashi Iwai
2020-03-11 7:43 ` [PATCH 1/2] iio: core: " Takashi Iwai
2020-03-15 9:54 ` Jonathan Cameron
2020-03-15 10:17 ` Takashi Iwai
2020-03-11 7:43 ` [PATCH 2/2] iio: tsl2772: " Takashi Iwai
2020-03-15 9:58 ` Jonathan Cameron [this message]
2020-03-15 10:25 ` Takashi Iwai
2020-03-15 10:33 ` Brian Masney
2020-03-15 13:10 ` Jonathan Cameron
2020-03-16 8:04 ` Takashi Iwai
2020-03-16 11:50 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200315095834.76f50454@archlinux \
--to=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=masneyb@onstation.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).