Commit 28d3ee40 authored by Kees Cook's avatar Kees Cook Committed by Rob Herring
Browse files

of: avoid format string parsing in kobject names 



This makes sure a format string cannot leak into the kobject name that
is constructed. (And splits the >80 character line.)

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent e1319ea5

drivers/of/base.c

+2 −1
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ static int __of_node_add(struct device_node *np) 
	np->kobj.kset = of_kset;

	if (!np->parent) {

		/* Nodes without parents are new top level trees */

		rc = kobject_add(&np->kobj, NULL, safe_name(&of_kset->kobj, "base"));

		rc = kobject_add(&np->kobj, NULL, "%s",

				 safe_name(&of_kset->kobj, "base"));

	} else {

		name = safe_name(&np->parent->kobj, kbasename(np->full_name));

		if (!name || !name[0])