random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

tools: mkimage: Call fclose in error path

Browse Source 
This patch is fixing missing fclose() calls
in error patch introduced by:
"tools: mkimage: Use fstat instead of stat to avoid malicious hacks"
(sha1: ebe0f53f48e8f9ecc823e533a85b05c13638c350)

Reported-by: Coverity (CID: 155064, 155065)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Michal Simek 2016-12-20 09:58:31 +01:00 committed by Tom Rini
parent d0cf5512e9
commit ac71d4103e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/zynqimage.c
View File

@ -239,11 +239,15 @@ static void zynqimage_parse_initparams(struct zynq_header *zynqhdr,
} }
err = fstat(fileno(fp), &path_stat); err = fstat(fileno(fp), &path_stat);
if (err) if (err) {
fclose(fp);
return; return;
}
if (!S_ISREG(path_stat.st_mode)) if (!S_ISREG(path_stat.st_mode)) {
fclose(fp);
return; return;
}
do { do {
r = fscanf(fp, "%x %x", &reginit.address, &reginit.data); r = fscanf(fp, "%x %x", &reginit.address, &reginit.data);

8
tools/zynqmpimage.c
View File

@ -251,11 +251,15 @@ static void zynqmpimage_parse_initparams(struct zynqmp_header *zynqhdr,
} }
err = fstat(fileno(fp), &path_stat); err = fstat(fileno(fp), &path_stat);
if (err) if (err) {
fclose(fp);
return; return;
}
if (!S_ISREG(path_stat.st_mode)) if (!S_ISREG(path_stat.st_mode)) {
fclose(fp);
return; return;
}
do { do {
r = fscanf(fp, "%x %x", &reginit.address, &reginit.data); r = fscanf(fp, "%x %x", &reginit.address, &reginit.data);