Skip to content

Commit

Permalink
Merge tag 'pm+acpi-4.4-final' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/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
  • Loading branch information
torvalds committed Jan 8, 2016
2 parents 650e545 + 9db22d9 commit 496b0b5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/acpi/device_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 496b0b5

Please sign in to comment.