darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

This fixes parsing a file containing ELF attributes with very large tag values.

Browse source 
PR binutils/18570
	* elf-attrs.c (obj_attr_size): Use an unsigned int type for the tag.
	(write_obj_attribute): Likewise.
	(elf_new_obj_attr): Likewise.
	(bfd_elf_get_obj_attr_int): Likewise.
	(bfd_elf_add_obj_attr_int): Likewise.
	(bfd_elf_add_obj_attr_string): Likewise.
	(bfd_elf_add_obj_attr_int_string): Likewise.
	(gnu_obj_attrs_arg_type): Likewise.
	(_bfd_elf_obj_attrs_arg_type): Likewise.
	(_bfd_elf_parse_attributes): Likewise.
	(_bfd_elf_merge_unknown_attribute_list): Likewise.
	* elf-bfd.h (struct obj_attribute_list): Likewise.
	Update prototypes.
This commit is contained in:
Nick Clifton 2015-06-30 17:12:47 +01:00
parent 9916071f8d
commit 5ee4a1ca16
3 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bfd/ChangeLog
View file

@ -1,3 +1,20 @@
2015-06-30 Nick Clifton <nickc@redhat.com>
PR binutils/18570
* elf-attrs.c (obj_attr_size): Use an unsigned int type for the tag.
(write_obj_attribute): Likewise.
(elf_new_obj_attr): Likewise.
(bfd_elf_get_obj_attr_int): Likewise.
(bfd_elf_add_obj_attr_int): Likewise.
(bfd_elf_add_obj_attr_string): Likewise.
(bfd_elf_add_obj_attr_int_string): Likewise.
(gnu_obj_attrs_arg_type): Likewise.
(_bfd_elf_obj_attrs_arg_type): Likewise.
(_bfd_elf_parse_attributes): Likewise.
(_bfd_elf_merge_unknown_attribute_list): Likewise.
* elf-bfd.h (struct obj_attribute_list): Likewise.
Update prototypes.
2015-06-28 H.J. Lu <hongjiu.lu@intel.com> 2015-06-28 H.J. Lu <hongjiu.lu@intel.com>
* bfd-in.h (compressed_debug_section_type): Remove * bfd-in.h (compressed_debug_section_type): Remove

25
bfd/elf-attrs.c
View file

@ -54,7 +54,7 @@ is_default_attr (obj_attribute *attr)
/* Return the size of a single attribute. */ /* Return the size of a single attribute. */
static bfd_vma static bfd_vma
obj_attr_size (int tag, obj_attribute *attr) obj_attr_size (unsigned int tag, obj_attribute *attr)
{ {
bfd_vma size; bfd_vma size;
@ -143,7 +143,7 @@ write_uleb128 (bfd_byte *p, unsigned int val)
/* Write attribute ATTR to butter P, and return a pointer to the following /* Write attribute ATTR to butter P, and return a pointer to the following
byte. */ byte. */
static bfd_byte * static bfd_byte *
write_obj_attribute (bfd_byte *p, int tag, obj_attribute *attr) write_obj_attribute (bfd_byte *p, unsigned int tag, obj_attribute *attr)
{ {
/* Suppress default entries. */ /* Suppress default entries. */
if (is_default_attr (attr)) if (is_default_attr (attr))
@ -189,7 +189,7 @@ vendor_set_obj_attr_contents (bfd *abfd, bfd_byte *contents, bfd_vma size,
attr = elf_known_obj_attributes (abfd)[vendor]; attr = elf_known_obj_attributes (abfd)[vendor];
for (i = LEAST_KNOWN_OBJ_ATTRIBUTE; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++) for (i = LEAST_KNOWN_OBJ_ATTRIBUTE; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++)
{ {
int tag = i; unsigned int tag = i;
if (get_elf_backend_data (abfd)->obj_attrs_order) if (get_elf_backend_data (abfd)->obj_attrs_order)
tag = get_elf_backend_data (abfd)->obj_attrs_order (i); tag = get_elf_backend_data (abfd)->obj_attrs_order (i);
p = write_obj_attribute (p, tag, &attr[tag]); p = write_obj_attribute (p, tag, &attr[tag]);
@ -227,7 +227,7 @@ bfd_elf_set_obj_attr_contents (bfd *abfd, bfd_byte *contents, bfd_vma size)
/* Allocate/find an object attribute. */ /* Allocate/find an object attribute. */
static obj_attribute * static obj_attribute *
elf_new_obj_attr (bfd *abfd, int vendor, int tag) elf_new_obj_attr (bfd *abfd, int vendor, unsigned int tag)
{ {
obj_attribute *attr; obj_attribute *attr;
obj_attribute_list *list; obj_attribute_list *list;
@ -265,7 +265,7 @@ elf_new_obj_attr (bfd *abfd, int vendor, int tag)
/* Return the value of an integer object attribute. */ /* Return the value of an integer object attribute. */
int int
bfd_elf_get_obj_attr_int (bfd *abfd, int vendor, int tag) bfd_elf_get_obj_attr_int (bfd *abfd, int vendor, unsigned int tag)
{ {
obj_attribute_list *p; obj_attribute_list *p;
@ -291,7 +291,7 @@ bfd_elf_get_obj_attr_int (bfd *abfd, int vendor, int tag)
/* Add an integer object attribute. */ /* Add an integer object attribute. */
void void
bfd_elf_add_obj_attr_int (bfd *abfd, int vendor, int tag, unsigned int i) bfd_elf_add_obj_attr_int (bfd *abfd, int vendor, unsigned int tag, unsigned int i)
{ {
obj_attribute *attr; obj_attribute *attr;
@ -314,7 +314,7 @@ _bfd_elf_attr_strdup (bfd *abfd, const char * s)
/* Add a string object attribute. */ /* Add a string object attribute. */
void void
bfd_elf_add_obj_attr_string (bfd *abfd, int vendor, int tag, const char *s) bfd_elf_add_obj_attr_string (bfd *abfd, int vendor, unsigned int tag, const char *s)
{ {
obj_attribute *attr; obj_attribute *attr;
@ -325,7 +325,8 @@ bfd_elf_add_obj_attr_string (bfd *abfd, int vendor, int tag, const char *s)
/* Add a int+string object attribute. */ /* Add a int+string object attribute. */
void void
bfd_elf_add_obj_attr_int_string (bfd *abfd, int vendor, int tag, bfd_elf_add_obj_attr_int_string (bfd *abfd, int vendor,
unsigned int tag,
unsigned int i, const char *s) unsigned int i, const char *s)
{ {
obj_attribute *attr; obj_attribute *attr;
@ -394,7 +395,7 @@ _bfd_elf_copy_obj_attributes (bfd *ibfd, bfd *obfd)
/* Determine whether a GNU object attribute tag takes an integer, a /* Determine whether a GNU object attribute tag takes an integer, a
string or both. */ string or both. */
static int static int
gnu_obj_attrs_arg_type (int tag) gnu_obj_attrs_arg_type (unsigned int tag)
{ {
/* Except for Tag_compatibility, for GNU attributes we follow the /* Except for Tag_compatibility, for GNU attributes we follow the
same rule ARM ones > 32 follow: odd-numbered tags take strings same rule ARM ones > 32 follow: odd-numbered tags take strings
@ -409,7 +410,7 @@ gnu_obj_attrs_arg_type (int tag)
/* Determine what arguments an attribute tag takes. */ /* Determine what arguments an attribute tag takes. */
int int
_bfd_elf_obj_attrs_arg_type (bfd *abfd, int vendor, int tag) _bfd_elf_obj_attrs_arg_type (bfd *abfd, int vendor, unsigned int tag)
{ {
switch (vendor) switch (vendor)
{ {
@ -486,7 +487,7 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr)
p += namelen; p += namelen;
while (section_len > 0 && p < p_end) while (section_len > 0 && p < p_end)
{ {
int tag; unsigned int tag;
unsigned int n; unsigned int n;
unsigned int val; unsigned int val;
bfd_vma subsection_len; bfd_vma subsection_len;
@ -666,7 +667,7 @@ _bfd_elf_merge_unknown_attribute_list (bfd *ibfd, bfd *obfd)
for (; in_list || out_list; ) for (; in_list || out_list; )
{ {
bfd *err_bfd = NULL; bfd *err_bfd = NULL;
int err_tag = 0; unsigned int err_tag = 0;
/* The tags for each list are in numerical order. */ /* The tags for each list are in numerical order. */
/* If the tags are equal, then merge. */ /* If the tags are equal, then merge. */

14
bfd/elf-bfd.h
View file

@ -1549,7 +1549,7 @@ typedef struct obj_attribute
typedef struct obj_attribute_list typedef struct obj_attribute_list
{ {
struct obj_attribute_list *next; struct obj_attribute_list *next;
int tag; unsigned int tag;
obj_attribute attr; obj_attribute attr;
} obj_attribute_list; } obj_attribute_list;
@ -2412,22 +2412,22 @@ extern bfd *_bfd_elf64_bfd_from_remote_memory
extern bfd_vma bfd_elf_obj_attr_size (bfd *); extern bfd_vma bfd_elf_obj_attr_size (bfd *);
extern void bfd_elf_set_obj_attr_contents (bfd *, bfd_byte *, bfd_vma); extern void bfd_elf_set_obj_attr_contents (bfd *, bfd_byte *, bfd_vma);
extern int bfd_elf_get_obj_attr_int (bfd *, int, int); extern int bfd_elf_get_obj_attr_int (bfd *, int, unsigned int);
extern void bfd_elf_add_obj_attr_int (bfd *, int, int, unsigned int); extern void bfd_elf_add_obj_attr_int (bfd *, int, unsigned int, unsigned int);
#define bfd_elf_add_proc_attr_int(BFD, TAG, VALUE) \ #define bfd_elf_add_proc_attr_int(BFD, TAG, VALUE) \
bfd_elf_add_obj_attr_int ((BFD), OBJ_ATTR_PROC, (TAG), (VALUE)) bfd_elf_add_obj_attr_int ((BFD), OBJ_ATTR_PROC, (TAG), (VALUE))
extern void bfd_elf_add_obj_attr_string (bfd *, int, int, const char *); extern void bfd_elf_add_obj_attr_string (bfd *, int, unsigned int, const char *);
#define bfd_elf_add_proc_attr_string(BFD, TAG, VALUE) \ #define bfd_elf_add_proc_attr_string(BFD, TAG, VALUE) \
bfd_elf_add_obj_attr_string ((BFD), OBJ_ATTR_PROC, (TAG), (VALUE)) bfd_elf_add_obj_attr_string ((BFD), OBJ_ATTR_PROC, (TAG), (VALUE))
extern void bfd_elf_add_obj_attr_int_string (bfd *, int, int, unsigned int, extern void bfd_elf_add_obj_attr_int_string (bfd *, int, unsigned int,
const char *); unsigned int, const char *);
#define bfd_elf_add_proc_attr_int_string(BFD, TAG, INTVAL, STRVAL) \ #define bfd_elf_add_proc_attr_int_string(BFD, TAG, INTVAL, STRVAL) \
bfd_elf_add_obj_attr_int_string ((BFD), OBJ_ATTR_PROC, (TAG), \ bfd_elf_add_obj_attr_int_string ((BFD), OBJ_ATTR_PROC, (TAG), \
(INTVAL), (STRVAL)) (INTVAL), (STRVAL))
extern char *_bfd_elf_attr_strdup (bfd *, const char *); extern char *_bfd_elf_attr_strdup (bfd *, const char *);
extern void _bfd_elf_copy_obj_attributes (bfd *, bfd *); extern void _bfd_elf_copy_obj_attributes (bfd *, bfd *);
extern int _bfd_elf_obj_attrs_arg_type (bfd *, int, int); extern int _bfd_elf_obj_attrs_arg_type (bfd *, int, unsigned int);
extern void _bfd_elf_parse_attributes (bfd *, Elf_Internal_Shdr *); extern void _bfd_elf_parse_attributes (bfd *, Elf_Internal_Shdr *);
extern bfd_boolean _bfd_elf_merge_object_attributes (bfd *, bfd *); extern bfd_boolean _bfd_elf_merge_object_attributes (bfd *, bfd *);
extern bfd_boolean _bfd_elf_merge_unknown_attribute_low (bfd *, bfd *, int); extern bfd_boolean _bfd_elf_merge_unknown_attribute_low (bfd *, bfd *, int);