Commit 496b0b57 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 650e5455 9db22d92
...@@ -104,7 +104,7 @@ static void acpi_expose_nondev_subnodes(struct kobject *kobj, ...@@ -104,7 +104,7 @@ static void acpi_expose_nondev_subnodes(struct kobject *kobj,
init_completion(&dn->kobj_done); init_completion(&dn->kobj_done);
ret = kobject_init_and_add(&dn->kobj, &acpi_data_node_ktype, ret = kobject_init_and_add(&dn->kobj, &acpi_data_node_ktype,
kobj, dn->name); kobj, "%s", dn->name);
if (ret) if (ret)
acpi_handle_err(dn->handle, "Failed to expose (%d)\n", ret); acpi_handle_err(dn->handle, "Failed to expose (%d)\n", ret);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment