From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Takashi Iwai <tiwai@suse.de>
Cc: "Rafael J . Wysocki" <rafael@kernel.org>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drivers/base/cpu: Use scnprintf() for avoiding potential buffer overflow
Date: Wed, 11 Mar 2020 08:19:35 +0100 [thread overview]
Message-ID: <20200311071935.GA3656396@kroah.com> (raw)
In-Reply-To: <20200311071200.4024-1-tiwai@suse.de>
On Wed, Mar 11, 2020 at 08:12:00AM +0100, Takashi Iwai 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>
> ---
> drivers/base/cpu.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
> index 6265871a4af2..0abcd9d68714 100644
> --- a/drivers/base/cpu.c
> +++ b/drivers/base/cpu.c
> @@ -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.
> 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");
this part looks sane, can you respin this?
thanks,
greg k-h
next prev parent reply other threads:[~2020-03-11 7:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-11 7:12 [PATCH] drivers/base/cpu: Use scnprintf() for avoiding potential buffer overflow Takashi Iwai
2020-03-11 7:19 ` Greg Kroah-Hartman [this message]
2020-03-11 7:24 ` Takashi Iwai
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=20200311071935.GA3656396@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.