Fix segfault in dtc when empty input file is given.
PATCH 1/1 Fix segfault in dtc when empty input file is given.
From: Markus Mayer <[email protected]>
Date: Thu, 13 Sep 2012 14:46:28 -0700
Subject: [PATCH] Fix segfault in dtc when empty input file is given.
Prior to this change, an empty input file would cause a segfault, because yylloc had never been initialized. There was never any characters for the lexer to match, so YY_USER_ACTION was never executed before the parse error was detected.
When the parser printed the error message, it tried to include the name of the file, but the structure holding the file name (yylloc.file, referenced as pos->file) had never been initialized.
Without the fix:
$ ./dtc /dev/null DTC: dts->dts on file "/dev/null" Segmentation fault (core dumped)
$ gdb dtc core
Program terminated with signal 11, Segmentation fault.
at scripts/dtc/srcpos.c:194
194 fname = pos->file->name;
(gdb) bt
at scripts/dtc/srcpos.c:194
fmt=0x40d769 "%s", va=0x7fffbf027148) at scripts/dtc/srcpos.c:220
at scripts/dtc/dtc-parser.tab.c:1920
at scripts/dtc/treesource.c:38
at scripts/dtc/dtc.c:203
(gdb) p *pos
$1 = {first_line = 0, first_column = 0, last_line = 0, last_column = 0,
file = 0x0}With the fix:
$ ./dtc /dev/null DTC: dts->dts on file "/dev/null" Error: /dev/null:1.1 syntax error FATAL ERROR: Unable to parse input tree
--- scripts/dtc/treesource.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
scripts/dtc/treesource.c +4 -0
@@ -29,11 +29,15 @@ int treesource_error;struct boot_info *dt_from_source (const char *fname) { +extern YYLTYPE yylloc; + the_boot_info =NULL ; treesource_error =0 ;srcfile_push (fname); yyin = current_srcfile->f; +/* Initialize yylloc->file to avoid segfault on empty input */ +srcpos_update (&yylloc,NULL ,0 );if (yyparse () !=0 )die ("Unable to parse input tree\n" );
Signature · 1 line
1.7.5.4
Quoted 12 lines · Markus Mayer
Prior to this change, an empty input file would cause a segfault, because yylloc had never been initialized. There was never any characters for the lexer to match, so
YY_USER_ACTIONwas never executed before the parse error was detected.When the parser printed the error message, it tried to include the name of the file, but the structure holding the file name (yylloc.file, referenced as
pos->file) had never been initialized.scripts/dtc/treesource.c +0
-0struct boot_info *dt_from_source (const char *fname)
scripts/dtc/treesource.c int treesource_error; · line 40
Quoted 10 lines
scripts/dtc/treesource.c +4
-0{ +extern YYLTYPE yylloc; + the_boot_info =NULL ; treesource_error =0 ;srcfile_push (fname); yyin = current_srcfile->f; +/* Initialize yylloc->file to avoid segfault on empty input */ +srcpos_update (&yylloc,NULL ,0 );
Wouldn't srcpos_update(&yyloc, fname, 0); be even more informative?