tequilaOS/platform_external_dtc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dtc: Fix uninitialized use of structure_ok

Browse source 
My rework of the tree checking code introduced a potentially nasty bug
- it uses the structure_ok variable uninitialized.  This patch fixes
the problem.  It's a fairly ugly bandaid approach, but the ugly will
disappear once future patches have folded the semantic checks into the
new framework.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2007-12-04 11:49:43 +11:00 committed by Jon Loeliger
parent 2b7dc8dce5
commit 2d72816ccf
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
checks.c
View file

@ -270,8 +270,12 @@ static struct check *check_table[] = {
&phandle_references,
};
void process_checks(int force, struct node *dt)
int check_semantics(struct node *dt, int outversion, int boot_cpuid_phys);
void process_checks(int force, struct boot_info *bi,
int checkflag, int outversion, int boot_cpuid_phys)
{
struct node *dt = bi->dt;
int i;
int error = 0;
@ -292,6 +296,16 @@ void process_checks(int force, struct node *dt)
"output forced\n");
}
}
if (checkflag) {
if (error) {
fprintf(stderr, "Warning: Skipping semantic checks due to structural errors\n");
} else {
if (!check_semantics(bi->dt, outversion,
boot_cpuid_phys))
fprintf(stderr, "Warning: Input tree has semantic errors\n");
}
}
}
/*

13
dtc.c
View file

@ -122,7 +122,6 @@ int main(int argc, char *argv[])
FILE *outf = NULL;
int outversion = DEFAULT_FDT_VERSION;
int boot_cpuid_phys = 0xfeedbeef;
int structure_ok;
quiet = 0;
reservenum = 0;
@ -205,17 +204,7 @@ int main(int argc, char *argv[])
if (! bi || ! bi->dt)
die("Couldn't read input tree\n");
process_checks(force, bi->dt);
if (check) {
if (!structure_ok) {
fprintf(stderr, "Warning: Skipping semantic checks due to structural errors\n");
} else {
if (!check_semantics(bi->dt, outversion,
boot_cpuid_phys))
fprintf(stderr, "Warning: Input tree has semantic errors\n");
}
}
process_checks(force, bi, check, outversion, boot_cpuid_phys);
if (streq(outname, "-")) {
outf = stdout;

4
dtc.h
View file

@ -237,8 +237,8 @@ struct boot_info *build_boot_info(struct reserve_info *reservelist,
/* Checks */
void process_checks(int force, struct node *dt);
int check_semantics(struct node *dt, int outversion, int boot_cpuid_phys);
void process_checks(int force, struct boot_info *bi,
int checkflag, int outversion, int boot_cpuid_phys);
/* Flattened trees */