summaryrefslogtreecommitdiff
path: root/tools/fdtgrep.c
diff options
context:
space:
mode:
authorPatrick Delaunay <patrick.delaunay@st.com>2020-01-13 09:33:51 +0100
committerTom Rini <trini@konsulko.com>2020-01-24 12:33:08 -0500
commitdae188e6839aa678f1ab4518d92b7eda7277fedf (patch)
treee0422795faee6e1d9c38e01ab96262f82f15c637 /tools/fdtgrep.c
parent906e3cc552fbf24f0b2a1b7582c6f761a608de20 (diff)
downloadu-boot-dae188e6839aa678f1ab4518d92b7eda7277fedf.tar.gz
u-boot-dae188e6839aa678f1ab4518d92b7eda7277fedf.tar.bz2
u-boot-dae188e6839aa678f1ab4518d92b7eda7277fedf.zip
tools: ftdgrep: correct the find regions loop in do_fdtgrep
Use realloc and update the loop executed in do_fdtgrep to find all the regions: only test count > max_region after the second pass. This patch solve an issue if the number of region found (count) is greater then the default value (max_region = count = 100): the second pass is never executed, because the loop stops after the first pass (i = 0, count > 100, max_regions = 100) with error -1 and the error message "Internal error with fdtgrep_find_region". I also update the error message. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Diffstat (limited to 'tools/fdtgrep.c')
-rw-r--r--tools/fdtgrep.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
index 8f44f599c1..2a8058f57f 100644
--- a/tools/fdtgrep.c
+++ b/tools/fdtgrep.c
@@ -805,7 +805,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 +823,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;
}