X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=bfd%2Farchive64.c;h=a84be953d4bc7dafea68147c66ed662a98f86903;hb=5f3fc928df037b21ee401d7115951b988a3ea571;hp=4cccd5420f3c21a90d12741c4f3bafaca4ebc53d;hpb=219d1afa89d0d53ca93a684cac341f16470f3ca0;p=binutils-gdb.git diff --git a/bfd/archive64.c b/bfd/archive64.c index 4cccd5420f3..a84be953d4b 100644 --- a/bfd/archive64.c +++ b/bfd/archive64.c @@ -1,5 +1,5 @@ /* Support for 64-bit archives. - Copyright (C) 1996-2018 Free Software Foundation, Inc. + Copyright (C) 1996-2022 Free Software Foundation, Inc. Ian Lance Taylor, Cygnus Support Linker support added by Mark Mitchell, CodeSourcery, LLC. @@ -34,7 +34,7 @@ /* Read an Irix 6 armap. */ -bfd_boolean +bool _bfd_archive_64_bit_slurp_armap (bfd *abfd) { struct artdata *ardata = bfd_ardata (abfd); @@ -47,40 +47,48 @@ _bfd_archive_64_bit_slurp_armap (bfd *abfd) bfd_byte *raw_armap = NULL; carsym *carsyms; bfd_size_type amt; + ufile_ptr filesize; ardata->symdefs = NULL; /* Get the name of the first element. */ i = bfd_bread (nextname, 16, abfd); if (i == 0) - return TRUE; + return true; if (i != 16) - return FALSE; + return false; if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) != 0) - return FALSE; + return false; /* Archives with traditional armaps are still permitted. */ - if (CONST_STRNEQ (nextname, "/ ")) + if (startswith (nextname, "/ ")) return bfd_slurp_armap (abfd); - if (! CONST_STRNEQ (nextname, "/SYM64/ ")) + if (! startswith (nextname, "/SYM64/ ")) { - bfd_has_map (abfd) = FALSE; - return TRUE; + abfd->has_armap = false; + return true; } mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd); if (mapdata == NULL) - return FALSE; + return false; parsed_size = mapdata->parsed_size; free (mapdata); + filesize = bfd_get_file_size (abfd); + if (filesize != 0 && parsed_size > filesize) + { + bfd_set_error (bfd_error_malformed_archive); + return false; + } + if (bfd_bread (int_buf, 8, abfd) != 8) { if (bfd_get_error () != bfd_error_system_call) bfd_set_error (bfd_error_malformed_archive); - return FALSE; + return false; } nsymz = bfd_getb64 (int_buf); @@ -90,63 +98,65 @@ _bfd_archive_64_bit_slurp_armap (bfd *abfd) ptrsize = 8 * nsymz; amt = carsym_size + stringsize + 1; - if (carsym_size < nsymz || ptrsize < nsymz || amt < nsymz) + if (/* Catch overflow in stringsize (and ptrsize) expression. */ + nsymz >= (bfd_size_type) -1 / 8 + || stringsize > parsed_size + /* Catch overflow in carsym_size expression. */ + || nsymz > (bfd_size_type) -1 / sizeof (carsym) + /* Catch overflow in amt expression. */ + || amt <= carsym_size + || amt <= stringsize) { bfd_set_error (bfd_error_malformed_archive); - return FALSE; + return false; } - ardata->symdefs = (struct carsym *) bfd_zalloc (abfd, amt); + ardata->symdefs = (struct carsym *) bfd_alloc (abfd, amt); if (ardata->symdefs == NULL) - return FALSE; + return false; carsyms = ardata->symdefs; stringbase = ((char *) ardata->symdefs) + carsym_size; - stringbase[stringsize] = 0; - stringend = stringbase + stringsize; - - raw_armap = (bfd_byte *) bfd_alloc (abfd, ptrsize); - if (raw_armap == NULL) - goto release_symdefs; - if (bfd_bread (raw_armap, ptrsize, abfd) != ptrsize + raw_armap = (bfd_byte *) _bfd_alloc_and_read (abfd, ptrsize, ptrsize); + if (raw_armap == NULL || bfd_bread (stringbase, stringsize, abfd) != stringsize) { if (bfd_get_error () != bfd_error_system_call) bfd_set_error (bfd_error_malformed_archive); - goto release_raw_armap; + goto release_symdefs; } + stringend = stringbase + stringsize; + *stringend = 0; for (i = 0; i < nsymz; i++) { carsyms->file_offset = bfd_getb64 (raw_armap + i * 8); carsyms->name = stringbase; - if (stringbase < stringend) - stringbase += strlen (stringbase) + 1; + stringbase += strlen (stringbase); + if (stringbase != stringend) + ++stringbase; ++carsyms; } - *stringbase = '\0'; ardata->symdef_count = nsymz; ardata->first_file_filepos = bfd_tell (abfd); /* Pad to an even boundary if you have to. */ ardata->first_file_filepos += (ardata->first_file_filepos) % 2; - bfd_has_map (abfd) = TRUE; + abfd->has_armap = true; bfd_release (abfd, raw_armap); - return TRUE; + return true; -release_raw_armap: - bfd_release (abfd, raw_armap); -release_symdefs: + release_symdefs: bfd_release (abfd, ardata->symdefs); - return FALSE; + return false; } /* Write out an Irix 6 armap. The Irix 6 tools are supposed to be able to handle ordinary ELF armaps, but at least on Irix 6.2 the linker crashes. */ -bfd_boolean +bool _bfd_archive_64_bit_write_armap (bfd *arch, unsigned int elength, struct orl *map, @@ -175,7 +185,7 @@ _bfd_archive_64_bit_write_armap (bfd *arch, memset (&hdr, ' ', sizeof (struct ar_hdr)); memcpy (hdr.ar_name, "/SYM64/", strlen ("/SYM64/")); if (!_bfd_ar_sizepad (hdr.ar_size, sizeof (hdr.ar_size), mapsize)) - return FALSE; + return false; _bfd_ar_spacepad (hdr.ar_date, sizeof (hdr.ar_date), "%ld", time (NULL)); /* This, at least, is what Intel coff sets the values to.: */ @@ -188,11 +198,11 @@ _bfd_archive_64_bit_write_armap (bfd *arch, if (bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch) != sizeof (struct ar_hdr)) - return FALSE; + return false; bfd_putb64 ((bfd_vma) symbol_count, buf); if (bfd_bwrite (buf, 8, arch) != 8) - return FALSE; + return false; /* Two passes, first write the file offsets for each symbol - remembering that each offset is on a two byte boundary. */ @@ -213,7 +223,7 @@ _bfd_archive_64_bit_write_armap (bfd *arch, { bfd_putb64 ((bfd_vma) archive_member_file_ptr, buf); if (bfd_bwrite (buf, 8, arch) != 8) - return FALSE; + return false; } /* Add size of this archive entry */ @@ -230,7 +240,7 @@ _bfd_archive_64_bit_write_armap (bfd *arch, size_t len = strlen (*map[count].name) + 1; if (bfd_bwrite (*map[count].name, len, arch) != len) - return FALSE; + return false; } /* The spec says that this should be padded to an 8 byte boundary. @@ -238,9 +248,9 @@ _bfd_archive_64_bit_write_armap (bfd *arch, while (padding != 0) { if (bfd_bwrite ("", 1, arch) != 1) - return FALSE; + return false; --padding; } - return TRUE; + return true; }