PCI/ACPI: Use scnprintf() for avoiding potential buffer overflow
PATCH 1/1 PCI/ACPI: 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().
Signed-off-by Takashi Iwai <[email protected]>
--- drivers/acpi/pci_root.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/pci_root.c +1 -1
@@ -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);
Signature · 1 line
2.16.4
Rafael J. Wysocki
AppliedQuoted 15 lines · CET Takashi Iwai
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]>--- drivers/acpi/pci_root.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/acpi/pci_root.c +0
-0
drivers/acpi/pci_root.c static void decode_osc_bits(struct acpi_pci_root *root, char *msg, u32 word, · line 159
Quoted 8 lines
drivers/acpi/pci_root.c +1
-1@@ -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!