From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=3.0 tests=DATE_IN_PAST_12_24, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EB9AC4CECE for ; Sun, 15 Mar 2020 02:17:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6102F2076D for ; Sun, 15 Mar 2020 02:17:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727492AbgCOCQ7 (ORCPT ); Sat, 14 Mar 2020 22:16:59 -0400 Received: from cloudserver094114.home.pl ([79.96.170.134]:46885 "EHLO cloudserver094114.home.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727053AbgCOCQ7 (ORCPT ); Sat, 14 Mar 2020 22:16:59 -0400 Received: from 185.80.35.16 (185.80.35.16) (HELO kreacher.localnet) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83.341) id 6d6fd7fd2b52e13a; Sat, 14 Mar 2020 11:16:57 +0100 From: "Rafael J. Wysocki" To: Takashi Iwai Cc: linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, Bjorn Helgaas , Len Brown Subject: Re: [PATCH] PCI/ACPI: Use scnprintf() for avoiding potential buffer overflow Date: Sat, 14 Mar 2020 11:16:57 +0100 Message-ID: <3406356.oH3LicebqW@kreacher> In-Reply-To: <20200311070958.3791-1-tiwai@suse.de> References: <20200311070958.3791-1-tiwai@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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 > --- > 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!