bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
[ Upstream commit cf7385cb26ac4f0ee6c7385960525ad534323252 ]

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: bc575064d6 ("of/device: use of_property_for_each_string to parse compatible strings")
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/bbfc6be0-c687-62b6-d015-5141b93f313e@omp.ru
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sergey Shtylyov 2024-04-14 11:51:39 +03:00 • committed by Greg Kroah-Hartman
parent 370a86dc97
commit 0b0d5701a8
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/of/module.c
View file

@ -29,14 +29,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);