Commit ef0af64b authored by Simon Glass's avatar Simon Glass Committed by Tom Rini

Improve error handling in fit_common

Make the error handling common, and make sure the file is always closed
on error. Rename the parameter to be more description and add comments.
Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
parent 4f427a42
......@@ -62,10 +62,10 @@ int main(int argc, char **argv)
break;
}
ffd = mmap_fdt(cmdname, fdtfile, &fit_blob, &fsbuf, 0);
ffd = mmap_fdt(cmdname, fdtfile, &fit_blob, &fsbuf, false);
if (ffd < 0)
return EXIT_FAILURE;
kfd = mmap_fdt(cmdname, keyfile, &key_blob, &ksbuf, 0);
kfd = mmap_fdt(cmdname, keyfile, &key_blob, &ksbuf, false);
if (ffd < 0)
return EXIT_FAILURE;
......
......@@ -38,8 +38,8 @@ int fit_check_image_types(uint8_t type)
return EXIT_FAILURE;
}
int mmap_fdt(char *cmdname, const char *fname, void **blobp,
struct stat *sbuf, int useunlink)
int mmap_fdt(const char *cmdname, const char *fname, void **blobp,
struct stat *sbuf, bool delete_on_error)
{
void *ptr;
int fd;
......@@ -50,17 +50,13 @@ int mmap_fdt(char *cmdname, const char *fname, void **blobp,
if (fd < 0) {
fprintf(stderr, "%s: Can't open %s: %s\n",
cmdname, fname, strerror(errno));
if (useunlink)
unlink(fname);
return -1;
goto err;
}
if (fstat(fd, sbuf) < 0) {
fprintf(stderr, "%s: Can't stat %s: %s\n",
cmdname, fname, strerror(errno));
if (useunlink)
unlink(fname);
return -1;
goto err;
}
errno = 0;
......@@ -68,19 +64,23 @@ int mmap_fdt(char *cmdname, const char *fname, void **blobp,
if ((ptr == MAP_FAILED) || (errno != 0)) {
fprintf(stderr, "%s: Can't read %s: %s\n",
cmdname, fname, strerror(errno));
if (useunlink)
unlink(fname);
return -1;
goto err;
}
/* check if ptr has a valid blob */
if (fdt_check_header(ptr)) {
fprintf(stderr, "%s: Invalid FIT blob\n", cmdname);
if (useunlink)
unlink(fname);
return -1;
goto err;
}
*blobp = ptr;
return fd;
err:
if (fd >= 0)
close(fd);
if (delete_on_error)
unlink(fname);
return -1;
}
......@@ -16,7 +16,17 @@ int fit_verify_header(unsigned char *ptr, int image_size,
int fit_check_image_types(uint8_t type);
int mmap_fdt(char *cmdname, const char *fname, void **blobp,
struct stat *sbuf, int useunlink);
/**
* Map an FDT into memory, optionally increasing its size
*
* @cmdname: Tool name (for displaying with error messages)
* @fname: Filename containing FDT
* @blobp: Returns pointer to FDT blob
* @sbuf: File status information is stored here
* @delete_on_error: true to delete the file if we get an error
* @return 0 if OK, -1 on error.
*/
int mmap_fdt(const char *cmdname, const char *fname, void **blobp,
struct stat *sbuf, bool delete_on_error);
#endif /* _FIT_COMMON_H_ */
......@@ -68,7 +68,7 @@ int main(int argc, char **argv)
break;
}
ffd = mmap_fdt(cmdname, fdtfile, &fit_blob, &fsbuf, 0);
ffd = mmap_fdt(cmdname, fdtfile, &fit_blob, &fsbuf, false);
if (ffd < 0) {
printf("Could not open %s\n", fdtfile);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment