Commit cf7385cb authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Rob Herring (Arm)

of: module: add buffer overflow check in of_modalias()

In of_modalias(), if the buffer happens to be too small even for the 1st
snprintf() call, the len parameter will become negative and str parameter
(if not NULL initially) will point beyond the buffer's end. Add the buffer
overflow check after the 1st snprintf() call and fix such check after the
strlen() call (accounting for the terminating NUL char).

Fixes: bc575064 ("of/device: use of_property_for_each_string to parse compatible strings")
Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/bbfc6be0-c687-62b6-d015-5141b93f313e@omp.ruSigned-off-by: default avatarRob Herring <robh@kernel.org>
parent 649bad67
...@@ -21,14 +21,15 @@ ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len) ...@@ -21,14 +21,15 @@ ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len)
csize = snprintf(str, len, "of:N%pOFn%c%s", np, 'T', csize = snprintf(str, len, "of:N%pOFn%c%s", np, 'T',
of_node_get_device_type(np)); of_node_get_device_type(np));
tsize = csize; tsize = csize;
if (csize >= len)
csize = len > 0 ? len - 1 : 0;
len -= csize; len -= csize;
if (str) str += csize;
str += csize;
of_property_for_each_string(np, "compatible", p, compat) { of_property_for_each_string(np, "compatible", p, compat) {
csize = strlen(compat) + 1; csize = strlen(compat) + 1;
tsize += csize; tsize += csize;
if (csize > len) if (csize >= len)
continue; continue;
csize = snprintf(str, len, "C%s", compat); csize = snprintf(str, len, "C%s", compat);
......
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