mx6ul_14x14_evk: Avoid overlap of environment over U-Boot proper

[oweals/u-boot.git] / tools / fdtgrep.c

diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
index 8f44f599c1c437525b9bfe9cb405ce6e9838a257..e4112b8f692f2e88c52548a824021835905f5042 100644 (file)
--- a/tools/fdtgrep.c
+++ b/tools/fdtgrep.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <fdt_region.h>
 
 #include "fdt_host.h"
 #include "libfdt_internal.h"
@@ -805,7 +806,7 @@ static int do_fdtgrep(struct display_info *disp, const char *filename)
         * we do another pass to actually record them.
         */
        for (i = 0; i < 2; i++) {
-               region = malloc(count * sizeof(struct fdt_region));
+               region = realloc(region, count * sizeof(struct fdt_region));
                if (!region) {
                        fprintf(stderr, "Out of memory for %d regions\n",
                                count);
@@ -823,8 +824,10 @@ static int do_fdtgrep(struct display_info *disp, const char *filename)
                }
                if (count <= max_regions)
                        break;
+       }
+       if (count > max_regions) {
                free(region);
-               fprintf(stderr, "Internal error with fdtgrep_find_region)(\n");
+               fprintf(stderr, "Internal error with fdtgrep_find_region()\n");
                return -1;
        }
 
@@ -920,7 +923,9 @@ static const char usage_synopsis[] =
 /* Helper for getopt case statements */
 #define case_USAGE_COMMON_FLAGS \
        case 'h': usage(NULL); \
+       /* fallthrough */ \
        case 'V': util_version(); \
+       /* fallthrough */ \
        case '?': usage("unknown option");
 
 static const char usage_short_opts[] =
@@ -1082,6 +1087,7 @@ static void scan_args(struct display_info *disp, int argc, char *argv[])
 
                switch (opt) {
                case_USAGE_COMMON_FLAGS
+               /* fallthrough */
                case 'a':
                        disp->show_addr = 1;
                        break;
@@ -1093,7 +1099,7 @@ static void scan_args(struct display_info *disp, int argc, char *argv[])
                        break;
                case 'C':
                        inc = 0;
-                       /* no break */
+                       /* fallthrough */
                case 'c':
                        type = FDT_IS_COMPAT;
                        break;
@@ -1108,7 +1114,7 @@ static void scan_args(struct display_info *disp, int argc, char *argv[])
                        break;
                case 'G':
                        inc = 0;
-                       /* no break */
+                       /* fallthrough */
                case 'g':
                        type = FDT_ANY_GLOBAL;
                        break;
@@ -1126,7 +1132,7 @@ static void scan_args(struct display_info *disp, int argc, char *argv[])
                        break;
                case 'N':
                        inc = 0;
-                       /* no break */
+                       /* fallthrough */
                case 'n':
                        type = FDT_IS_NODE;
                        break;
@@ -1145,7 +1151,7 @@ static void scan_args(struct display_info *disp, int argc, char *argv[])
                        break;
                case 'P':
                        inc = 0;
-                       /* no break */
+                       /* fallthrough */
                case 'p':
                        type = FDT_IS_PROP;
                        break;