X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=bfd%2Felf-attrs.c;h=8f76b6a8a41d2b6c387025df26171b33ed74ad80;hb=f64e188b58f4aab4cbd03aa6e9fc1aa602546e26;hp=e60053b872ada326f887b4fe1ae981d0107c7a7a;hpb=5aa6ff7ca4d5209dece43cf89fa5750f5dcaa033;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c index e60053b872..8f76b6a8a4 100644 --- a/bfd/elf-attrs.c +++ b/bfd/elf-attrs.c @@ -1,6 +1,5 @@ /* ELF attributes support (based on ARM EABI attributes). - Copyright 2005, 2006, 2007 - Free Software Foundation, Inc. + Copyright (C) 2005-2014 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -96,7 +95,7 @@ vendor_obj_attr_size (bfd *abfd, int vendor) attr = elf_known_obj_attributes (abfd)[vendor]; size = 0; - for (i = 4; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++) + for (i = LEAST_KNOWN_OBJ_ATTRIBUTE; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++) size += obj_attr_size (i, &attr[i]); for (list = elf_other_obj_attributes (abfd)[vendor]; @@ -188,7 +187,7 @@ vendor_set_obj_attr_contents (bfd *abfd, bfd_byte *contents, bfd_vma size, p += 4; attr = elf_known_obj_attributes (abfd)[vendor]; - for (i = 4; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++) + for (i = LEAST_KNOWN_OBJ_ATTRIBUTE; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++) { int tag = i; if (get_elf_backend_data (abfd)->obj_attrs_order) @@ -238,7 +237,7 @@ elf_new_obj_attr (bfd *abfd, int vendor, int tag) if (tag < NUM_KNOWN_OBJ_ATTRIBUTES) { - /* Knwon tags are preallocated. */ + /* Known tags are preallocated. */ attr = &elf_known_obj_attributes (abfd)[vendor][tag]; } else @@ -272,7 +271,7 @@ bfd_elf_get_obj_attr_int (bfd *abfd, int vendor, int tag) if (tag < NUM_KNOWN_OBJ_ATTRIBUTES) { - /* Knwon tags are preallocated. */ + /* Known tags are preallocated. */ return elf_known_obj_attributes (abfd)[vendor][tag].i; } else @@ -307,10 +306,10 @@ _bfd_elf_attr_strdup (bfd *abfd, const char * s) { char * p; int len; - + len = strlen (s) + 1; p = (char *) bfd_alloc (abfd, len); - return memcpy (p, s, len); + return (char *) memcpy (p, s, len); } /* Add a string object attribute. */ @@ -347,11 +346,17 @@ _bfd_elf_copy_obj_attributes (bfd *ibfd, bfd *obfd) int i; int vendor; + if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour + || bfd_get_flavour (obfd) != bfd_target_elf_flavour) + return; + for (vendor = OBJ_ATTR_FIRST; vendor <= OBJ_ATTR_LAST; vendor++) { - in_attr = &elf_known_obj_attributes (ibfd)[vendor][4]; - out_attr = &elf_known_obj_attributes (obfd)[vendor][4]; - for (i = 4; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++) + in_attr + = &elf_known_obj_attributes (ibfd)[vendor][LEAST_KNOWN_OBJ_ATTRIBUTE]; + out_attr + = &elf_known_obj_attributes (obfd)[vendor][LEAST_KNOWN_OBJ_ATTRIBUTE]; + for (i = LEAST_KNOWN_OBJ_ATTRIBUTE; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++) { out_attr->type = in_attr->type; out_attr->i = in_attr->i; @@ -425,10 +430,14 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr) { bfd_byte *contents; bfd_byte *p; + bfd_byte *p_end; bfd_vma len; - const char *std_section; + const char *std_sec; - contents = bfd_malloc (hdr->sh_size); + /* PR 17512: file: 2844a11d. */ + if (hdr->sh_size == 0) + return; + contents = (bfd_byte *) bfd_malloc (hdr->sh_size); if (!contents) return; if (!bfd_get_section_contents (abfd, hdr->bfd_section, contents, 0, @@ -438,26 +447,34 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr) return; } p = contents; - std_section = get_elf_backend_data (abfd)->obj_attrs_vendor; + p_end = p + hdr->sh_size; + std_sec = get_elf_backend_data (abfd)->obj_attrs_vendor; + if (*(p++) == 'A') { len = hdr->sh_size - 1; - while (len > 0) + + while (len > 0 && p < p_end - 4) { - int namelen; + unsigned namelen; bfd_vma section_len; int vendor; section_len = bfd_get_32 (abfd, p); p += 4; + if (section_len == 0) + break; if (section_len > len) section_len = len; len -= section_len; - namelen = strlen ((char *)p) + 1; - section_len -= namelen + 4; - if (std_section && strcmp ((char *)p, std_section) == 0) + section_len -= 4; + namelen = strnlen ((char *) p, section_len) + 1; + if (namelen == 0 || namelen >= section_len) + break; + section_len -= namelen; + if (std_sec && strcmp ((char *) p, std_sec) == 0) vendor = OBJ_ATTR_PROC; - else if (strcmp ((char *)p, "gnu") == 0) + else if (strcmp ((char *) p, "gnu") == 0) vendor = OBJ_ATTR_GNU; else { @@ -467,7 +484,7 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr) } p += namelen; - while (section_len > 0) + while (section_len > 0 && p < p_end) { int tag; unsigned int n; @@ -475,15 +492,23 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr) bfd_vma subsection_len; bfd_byte *end; - tag = read_unsigned_leb128 (abfd, p, &n); + tag = safe_read_leb128 (abfd, p, &n, FALSE, p_end); p += n; - subsection_len = bfd_get_32 (abfd, p); + if (p < p_end - 4) + subsection_len = bfd_get_32 (abfd, p); + else + subsection_len = 0; p += 4; + if (subsection_len == 0) + break; if (subsection_len > section_len) subsection_len = section_len; section_len -= subsection_len; subsection_len -= n + 4; end = p + subsection_len; + /* PR 17512: file: 0e8c0c90. */ + if (end > p_end) + end = p_end; switch (tag) { case Tag_File: @@ -491,25 +516,25 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr) { int type; - tag = read_unsigned_leb128 (abfd, p, &n); + tag = safe_read_leb128 (abfd, p, &n, FALSE, end); p += n; type = _bfd_elf_obj_attrs_arg_type (abfd, vendor, tag); switch (type & (ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_STR_VAL)) { case ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_STR_VAL: - val = read_unsigned_leb128 (abfd, p, &n); + val = safe_read_leb128 (abfd, p, &n, FALSE, end); p += n; bfd_elf_add_obj_attr_int_string (abfd, vendor, tag, - val, (char *)p); + val, (char *) p); p += strlen ((char *)p) + 1; break; case ATTR_TYPE_FLAG_STR_VAL: bfd_elf_add_obj_attr_string (abfd, vendor, tag, - (char *)p); + (char *) p); p += strlen ((char *)p) + 1; break; case ATTR_TYPE_FLAG_INT_VAL: - val = read_unsigned_leb128 (abfd, p, &n); + val = safe_read_leb128 (abfd, p, &n, FALSE, end); p += n; bfd_elf_add_obj_attr_int (abfd, vendor, tag, val); break; @@ -564,7 +589,8 @@ _bfd_elf_merge_object_attributes (bfd *ibfd, bfd *obfd) if (in_attr->i > 0 && strcmp (in_attr->s, "gnu") != 0) { _bfd_error_handler - (_("ERROR: %B: Must be processed by '%s' toolchain"), + (_("error: %B: Object has vendor-specific contents that " + "must be processed by the '%s' toolchain"), ibfd, in_attr->s); return FALSE; } @@ -572,7 +598,7 @@ _bfd_elf_merge_object_attributes (bfd *ibfd, bfd *obfd) if (in_attr->i != out_attr->i || (in_attr->i != 0 && strcmp (in_attr->s, out_attr->s) != 0)) { - _bfd_error_handler (_("ERROR: %B: Object tag '%d, %s' is " + _bfd_error_handler (_("error: %B: Object tag '%d, %s' is " "incompatible with tag '%d, %s'"), ibfd, in_attr->i, in_attr->s ? in_attr->s : "", @@ -583,3 +609,114 @@ _bfd_elf_merge_object_attributes (bfd *ibfd, bfd *obfd) return TRUE; } + +/* Merge an unknown processor-specific attribute TAG, within the range + of known attributes, from IBFD into OBFD; return TRUE if the link + is OK, FALSE if it must fail. */ + +bfd_boolean +_bfd_elf_merge_unknown_attribute_low (bfd *ibfd, bfd *obfd, int tag) +{ + obj_attribute *in_attr; + obj_attribute *out_attr; + bfd *err_bfd = NULL; + bfd_boolean result = TRUE; + + in_attr = elf_known_obj_attributes_proc (ibfd); + out_attr = elf_known_obj_attributes_proc (obfd); + + if (out_attr[tag].i != 0 || out_attr[tag].s != NULL) + err_bfd = obfd; + else if (in_attr[tag].i != 0 || in_attr[tag].s != NULL) + err_bfd = ibfd; + + if (err_bfd != NULL) + result + = get_elf_backend_data (err_bfd)->obj_attrs_handle_unknown (err_bfd, tag); + + /* Only pass on attributes that match in both inputs. */ + if (in_attr[tag].i != out_attr[tag].i + || (in_attr[tag].s == NULL) != (out_attr[tag].s == NULL) + || (in_attr[tag].s != NULL && out_attr[tag].s != NULL + && strcmp (in_attr[tag].s, out_attr[tag].s) != 0)) + { + out_attr[tag].i = 0; + out_attr[tag].s = NULL; + } + + return result; +} + +/* Merge the lists of unknown processor-specific attributes, outside + the known range, from IBFD into OBFD; return TRUE if the link is + OK, FALSE if it must fail. */ + +bfd_boolean +_bfd_elf_merge_unknown_attribute_list (bfd *ibfd, bfd *obfd) +{ + obj_attribute_list *in_list; + obj_attribute_list *out_list; + obj_attribute_list **out_listp; + bfd_boolean result = TRUE; + + in_list = elf_other_obj_attributes_proc (ibfd); + out_listp = &elf_other_obj_attributes_proc (obfd); + out_list = *out_listp; + + for (; in_list || out_list; ) + { + bfd *err_bfd = NULL; + int err_tag = 0; + + /* The tags for each list are in numerical order. */ + /* If the tags are equal, then merge. */ + if (out_list && (!in_list || in_list->tag > out_list->tag)) + { + /* This attribute only exists in obfd. We can't merge, and we don't + know what the tag means, so delete it. */ + err_bfd = obfd; + err_tag = out_list->tag; + *out_listp = out_list->next; + out_list = *out_listp; + } + else if (in_list && (!out_list || in_list->tag < out_list->tag)) + { + /* This attribute only exists in ibfd. We can't merge, and we don't + know what the tag means, so ignore it. */ + err_bfd = ibfd; + err_tag = in_list->tag; + in_list = in_list->next; + } + else /* The tags are equal. */ + { + /* As present, all attributes in the list are unknown, and + therefore can't be merged meaningfully. */ + err_bfd = obfd; + err_tag = out_list->tag; + + /* Only pass on attributes that match in both inputs. */ + if (in_list->attr.i != out_list->attr.i + || (in_list->attr.s == NULL) != (out_list->attr.s == NULL) + || (in_list->attr.s && out_list->attr.s + && strcmp (in_list->attr.s, out_list->attr.s) != 0)) + { + /* No match. Delete the attribute. */ + *out_listp = out_list->next; + out_list = *out_listp; + } + else + { + /* Matched. Keep the attribute and move to the next. */ + out_list = out_list->next; + in_list = in_list->next; + } + } + + if (err_bfd) + result = result + && get_elf_backend_data (err_bfd)->obj_attrs_handle_unknown (err_bfd, + err_tag); + } + + return result; +}