OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix shift overflow when parsing an overlarge note value. 

PR binutils/21378
	* readelf.c (print_gnu_build_attribute_name): Check for an
	overlarge name field.
This commit is contained in:
Nick Clifton 2017-04-21 12:31:59 +01:00
parent 792f174f8a
commit ddef72cdc1
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binutils/ChangeLog
View File

@ -1,3 +1,9 @@
2017-04-21 Nick Clifton <nickc@redhat.com>
PR binutils/21378
* readelf.c (print_gnu_build_attribute_name): Check for an
overlarge name field.
2017-04-13 Nick Clifton <nickc@redhat.com>
PR binutils/21379

20
binutils/readelf.c
View File

@ -16948,10 +16948,18 @@ print_gnu_build_attribute_name (Elf_Internal_Note * pnote)
{
case GNU_BUILD_ATTRIBUTE_TYPE_NUMERIC:
{
unsigned int bytes = pnote->namesz - (name - pnote->namedata);
unsigned long val = 0;
unsigned int shift = 0;
char * decoded = NULL;
unsigned int bytes = pnote->namesz - (name - pnote->namedata);
unsigned long long val = 0;
unsigned int shift = 0;
char * decoded = NULL;
/* PR 21378 */
if (bytes > sizeof (val))
{
error (_("corrupt name field: namesz of %lu is too large for a numeric value\n"),
pnote->namesz);
return FALSE;
}
while (bytes --)
{
@ -16995,9 +17003,9 @@ print_gnu_build_attribute_name (Elf_Internal_Note * pnote)
else
{
if (do_wide)
left -= printf ("0x%lx", val);
left -= printf ("0x%llx", val);
else
left -= printf ("0x%-.*lx", left, val);
left -= printf ("0x%-.*llx", left, val);
}
}
break;