From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Takashi Iwai <tiwai@suse.de>
Cc: linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org,
Bjorn Helgaas <bhelgaas@google.com>, Len Brown <lenb@kernel.org>
Subject: Re: [PATCH] PCI/ACPI: Use scnprintf() for avoiding potential buffer overflow
Date: Sat, 14 Mar 2020 11:16:57 +0100 [thread overview]
Message-ID: <3406356.oH3LicebqW@kreacher> (raw)
In-Reply-To: <20200311070958.3791-1-tiwai@suse.de>
On Wednesday, March 11, 2020 8:09:58 AM CET 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/acpi/pci_root.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
> index d1e666ef3fcc..f92df2533e7e 100644
> --- a/drivers/acpi/pci_root.c
> +++ b/drivers/acpi/pci_root.c
> @@ -153,7 +153,7 @@ static void decode_osc_bits(struct acpi_pci_root *root, char *msg, u32 word,
> buf[0] = '\0';
> for (i = 0, entry = table; i < size; i++, entry++)
> if (word & entry->bit)
> - len += snprintf(buf + len, sizeof(buf) - len, "%s%s",
> + len += scnprintf(buf + len, sizeof(buf) - len, "%s%s",
> len ? " " : "", entry->desc);
>
> dev_info(&root->device->dev, "_OSC: %s [%s]\n", msg, buf);
>
Applied as 5.7 material, thanks!
prev parent reply other threads:[~2020-03-15 2:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-11 7:09 [PATCH] PCI/ACPI: Use scnprintf() for avoiding potential buffer overflow Takashi Iwai
2020-03-14 10:16 ` Rafael J. Wysocki [this message]
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=3406356.oH3LicebqW@kreacher \
--to=rjw@rjwysocki.net \
--cc=bhelgaas@google.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-pci@vger.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 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).