aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-08 15:50:59 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-08 15:50:59 -0800
commit496b0b57c00f2193f2902dd70b219df5a4dfce94 (patch)
treeee152ae53deb7d1369baa284f60a78aad89e0c1a
parent650e5455d83dafb465b478000507468152d3c523 (diff)
parent9db22d928ca92629f0deb18efed265c4b7c2aa5e (diff)
downloadleg-kernel-496b0b57c00f2193f2902dd70b219df5a4dfce94.tar.gz
Merge tag 'pm+acpi-4.4-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki: "Just one obvious fix that adds a missing function argument in ACPI code introduced recently (Kees Cook)" * tag 'pm+acpi-4.4-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / property: avoid leaking format string into kobject name
-rw-r--r--drivers/acpi/device_sysfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/device_sysfs.c b/drivers/acpi/device_sysfs.c
index 707cf6213bc2..b9afb47db7ed 100644
--- a/drivers/acpi/device_sysfs.c
+++ b/drivers/acpi/device_sysfs.c
@@ -104,7 +104,7 @@ static void acpi_expose_nondev_subnodes(struct kobject *kobj,
init_completion(&dn->kobj_done);
ret = kobject_init_and_add(&dn->kobj, &acpi_data_node_ktype,
- kobj, dn->name);
+ kobj, "%s", dn->name);
if (ret)
acpi_handle_err(dn->handle, "Failed to expose (%d)\n", ret);
else