tools: fdtgrep: Fix handle leak
PATCH 1/1 tools: fdtgrep: Fix handle leak
The handle "fd" was created in fdtgrep.c:708 by calling the "open" function and is lost in fdtgrep.c:716 and fdtgrep.c:723. Close file descriptor 'fd' before exiting with an error from function utilfdt_read_err_len(const char *filename, char **buffp, off_t *len).
--- tools/fdtgrep.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/fdtgrep.c +6 -2
@@ -712,15 +712,19 @@ int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len)/* Loop until we have read everything */ buf =malloc (bufsize); -if (!buf) +if (!buf) { +close (fd);return -ENOMEM ; + } do { /* Expand the buffer to hold the next chunk */ if (offset == bufsize) { bufsize *= 2; buf = realloc(buf, bufsize); - if (!buf) + if (!buf) { + close(fd); return -ENOMEM; + } } ret = read(fd, &buf[offset], bufsize - offset);
Signature · 1 line
2.17.1
Quoted 6 lines · Mikhail Ilin
The handle "fd" was created in fdtgrep.c:708 by calling the "open" function and is lost in fdtgrep.c:716 and fdtgrep.c:723. Close file descriptor 'fd' before exiting with an error from function
utilfdt_read_err_len(const char *filename, char **buffp, off_t *len).
Quoted 6 lines
Fixes 1043d0a0296a ("fdt: Add fdtgrep tool")Signed-off-by Mikhail Ilin <[email protected]>--- tools/fdtgrep.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Quoted 8 lines · Mikhail Ilin
The handle "fd" was created in fdtgrep.c:708 by calling the
"open" function and is lost in fdtgrep.c:716 and fdtgrep.c:723. Close file descriptor 'fd' before exiting with an error from functionutilfdt_read_err_len(const char *filename, char **buffp, off_t *len).Fixes 1043d0a0296a ("fdt: Add fdtgrep tool")Signed-off-by Mikhail Ilin <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom