aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-08-25 20:57:06 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-08-25 20:57:06 +0200
commitb483d3b8a54a544ab8854ca6dbb8d99c423b3ba4 (patch)
tree83f0a5234da6435fc0669468e70472d36caec543
parent56db6a8e5a5942930b6e788e555e58f0f68edbd5 (diff)
parent99c31bff185610304532c4acf00cda341572e2d4 (diff)
Merge branch 'pnp'acpi-6.6-rc1
Merge a PNP change for 6.6-rc1: - Fix string truncation warning in pnpacpi_add_device() (Sunil V L). * pnp: PNP: ACPI: Fix string truncation warning
-rw-r--r--drivers/pnp/pnpacpi/core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 38928ff7472b..6ab272c84b7b 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -254,6 +254,9 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
else
strncpy(dev->name, acpi_device_bid(device), sizeof(dev->name));
+ /* Handle possible string truncation */
+ dev->name[sizeof(dev->name) - 1] = '\0';
+
if (dev->active)
pnpacpi_parse_allocated_resource(dev);