* [PATCH RESEND] of: module: add buffer overflow check in of_modalias()
@ 2024-04-14 8:51 Sergey Shtylyov
2024-04-15 19:35 ` Rob Herring
0 siblings, 1 reply; 2+ messages in thread
From: Sergey Shtylyov @ 2024-04-14 8:51 UTC (permalink / raw)
To: devicetree, Saravana Kannan, Rob Herring; +Cc: Alexey Khoroshilov
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: bc575064d688 ("of/device: use of_property_for_each_string to parse compatible strings")
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
---
The patch is against the dt/linus branch of Rob Herring's linux.git repo...
drivers/of/module.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Index: linux/drivers/of/module.c
===================================================================
--- linux.orig/drivers/of/module.c
+++ linux/drivers/of/module.c
@@ -29,14 +29,15 @@ ssize_t of_modalias(const struct device_
csize = snprintf(str, len, "of:N%pOFn%c%s", np, 'T',
of_node_get_device_type(np));
tsize = csize;
+ if (csize >= len)
+ csize = len > 0 ? len - 1 : 0;
len -= csize;
- if (str)
- str += csize;
+ str += csize;
of_property_for_each_string(np, "compatible", p, compat) {
csize = strlen(compat) + 1;
tsize += csize;
- if (csize > len)
+ if (csize >= len)
continue;
csize = snprintf(str, len, "C%s", compat);
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH RESEND] of: module: add buffer overflow check in of_modalias()
2024-04-14 8:51 [PATCH RESEND] of: module: add buffer overflow check in of_modalias() Sergey Shtylyov
@ 2024-04-15 19:35 ` Rob Herring
0 siblings, 0 replies; 2+ messages in thread
From: Rob Herring @ 2024-04-15 19:35 UTC (permalink / raw)
To: Sergey Shtylyov; +Cc: devicetree, Saravana Kannan, Alexey Khoroshilov
On Sun, Apr 14, 2024 at 11:51:39AM +0300, Sergey Shtylyov wrote:
> 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: bc575064d688 ("of/device: use of_property_for_each_string to parse compatible strings")
> Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
>
> ---
> The patch is against the dt/linus branch of Rob Herring's linux.git repo...
>
> drivers/of/module.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-15 19:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-14 8:51 [PATCH RESEND] of: module: add buffer overflow check in of_modalias() Sergey Shtylyov
2024-04-15 19:35 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).