of: module: remove strlen() call in of_modalias()
authorSergey Shtylyov <s.shtylyov@omp.ru>
Tue, 15 Oct 2024 20:15:04 +0000 (23:15 +0300)
committerRob Herring (Arm) <robh@kernel.org>
Wed, 16 Oct 2024 17:00:10 +0000 (12:00 -0500)
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: Sergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/471418be-5d2f-4d14-bd9e-9e8f0526241f@omp.ru
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
drivers/of/module.c

index 780fd82..1e735fc 100644 (file)
@@ -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)