GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-26 16:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools: ftdgrep: correct the find regions loop in do_fdtgrep

Browse source 
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>
This commit is contained in:
Patrick Delaunay 2020-01-13 09:33:51 +01:00 • committed by Tom Rini
parent 906e3cc552
commit dae188e683
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/fdtgrep.c
View file

@ -805,7 +805,7 @@ static int do_fdtgrep(struct display_info *disp, const char *filename)
* we do another pass to actually record them. * we do another pass to actually record them.
*/ */
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
region = malloc(count * sizeof(struct fdt_region)); region = realloc(region, count * sizeof(struct fdt_region));
if (!region) { if (!region) {
fprintf(stderr, "Out of memory for %d regions\n", fprintf(stderr, "Out of memory for %d regions\n",
count); count);
@ -823,8 +823,10 @@ static int do_fdtgrep(struct display_info *disp, const char *filename)
} }
if (count <= max_regions) if (count <= max_regions)
break; break;
}
if (count > max_regions) {
free(region); free(region);
fprintf(stderr, "Internal error with fdtgrep_find_region)(\n"); fprintf(stderr, "Internal error with fdtgrep_find_region()\n");
return -1; return -1;
} }