dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling in fit_common

Browse Source 
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: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2014-06-02 22:04:52 -06:00
committed by Tom Rini
parent 4f427a421f
commit ef0af64b1c
4 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/fit_check_sign.c
View File

@@ -62,10 +62,10 @@ int main(int argc, char **argv)
break; break;
} }
ffd = mmap_fdt(cmdname, fdtfile, &fit_blob, &fsbuf, 0); ffd = mmap_fdt(cmdname, fdtfile, &fit_blob, &fsbuf, false);
if (ffd < 0) if (ffd < 0)
return EXIT_FAILURE; return EXIT_FAILURE;
kfd = mmap_fdt(cmdname, keyfile, &key_blob, &ksbuf, 0); kfd = mmap_fdt(cmdname, keyfile, &key_blob, &ksbuf, false);
if (ffd < 0) if (ffd < 0)
return EXIT_FAILURE; return EXIT_FAILURE;

28
tools/fit_common.c
View File

@@ -38,8 +38,8 @@ int fit_check_image_types(uint8_t type)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
int mmap_fdt(char *cmdname, const char *fname, void **blobp, int mmap_fdt(const char *cmdname, const char *fname, void **blobp,
struct stat *sbuf, int useunlink) struct stat *sbuf, bool delete_on_error)
{ {
void *ptr; void *ptr;
int fd; int fd;
@@ -50,17 +50,13 @@ int mmap_fdt(char *cmdname, const char *fname, void **blobp,
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "%s: Can't open %s: %s\n", fprintf(stderr, "%s: Can't open %s: %s\n",
cmdname, fname, strerror(errno)); cmdname, fname, strerror(errno));
if (useunlink) goto err;
unlink(fname);
return -1;
} }
if (fstat(fd, sbuf) < 0) { if (fstat(fd, sbuf) < 0) {
fprintf(stderr, "%s: Can't stat %s: %s\n", fprintf(stderr, "%s: Can't stat %s: %s\n",
cmdname, fname, strerror(errno)); cmdname, fname, strerror(errno));
if (useunlink) goto err;
unlink(fname);
return -1;
} }
errno = 0; errno = 0;
@@ -68,19 +64,23 @@ int mmap_fdt(char *cmdname, const char *fname, void **blobp,
if ((ptr == MAP_FAILED) || (errno != 0)) { if ((ptr == MAP_FAILED) || (errno != 0)) {
fprintf(stderr, "%s: Can't read %s: %s\n", fprintf(stderr, "%s: Can't read %s: %s\n",
cmdname, fname, strerror(errno)); cmdname, fname, strerror(errno));
if (useunlink) goto err;
unlink(fname);
return -1;
} }
/* check if ptr has a valid blob */ /* check if ptr has a valid blob */
if (fdt_check_header(ptr)) { if (fdt_check_header(ptr)) {
fprintf(stderr, "%s: Invalid FIT blob\n", cmdname); fprintf(stderr, "%s: Invalid FIT blob\n", cmdname);
if (useunlink) goto err;
unlink(fname);
return -1;
} }
*blobp = ptr; *blobp = ptr;
return fd; return fd;
err:
if (fd >= 0)
close(fd);
if (delete_on_error)
unlink(fname);
return -1;
} }

14
tools/fit_common.h
View File

@@ -16,7 +16,17 @@ int fit_verify_header(unsigned char *ptr, int image_size,
int fit_check_image_types(uint8_t type); 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_ */ #endif /* _FIT_COMMON_H_ */

2
tools/fit_info.c
View File

@@ -68,7 +68,7 @@ int main(int argc, char **argv)
break; break;
} }
ffd = mmap_fdt(cmdname, fdtfile, &fit_blob, &fsbuf, 0); ffd = mmap_fdt(cmdname, fdtfile, &fit_blob, &fsbuf, false);
if (ffd < 0) { if (ffd < 0) {
printf("Could not open %s\n", fdtfile); printf("Could not open %s\n", fdtfile);