Commit 2e030910 authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Rob Herring (Arm)
Browse files

of: module: remove strlen() call in of_modalias() 



In of_modalias(), there's no dire need to call strlen() (and then add 1
to its result to account for the 'C' char preceding the compat string).
Replace that strlen() with snprintf() (currently below it) -- this way,
we always try to print the compat string but then only advance the str
and len parameters iff the compat string fit into the remaining buffer
space...

Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/471418be-5d2f-4d14-bd9e-9e8f0526241f@omp.ru


Signed-off-by: default avatarRob Herring (Arm) <robh@kernel.org>
parent 00c9a452

drivers/of/module.c

+1 −3
Original line number Diff line number Diff line
@@ -35,12 +35,10 @@ ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len) 
	str += csize;



	of_property_for_each_string(np, "compatible", p, compat) {

		csize = strlen(compat) + 1;

		csize = snprintf(str, len, "C%s", compat);

		tsize += csize;

		if (csize >= len)

			continue;



		csize = snprintf(str, len, "C%s", compat);

		for (c = str; c; ) {

			c = strchr(c, ' ');

			if (c)