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

Fix off by one error when checking for empty note names. 

PR binutils/21439
	* readelf.c (print_gnu_build_attribute_name): Allow for an empty
	name field.
This commit is contained in:
Nick Clifton 2017-04-28 12:09:14 +01:00
parent 4e3afec278
commit b06b2c92c0
2 changed files with 16 additions and 5 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-28 Nick Clifton <nickc@redhat.com>
PR binutils/21439
* readelf.c (print_gnu_build_attribute_name): Allow for an empty
name field.
2017-04-28 Nick Clifton <nickc@redhat.com>
PR binutils/21437

15
binutils/readelf.c
View File

@ -17037,17 +17037,22 @@ print_gnu_build_attribute_name (Elf_Internal_Note * pnote)
{
case GNU_BUILD_ATTRIBUTE_TYPE_NUMERIC:
{
/* The -1 is because the name field is always 0 terminated, and we
want to be able to ensure that the shift in the while loop below
will not overflow. */
unsigned int bytes = (pnote->namesz - (name - pnote->namedata)) - 1;
unsigned int bytes;
unsigned long long val = 0;
unsigned int shift = 0;
char * decoded = NULL;
/* PR 21378 */
bytes = pnote->namesz - (name - pnote->namedata);
if (bytes > 0)
/* The -1 is because the name field is always 0 terminated, and we
want to be able to ensure that the shift in the while loop below
will not overflow. */
-- bytes;
if (bytes > sizeof (val))
{
fprintf (stderr, "namesz %lx name %p namedata %p\n",
pnote->namesz, name, pnote->namedata);
error (_("corrupt numeric name field: too many bytes in the value: %x\n"),
bytes);
bytes = sizeof (val);