michael/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools: fix handle leak in ifdtool.c

Browse Source 
Prevent file descriptor leaks by properly closing 'fd' and 'new_fd'
when fstat() or write() operations fail.

- Added close(fd) before return in open_for_read() if fstat() fails.
- Added close(new_fd) before return in write_image() if write() fails.
- No close needed if open() fails (fd == -1 is invalid).

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
This commit is contained in:
Anton Moryakov
2025-05-16 18:25:38 +03:00
committed by Tom Rini
parent d786c6b69f
commit a4fb99ce4e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/ifdtool.c
View File

@@ -499,8 +499,10 @@ static int write_image(char *filename, char *image, int size)
S_IWUSR | S_IRGRP | S_IROTH);
if (new_fd < 0)
return perror_fname("Could not open file '%s'", filename);
if (write(new_fd, image, size) != size)
if (write(new_fd, image, size) != size) {
close(new_fd);
return perror_fname("Could not write file '%s'", filename);
}
close(new_fd);
return 0;
@@ -604,8 +606,10 @@ int open_for_read(const char *fname, int *sizep)
if (fd == -1)
return perror_fname("Could not open file '%s'", fname);
if (fstat(fd, &buf) == -1)
if (fstat(fd, &buf) == -1) {
close(fd);
return perror_fname("Could not stat file '%s'", fname);
}
*sizep = buf.st_size;
debug("File %s is %d bytes\n", fname, *sizep);