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: Simon Glass <sjg@chromium.org>

diff --git a/tools/fit_check_sign.c b/tools/fit_check_sign.c
index 817773d48a0bbb37934c565835d39e7111e5f059..357650d526e77e6290bc1a422bf6cd6b110cf70f 100644 (file)
--- a/tools/fit_check_sign.c
+++ b/tools/fit_check_sign.c
@@ -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;
 

diff --git a/tools/fit_common.c b/tools/fit_common.c
index ee1767bd019a41482a924a9be07eed8ba61225ad..286f357ab1769af8c507e6c94719558800ce7a92 100644 (file)
--- a/tools/fit_common.c
+++ b/tools/fit_common.c
@@ -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;
 }

diff --git a/tools/fit_common.h b/tools/fit_common.h
index adf440480b5babe031fae7472d27dd405d289db5..adcee6df64580cfa6f0af91b7804258ff449232a 100644 (file)
--- a/tools/fit_common.h
+++ b/tools/fit_common.h
@@ -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_ */

diff --git a/tools/fit_info.c b/tools/fit_info.c
index 50f3c8edf12ef2cde4c89572eece2bcdbfa54454..9442ff107249859ab9ab0afa78357057428ad6d9 100644 (file)
--- a/tools/fit_info.c
+++ b/tools/fit_info.c
@@ -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);