/* BFD back-end for WebAssembly modules.
- Copyright (C) 2017 Free Software Foundation, Inc.
+ Copyright (C) 2017-2020 Free Software Foundation, Inc.
Based on srec.c, mmo.c, and binary.c
#include "sysdep.h"
#include "alloca-conf.h"
#include "bfd.h"
-#include "sysdep.h"
#include <limits.h>
-#include "bfd_stdint.h"
#include "libiberty.h"
#include "libbfd.h"
#include "wasm-module.h"
incomplete numbers). SIGN means interpret the number as SLEB128. */
static bfd_vma
-wasm_read_leb128 (bfd * abfd,
- bfd_boolean * error_return,
- unsigned int * length_return,
- bfd_boolean sign)
+wasm_read_leb128 (bfd * abfd,
+ bfd_boolean * error_return,
+ unsigned int * length_return,
+ bfd_boolean sign)
{
bfd_vma result = 0;
unsigned int num_read = 0;
unsigned int shift = 0;
unsigned char byte = 0;
- bfd_boolean success = FALSE;
+ int status = 1;
while (bfd_bread (&byte, 1, abfd) == 1)
{
num_read++;
- result |= ((bfd_vma) (byte & 0x7f)) << shift;
+ if (shift < sizeof (result) * 8)
+ {
+ result |= ((bfd_vma) (byte & 0x7f)) << shift;
+ if ((result >> shift) != (byte & 0x7f))
+ /* Overflow. */
+ status |= 2;
+ shift += 7;
+ }
+ else if ((byte & 0x7f) != 0)
+ status |= 2;
- shift += 7;
if ((byte & 0x80) == 0)
- {
- success = TRUE;
- break;
- }
+ {
+ status &= ~1;
+ if (sign && (shift < 8 * sizeof (result)) && (byte & 0x40))
+ result |= -((bfd_vma) 1 << shift);
+ break;
+ }
}
if (length_return != NULL)
*length_return = num_read;
if (error_return != NULL)
- *error_return = ! success;
-
- if (sign && (shift < 8 * sizeof (result)) && (byte & 0x40))
- result |= -((bfd_vma) 1 << shift);
+ *error_return = status != 0;
return result;
}
v >>= 7;
if (v)
- c |= 0x80;
+ c |= 0x80;
if (bfd_bwrite (&c, 1, abfd) != 1)
- return FALSE;
+ return FALSE;
}
while (v);
/* Read the LEB128 integer at P, saving it to X; at end of buffer,
jump to error_return. */
-#define READ_LEB128(x, p, end) \
- do \
- { \
- unsigned int length_read; \
- (x) = _bfd_safe_read_leb128 (abfd, (p), &length_read, \
- FALSE, (end)); \
- (p) += length_read; \
- if (length_read == 0) \
- goto error_return; \
- } \
+#define READ_LEB128(x, p, end) \
+ do \
+ { \
+ unsigned int length_read; \
+ (x) = _bfd_safe_read_leb128 (abfd, (p), &length_read, \
+ FALSE, (end)); \
+ (p) += length_read; \
+ if (length_read == 0) \
+ goto error_return; \
+ } \
while (0)
/* Verify the magic number at the beginning of a WebAssembly module
tdata_type *tdata = abfd->tdata.any;
asymbol *symbols = NULL;
sec_ptr space_function_index;
-
- if (! asect)
- return FALSE;
-
- if (strcmp (asect->name, WASM_NAME_SECTION) != 0)
- return FALSE;
+ size_t amt;
p = asect->contents;
end = asect->contents + asect->size;
- if (! p)
+ if (!p)
return FALSE;
while (p < end)
{
bfd_byte subsection_code = *p++;
if (subsection_code == WASM_FUNCTION_SUBSECTION)
- break;
+ break;
/* subsection_code is documented to be a varuint7, meaning that
- it has to be a single byte in the 0 - 127 range. If it isn't,
- the spec must have changed underneath us, so give up. */
+ it has to be a single byte in the 0 - 127 range. If it isn't,
+ the spec must have changed underneath us, so give up. */
if (subsection_code & 0x80)
- return FALSE;
+ return FALSE;
READ_LEB128 (payload_size, p, end);
- if (p > p + payload_size)
- return FALSE;
+ if (payload_size > (size_t) (end - p))
+ return FALSE;
p += payload_size;
}
READ_LEB128 (payload_size, p, end);
- if (p > p + payload_size)
- return FALSE;
-
- if (p + payload_size > end)
+ if (payload_size > (size_t) (end - p))
return FALSE;
end = p + payload_size;
READ_LEB128 (symcount, p, end);
/* Sanity check: each symbol has at least two bytes. */
- if (symcount > payload_size/2)
+ if (symcount > payload_size / 2)
return FALSE;
tdata->symcount = symcount;
- space_function_index = bfd_make_section_with_flags
- (abfd, WASM_SECTION_FUNCTION_INDEX, SEC_READONLY | SEC_CODE);
+ space_function_index
+ = bfd_make_section_with_flags (abfd, WASM_SECTION_FUNCTION_INDEX,
+ SEC_READONLY | SEC_CODE);
- if (! space_function_index)
- space_function_index = bfd_get_section_by_name (abfd, WASM_SECTION_FUNCTION_INDEX);
+ if (!space_function_index)
+ space_function_index
+ = bfd_get_section_by_name (abfd, WASM_SECTION_FUNCTION_INDEX);
- if (! space_function_index)
+ if (!space_function_index)
return FALSE;
- symbols = bfd_zalloc (abfd, tdata->symcount * sizeof (asymbol));
- if (! symbols)
+ if (_bfd_mul_overflow (tdata->symcount, sizeof (asymbol), &amt))
+ {
+ bfd_set_error (bfd_error_file_too_big);
+ return FALSE;
+ }
+ symbols = bfd_alloc (abfd, amt);
+ if (!symbols)
return FALSE;
for (symcount = 0; p < end && symcount < tdata->symcount; symcount++)
{
- bfd_vma index;
+ bfd_vma idx;
bfd_vma len;
char *name;
asymbol *sym;
- READ_LEB128 (index, p, end);
+ READ_LEB128 (idx, p, end);
READ_LEB128 (len, p, end);
- if (p + len < p || p + len > end)
- goto error_return;
+ if (len > (size_t) (end - p))
+ goto error_return;
- name = bfd_zalloc (abfd, len + 1);
- if (! name)
- goto error_return;
+ name = bfd_alloc (abfd, len + 1);
+ if (!name)
+ goto error_return;
memcpy (name, p, len);
+ name[len] = 0;
p += len;
sym = &symbols[symcount];
sym->the_bfd = abfd;
sym->name = name;
- sym->value = index;
+ sym->value = idx;
sym->flags = BSF_GLOBAL | BSF_FUNCTION;
sym->section = space_function_index;
sym->udata.p = NULL;
return TRUE;
error_return:
- while (symcount)
- bfd_release (abfd, (void *)symbols[--symcount].name);
bfd_release (abfd, symbols);
return FALSE;
}
if (bfd_bread (&byte, (bfd_size_type) 1, abfd) != 1)
{
if (bfd_get_error () != bfd_error_file_truncated)
- *errorptr = TRUE;
+ *errorptr = TRUE;
return EOF;
}
bfd_vma vma = 0x80000000;
int section_code;
unsigned int bytes_read;
- char *name = NULL;
asection *bfdsec;
if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
goto error_return;
- if (! wasm_read_header (abfd, &error))
+ if (!wasm_read_header (abfd, &error))
goto error_return;
while ((section_code = wasm_read_byte (abfd, &error)) != EOF)
{
if (section_code != 0)
- {
- const char *sname = wasm_section_code_to_name (section_code);
-
- if (! sname)
- goto error_return;
-
- name = strdup (sname);
- bfdsec = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS);
- if (bfdsec == NULL)
- goto error_return;
- name = NULL;
-
- bfdsec->vma = vma;
- bfdsec->lma = vma;
- bfdsec->size = wasm_read_leb128 (abfd, &error, &bytes_read, FALSE);
- if (error)
- goto error_return;
- bfdsec->filepos = bfd_tell (abfd);
- bfdsec->alignment_power = 0;
- }
+ {
+ const char *sname = wasm_section_code_to_name (section_code);
+
+ if (!sname)
+ goto error_return;
+
+ bfdsec = bfd_make_section_anyway_with_flags (abfd, sname,
+ SEC_HAS_CONTENTS);
+ if (bfdsec == NULL)
+ goto error_return;
+
+ bfdsec->size = wasm_read_leb128 (abfd, &error, &bytes_read, FALSE);
+ if (error)
+ goto error_return;
+ }
else
- {
- bfd_vma payload_len;
- file_ptr section_start;
- bfd_vma namelen;
- char *prefix = WASM_SECTION_PREFIX;
- char *p;
- int ret;
-
- payload_len = wasm_read_leb128 (abfd, &error, &bytes_read, FALSE);
- if (error)
- goto error_return;
- section_start = bfd_tell (abfd);
- namelen = wasm_read_leb128 (abfd, &error, &bytes_read, FALSE);
- if (error || namelen > payload_len)
- goto error_return;
- name = bfd_zmalloc (namelen + strlen (prefix) + 1);
- if (! name)
- goto error_return;
- p = name;
- ret = sprintf (p, "%s", prefix);
- if (ret < 0 || (bfd_vma) ret != strlen (prefix))
- goto error_return;
- p += ret;
- if (bfd_bread (p, namelen, abfd) != namelen)
+ {
+ bfd_vma payload_len;
+ bfd_vma namelen;
+ char *name;
+ char *prefix = WASM_SECTION_PREFIX;
+ size_t prefixlen = strlen (prefix);
+ ufile_ptr filesize;
+
+ payload_len = wasm_read_leb128 (abfd, &error, &bytes_read, FALSE);
+ if (error)
+ goto error_return;
+ namelen = wasm_read_leb128 (abfd, &error, &bytes_read, FALSE);
+ if (error || bytes_read > payload_len
+ || namelen > payload_len - bytes_read)
+ goto error_return;
+ payload_len -= namelen + bytes_read;
+ filesize = bfd_get_file_size (abfd);
+ if (filesize != 0 && namelen > filesize)
+ {
+ bfd_set_error (bfd_error_file_truncated);
+ return FALSE;
+ }
+ name = bfd_alloc (abfd, namelen + prefixlen + 1);
+ if (!name)
goto error_return;
+ memcpy (name, prefix, prefixlen);
+ if (bfd_bread (name + prefixlen, namelen, abfd) != namelen)
+ goto error_return;
+ name[prefixlen + namelen] = 0;
- bfdsec = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS);
- if (bfdsec == NULL)
- goto error_return;
- name = NULL;
+ bfdsec = bfd_make_section_anyway_with_flags (abfd, name,
+ SEC_HAS_CONTENTS);
+ if (bfdsec == NULL)
+ goto error_return;
- bfdsec->vma = vma;
- bfdsec->lma = vma;
- bfdsec->filepos = bfd_tell (abfd);
- bfdsec->size = section_start + payload_len - bfdsec->filepos;
- bfdsec->alignment_power = 0;
- }
+ bfdsec->size = payload_len;
+ }
+ bfdsec->vma = vma;
+ bfdsec->lma = vma;
+ bfdsec->alignment_power = 0;
+ bfdsec->filepos = bfd_tell (abfd);
if (bfdsec->size != 0)
- {
- bfdsec->contents = bfd_zalloc (abfd, bfdsec->size);
- if (! bfdsec->contents)
- goto error_return;
-
- if (bfd_bread (bfdsec->contents, bfdsec->size, abfd) != bfdsec->size)
+ {
+ bfdsec->contents = _bfd_alloc_and_read (abfd, bfdsec->size,
+ bfdsec->size);
+ if (!bfdsec->contents)
goto error_return;
- }
+ }
vma += bfdsec->size;
}
return TRUE;
error_return:
- if (name)
- free (name);
-
- for (bfdsec = abfd->sections; bfdsec; bfdsec = bfdsec->next)
- free ((void *) bfdsec->name);
-
return FALSE;
}
static void
wasm_register_section (bfd *abfd ATTRIBUTE_UNUSED,
- asection *asect,
+ asection *asect,
void *fsarg)
{
sec_ptr *numbered_sections = fsarg;
- int index = wasm_section_name_to_code (asect->name);
+ int idx = wasm_section_name_to_code (asect->name);
- if (index == 0)
+ if (idx == 0)
return;
- numbered_sections[index] = asect;
+ numbered_sections[idx] = asect;
}
struct compute_section_arg
static void
wasm_compute_custom_section_file_position (bfd *abfd,
sec_ptr asect,
- void *fsarg)
+ void *fsarg)
{
struct compute_section_arg *fs = fsarg;
- int index;
+ int idx;
if (fs->failed)
return;
- index = wasm_section_name_to_code (asect->name);
+ idx = wasm_section_name_to_code (asect->name);
- if (index != 0)
+ if (idx != 0)
return;
if (CONST_STRNEQ (asect->name, WASM_SECTION_PREFIX))
payload_len += name_len;
do
- {
- payload_len++;
- nl >>= 7;
- }
+ {
+ payload_len++;
+ nl >>= 7;
+ }
while (nl);
bfd_seek (abfd, fs->pos, SEEK_SET);
if (! wasm_write_uleb128 (abfd, 0)
- || ! wasm_write_uleb128 (abfd, payload_len)
- || ! wasm_write_uleb128 (abfd, name_len)
- || bfd_bwrite (name, name_len, abfd) != name_len)
- goto error_return;
+ || ! wasm_write_uleb128 (abfd, payload_len)
+ || ! wasm_write_uleb128 (abfd, name_len)
+ || bfd_bwrite (name, name_len, abfd) != name_len)
+ goto error_return;
fs->pos = asect->filepos = bfd_tell (abfd);
}
else
bfd_size_type size;
if (! sec)
- continue;
+ continue;
size = sec->size;
if (bfd_seek (abfd, fs.pos, SEEK_SET) != 0)
- return FALSE;
+ return FALSE;
if (! wasm_write_uleb128 (abfd, i)
- || ! wasm_write_uleb128 (abfd, size))
- return FALSE;
+ || ! wasm_write_uleb128 (abfd, size))
+ return FALSE;
fs.pos = sec->filepos = bfd_tell (abfd);
fs.pos += size;
}
static bfd_boolean
wasm_set_section_contents (bfd *abfd,
- sec_ptr section,
- const void *location,
- file_ptr offset,
- bfd_size_type count)
+ sec_ptr section,
+ const void *location,
+ file_ptr offset,
+ bfd_size_type count)
{
if (count == 0)
return TRUE;
static asymbol *
wasm_make_empty_symbol (bfd *abfd)
{
- bfd_size_type amt = sizeof (asymbol);
+ size_t amt = sizeof (asymbol);
asymbol *new_symbol = (asymbol *) bfd_zalloc (abfd, amt);
if (! new_symbol)
static void
wasm_print_symbol (bfd *abfd,
- void * filep,
- asymbol *symbol,
- bfd_print_symbol_type how)
+ void * filep,
+ asymbol *symbol,
+ bfd_print_symbol_type how)
{
FILE *file = (FILE *) filep;
static void
wasm_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED,
- asymbol *symbol,
- symbol_info *ret)
+ asymbol *symbol,
+ symbol_info *ret)
{
bfd_symbol_info (symbol, ret);
}
/* Check whether ABFD is a WebAssembly module; if so, scan it. */
-static const bfd_target *
+static bfd_cleanup
wasm_object_p (bfd *abfd)
{
bfd_boolean error;
+ asection *s;
if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
return NULL;
- if (! wasm_read_header (abfd, &error))
+ if (!wasm_read_header (abfd, &error))
{
bfd_set_error (bfd_error_wrong_format);
return NULL;
}
- if (! wasm_mkobject (abfd) || ! wasm_scan (abfd))
+ if (!wasm_mkobject (abfd))
return NULL;
- if (! bfd_default_set_arch_mach (abfd, bfd_arch_wasm32, 0))
- return NULL;
+ if (!wasm_scan (abfd)
+ || !bfd_default_set_arch_mach (abfd, bfd_arch_wasm32, 0))
+ {
+ bfd_release (abfd, abfd->tdata.any);
+ abfd->tdata.any = NULL;
+ return NULL;
+ }
- if (wasm_scan_name_function_section (abfd, bfd_get_section_by_name (abfd, WASM_NAME_SECTION)))
+ s = bfd_get_section_by_name (abfd, WASM_NAME_SECTION);
+ if (s != NULL && wasm_scan_name_function_section (abfd, s))
abfd->flags |= HAS_SYMS;
- return abfd->xvec;
+ return _bfd_no_cleanup;
}
/* BFD_JUMP_TABLE_WRITE */
-#define wasm_set_arch_mach _bfd_generic_set_arch_mach
+#define wasm_set_arch_mach _bfd_generic_set_arch_mach
/* BFD_JUMP_TABLE_SYMBOLS */
-#define wasm_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string
-#define wasm_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define wasm_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
-#define wasm_get_lineno _bfd_nosymbols_get_lineno
-#define wasm_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define wasm_find_line _bfd_nosymbols_find_line
-#define wasm_find_inliner_info _bfd_nosymbols_find_inliner_info
-#define wasm_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define wasm_read_minisymbols _bfd_generic_read_minisymbols
-#define wasm_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
+#define wasm_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string
+#define wasm_bfd_is_local_label_name bfd_generic_is_local_label_name
+#define wasm_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_false
+#define wasm_get_lineno _bfd_nosymbols_get_lineno
+#define wasm_find_nearest_line _bfd_nosymbols_find_nearest_line
+#define wasm_find_line _bfd_nosymbols_find_line
+#define wasm_find_inliner_info _bfd_nosymbols_find_inliner_info
+#define wasm_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+#define wasm_read_minisymbols _bfd_generic_read_minisymbols
+#define wasm_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
const bfd_target wasm_vec =
{
- "wasm", /* Name. */
+ "wasm", /* Name. */
bfd_target_unknown_flavour,
BFD_ENDIAN_LITTLE,
BFD_ENDIAN_LITTLE,
(HAS_SYMS | WP_TEXT), /* Object flags. */
(SEC_CODE | SEC_DATA | SEC_HAS_CONTENTS), /* Section flags. */
- 0, /* Leading underscore. */
- ' ', /* AR_pad_char. */
- 255, /* AR_max_namelen. */
+ 0, /* Leading underscore. */
+ ' ', /* AR_pad_char. */
+ 255, /* AR_max_namelen. */
0, /* Match priority. */
/* Routines to byte-swap various sized integers from the data sections. */
bfd_getl64, bfd_getl_signed_64, bfd_putl64,
_bfd_dummy_target,
},
{
- bfd_false,
+ _bfd_bool_bfd_false_error,
wasm_mkobject,
_bfd_generic_mkarchive,
- bfd_false,
+ _bfd_bool_bfd_false_error,
},
{ /* bfd_write_contents. */
- bfd_false,
+ _bfd_bool_bfd_false_error,
wasm_write_object_contents,
_bfd_write_archive_contents,
- bfd_false,
+ _bfd_bool_bfd_false_error,
},
BFD_JUMP_TABLE_GENERIC (_bfd_generic),
projects / deliverable / binutils-gdb.git / blobdiff