espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-11 02:38:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

alpha-vms: don't exit on stack underflow/overflow

Browse Source 
BFD is not supposed to exit or abort on anything the user can do.

	* vms-alpha.c (_bfd_vms_push, _bfd_vms_pop): Return pass/fail
	status rather than exiting on stack overflow or underflow.
	(_bfd_vms_slurp_etir): Adjust to suit.
This commit is contained in:
Alan Modra
2020-01-06 18:29:14 +10:30
parent cc6aa1a6e0
commit ab356be74c
2 changed files with 108 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2020-01-06 Alan Modra <amodra@gmail.com>
* vms-alpha.c (_bfd_vms_push, _bfd_vms_pop): Return pass/fail
status rather than exiting on stack overflow or underflow.
(_bfd_vms_slurp_etir): Adjust to suit.
2020-01-06 Alan Modra <amodra@gmail.com> 2020-01-06 Alan Modra <amodra@gmail.com>
* som.c (som_bfd_fill_in_ar_symbols): Bounds check som_dict index. * som.c (som_bfd_fill_in_ar_symbols): Bounds check som_dict index.

155
bfd/vms-alpha.c
View File

@ -1456,7 +1456,7 @@ _bfd_vms_slurp_egsd (bfd *abfd)
/* Push value and section index. */ /* Push value and section index. */
static void static bfd_boolean
_bfd_vms_push (bfd *abfd, bfd_vma val, unsigned int reloc) _bfd_vms_push (bfd *abfd, bfd_vma val, unsigned int reloc)
{ {
vms_debug2 ((4, "<push %08lx (0x%08x) at %d>\n", vms_debug2 ((4, "<push %08lx (0x%08x) at %d>\n",
@ -1469,26 +1469,28 @@ _bfd_vms_push (bfd *abfd, bfd_vma val, unsigned int reloc)
{ {
bfd_set_error (bfd_error_bad_value); bfd_set_error (bfd_error_bad_value);
_bfd_error_handler (_("stack overflow (%d) in _bfd_vms_push"), PRIV (stackptr)); _bfd_error_handler (_("stack overflow (%d) in _bfd_vms_push"), PRIV (stackptr));
exit (1); return FALSE;
} }
return TRUE;
} }
/* Pop value and section index. */ /* Pop value and section index. */
static void static bfd_boolean
_bfd_vms_pop (bfd *abfd, bfd_vma *val, unsigned int *rel) _bfd_vms_pop (bfd *abfd, bfd_vma *val, unsigned int *rel)
{ {
if (PRIV (stackptr) == 0) if (PRIV (stackptr) == 0)
{ {
bfd_set_error (bfd_error_bad_value); bfd_set_error (bfd_error_bad_value);
_bfd_error_handler (_("stack underflow in _bfd_vms_pop")); _bfd_error_handler (_("stack underflow in _bfd_vms_pop"));
exit (1); return FALSE;
} }
PRIV (stackptr)--; PRIV (stackptr)--;
*val = PRIV (stack[PRIV (stackptr)]).value; *val = PRIV (stack[PRIV (stackptr)]).value;
*rel = PRIV (stack[PRIV (stackptr)]).reloc; *rel = PRIV (stack[PRIV (stackptr)]).reloc;
vms_debug2 ((4, "<pop %08lx (0x%08x)>\n", (unsigned long)*val, *rel)); vms_debug2 ((4, "<pop %08lx (0x%08x)>\n", (unsigned long)*val, *rel));
return TRUE;
} }
/* Routines to fill sections contents during tir/etir read. */ /* Routines to fill sections contents during tir/etir read. */
@ -1905,7 +1907,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
stack 32 bit value of symbol (high bits set to 0). */ stack 32 bit value of symbol (high bits set to 0). */
case ETIR__C_STA_GBL: case ETIR__C_STA_GBL:
_bfd_vms_get_value (abfd, ptr, maxptr, info, &op1, &h); _bfd_vms_get_value (abfd, ptr, maxptr, info, &op1, &h);
_bfd_vms_push (abfd, op1, alpha_vms_sym_to_ctxt (h)); if (!_bfd_vms_push (abfd, op1, alpha_vms_sym_to_ctxt (h)))
return FALSE;
break; break;
/* Stack longword /* Stack longword
@ -1915,7 +1918,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
case ETIR__C_STA_LW: case ETIR__C_STA_LW:
if (ptr + 4 > maxptr) if (ptr + 4 > maxptr)
goto corrupt_etir; goto corrupt_etir;
_bfd_vms_push (abfd, bfd_getl32 (ptr), RELC_NONE); if (!_bfd_vms_push (abfd, bfd_getl32 (ptr), RELC_NONE))
return FALSE;
break; break;
/* Stack quadword /* Stack quadword
@ -1925,7 +1929,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
case ETIR__C_STA_QW: case ETIR__C_STA_QW:
if (ptr + 8 > maxptr) if (ptr + 8 > maxptr)
goto corrupt_etir; goto corrupt_etir;
_bfd_vms_push (abfd, bfd_getl64 (ptr), RELC_NONE); if (!_bfd_vms_push (abfd, bfd_getl64 (ptr), RELC_NONE))
return FALSE;
break; break;
/* Stack psect base plus quadword offset /* Stack psect base plus quadword offset
@ -1949,7 +1954,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
return FALSE; return FALSE;
} }
op1 = bfd_getl64 (ptr + 4); op1 = bfd_getl64 (ptr + 4);
_bfd_vms_push (abfd, op1, psect | RELC_SEC_BASE); if (!_bfd_vms_push (abfd, op1, psect | RELC_SEC_BASE))
return FALSE;
} }
break; break;
@ -1964,7 +1970,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
/* Store byte: pop stack, write byte /* Store byte: pop stack, write byte
arg: -. */ arg: -. */
case ETIR__C_STO_B: case ETIR__C_STO_B:
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (rel1 != RELC_NONE) if (rel1 != RELC_NONE)
goto bad_context; goto bad_context;
image_write_b (abfd, (unsigned int) op1 & 0xff); image_write_b (abfd, (unsigned int) op1 & 0xff);
@ -1973,7 +1980,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
/* Store word: pop stack, write word /* Store word: pop stack, write word
arg: -. */ arg: -. */
case ETIR__C_STO_W: case ETIR__C_STO_W:
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (rel1 != RELC_NONE) if (rel1 != RELC_NONE)
goto bad_context; goto bad_context;
image_write_w (abfd, (unsigned int) op1 & 0xffff); image_write_w (abfd, (unsigned int) op1 & 0xffff);
@ -1982,7 +1990,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
/* Store longword: pop stack, write longword /* Store longword: pop stack, write longword
arg: -. */ arg: -. */
case ETIR__C_STO_LW: case ETIR__C_STO_LW:
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (rel1 & RELC_SEC_BASE) if (rel1 & RELC_SEC_BASE)
{ {
op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1); op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
@ -2005,7 +2014,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
/* Store quadword: pop stack, write quadword /* Store quadword: pop stack, write quadword
arg: -. */ arg: -. */
case ETIR__C_STO_QW: case ETIR__C_STO_QW:
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (rel1 & RELC_SEC_BASE) if (rel1 & RELC_SEC_BASE)
{ {
op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1); op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
@ -2032,7 +2042,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
if (ptr + 4 > maxptr) if (ptr + 4 > maxptr)
goto corrupt_etir; goto corrupt_etir;
size = bfd_getl32 (ptr); size = bfd_getl32 (ptr);
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (rel1 != RELC_NONE) if (rel1 != RELC_NONE)
goto bad_context; goto bad_context;
while (op1-- > 0) while (op1-- > 0)
@ -2095,7 +2106,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
/* Store offset to psect: pop stack, add low 32 bits to base of psect /* Store offset to psect: pop stack, add low 32 bits to base of psect
arg: none. */ arg: none. */
case ETIR__C_STO_OFF: case ETIR__C_STO_OFF:
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (!(rel1 & RELC_SEC_BASE)) if (!(rel1 & RELC_SEC_BASE))
abort (); abort ();
@ -2266,7 +2278,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
/* Det relocation base: pop stack, set image location counter /* Det relocation base: pop stack, set image location counter
arg: none. */ arg: none. */
case ETIR__C_CTL_SETRB: case ETIR__C_CTL_SETRB:
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (!(rel1 & RELC_SEC_BASE)) if (!(rel1 & RELC_SEC_BASE))
abort (); abort ();
image_set_ptr (abfd, op1, rel1 & RELC_MASK, info); image_set_ptr (abfd, op1, rel1 & RELC_MASK, info);
@ -2284,7 +2297,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
/* Define location: pop index, save location counter under index /* Define location: pop index, save location counter under index
arg: none. */ arg: none. */
case ETIR__C_CTL_DFLOC: case ETIR__C_CTL_DFLOC:
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (rel1 != RELC_NONE) if (rel1 != RELC_NONE)
goto bad_context; goto bad_context;
dst_define_location (abfd, op1); dst_define_location (abfd, op1);
@ -2293,7 +2307,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
/* Set location: pop index, restore location counter from index /* Set location: pop index, restore location counter from index
arg: none. */ arg: none. */
case ETIR__C_CTL_STLOC: case ETIR__C_CTL_STLOC:
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (rel1 != RELC_NONE) if (rel1 != RELC_NONE)
goto bad_context; goto bad_context;
dst_restore_location (abfd, op1); dst_restore_location (abfd, op1);
@ -2302,28 +2317,34 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
/* Stack defined location: pop index, push location counter from index /* Stack defined location: pop index, push location counter from index
arg: none. */ arg: none. */
case ETIR__C_CTL_STKDL: case ETIR__C_CTL_STKDL:
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (rel1 != RELC_NONE) if (rel1 != RELC_NONE)
goto bad_context; goto bad_context;
_bfd_vms_push (abfd, dst_retrieve_location (abfd, op1), RELC_NONE); if (!_bfd_vms_push (abfd, dst_retrieve_location (abfd, op1),
RELC_NONE))
return FALSE;
break; break;
case ETIR__C_OPR_NOP: /* No-op. */ case ETIR__C_OPR_NOP: /* No-op. */
break; break;
case ETIR__C_OPR_ADD: /* Add. */ case ETIR__C_OPR_ADD: /* Add. */
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1)
_bfd_vms_pop (abfd, &op2, &rel2); || !_bfd_vms_pop (abfd, &op2, &rel2))
return FALSE;
if (rel1 == RELC_NONE && rel2 != RELC_NONE) if (rel1 == RELC_NONE && rel2 != RELC_NONE)
rel1 = rel2; rel1 = rel2;
else if (rel1 != RELC_NONE && rel2 != RELC_NONE) else if (rel1 != RELC_NONE && rel2 != RELC_NONE)
goto bad_context; goto bad_context;
_bfd_vms_push (abfd, op1 + op2, rel1); if (!_bfd_vms_push (abfd, op1 + op2, rel1))
return FALSE;
break; break;
case ETIR__C_OPR_SUB: /* Subtract. */ case ETIR__C_OPR_SUB: /* Subtract. */
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1)
_bfd_vms_pop (abfd, &op2, &rel2); || !_bfd_vms_pop (abfd, &op2, &rel2))
return FALSE;
if (rel1 == RELC_NONE && rel2 != RELC_NONE) if (rel1 == RELC_NONE && rel2 != RELC_NONE)
rel1 = rel2; rel1 = rel2;
else if ((rel1 & RELC_SEC_BASE) && (rel2 & RELC_SEC_BASE)) else if ((rel1 & RELC_SEC_BASE) && (rel2 & RELC_SEC_BASE))
@ -2334,69 +2355,90 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
} }
else if (rel1 != RELC_NONE && rel2 != RELC_NONE) else if (rel1 != RELC_NONE && rel2 != RELC_NONE)
goto bad_context; goto bad_context;
_bfd_vms_push (abfd, op2 - op1, rel1); if (!_bfd_vms_push (abfd, op2 - op1, rel1))
return FALSE;
break; break;
case ETIR__C_OPR_MUL: /* Multiply. */ case ETIR__C_OPR_MUL: /* Multiply. */
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1)
_bfd_vms_pop (abfd, &op2, &rel2); || !_bfd_vms_pop (abfd, &op2, &rel2))
return FALSE;
if (rel1 != RELC_NONE || rel2 != RELC_NONE) if (rel1 != RELC_NONE || rel2 != RELC_NONE)
goto bad_context; goto bad_context;
_bfd_vms_push (abfd, op1 * op2, RELC_NONE); if (!_bfd_vms_push (abfd, op1 * op2, RELC_NONE))
return FALSE;
break; break;
case ETIR__C_OPR_DIV: /* Divide. */ case ETIR__C_OPR_DIV: /* Divide. */
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1)
_bfd_vms_pop (abfd, &op2, &rel2); || !_bfd_vms_pop (abfd, &op2, &rel2))
return FALSE;
if (rel1 != RELC_NONE || rel2 != RELC_NONE) if (rel1 != RELC_NONE || rel2 != RELC_NONE)
goto bad_context; goto bad_context;
if (op2 == 0) if (op2 == 0)
_bfd_vms_push (abfd, 0, RELC_NONE); {
if (!_bfd_vms_push (abfd, 0, RELC_NONE))
return FALSE;
}
else else
_bfd_vms_push (abfd, op2 / op1, RELC_NONE); {
if (!_bfd_vms_push (abfd, op2 / op1, RELC_NONE))
return FALSE;
}
break; break;
case ETIR__C_OPR_AND: /* Logical AND. */ case ETIR__C_OPR_AND: /* Logical AND. */
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1)
_bfd_vms_pop (abfd, &op2, &rel2); || !_bfd_vms_pop (abfd, &op2, &rel2))
return FALSE;
if (rel1 != RELC_NONE || rel2 != RELC_NONE) if (rel1 != RELC_NONE || rel2 != RELC_NONE)
goto bad_context; goto bad_context;
_bfd_vms_push (abfd, op1 & op2, RELC_NONE); if (!_bfd_vms_push (abfd, op1 & op2, RELC_NONE))
return FALSE;
break; break;
case ETIR__C_OPR_IOR: /* Logical inclusive OR. */ case ETIR__C_OPR_IOR: /* Logical inclusive OR. */
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1)
_bfd_vms_pop (abfd, &op2, &rel2); || !_bfd_vms_pop (abfd, &op2, &rel2))
return FALSE;
if (rel1 != RELC_NONE || rel2 != RELC_NONE) if (rel1 != RELC_NONE || rel2 != RELC_NONE)
goto bad_context; goto bad_context;
_bfd_vms_push (abfd, op1 | op2, RELC_NONE); if (!_bfd_vms_push (abfd, op1 | op2, RELC_NONE))
return FALSE;
break; break;
case ETIR__C_OPR_EOR: /* Logical exclusive OR. */ case ETIR__C_OPR_EOR: /* Logical exclusive OR. */
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1)
_bfd_vms_pop (abfd, &op2, &rel2); || !_bfd_vms_pop (abfd, &op2, &rel2))
return FALSE;
if (rel1 != RELC_NONE || rel2 != RELC_NONE) if (rel1 != RELC_NONE || rel2 != RELC_NONE)
goto bad_context; goto bad_context;
_bfd_vms_push (abfd, op1 ^ op2, RELC_NONE); if (!_bfd_vms_push (abfd, op1 ^ op2, RELC_NONE))
return FALSE;
break; break;
case ETIR__C_OPR_NEG: /* Negate. */ case ETIR__C_OPR_NEG: /* Negate. */
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (rel1 != RELC_NONE) if (rel1 != RELC_NONE)
goto bad_context; goto bad_context;
_bfd_vms_push (abfd, -op1, RELC_NONE); if (!_bfd_vms_push (abfd, -op1, RELC_NONE))
return FALSE;
break; break;
case ETIR__C_OPR_COM: /* Complement. */ case ETIR__C_OPR_COM: /* Complement. */
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (rel1 != RELC_NONE) if (rel1 != RELC_NONE)
goto bad_context; goto bad_context;
_bfd_vms_push (abfd, ~op1, RELC_NONE); if (!_bfd_vms_push (abfd, ~op1, RELC_NONE))
return FALSE;
break; break;
case ETIR__C_OPR_ASH: /* Arithmetic shift. */ case ETIR__C_OPR_ASH: /* Arithmetic shift. */
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1)
_bfd_vms_pop (abfd, &op2, &rel2); || !_bfd_vms_pop (abfd, &op2, &rel2))
return FALSE;
if (rel1 != RELC_NONE || rel2 != RELC_NONE) if (rel1 != RELC_NONE || rel2 != RELC_NONE)
{ {
bad_context: bad_context:
@ -2408,7 +2450,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
op1 >>= -(int)op2; op1 >>= -(int)op2;
else /* Shift left. */ else /* Shift left. */
op1 <<= (int)op2; op1 <<= (int)op2;
_bfd_vms_push (abfd, op1, RELC_NONE); /* FIXME: sym. */ if (!_bfd_vms_push (abfd, op1, RELC_NONE)) /* FIXME: sym. */
return FALSE;
break; break;
case ETIR__C_OPR_INSV: /* Insert field. */ case ETIR__C_OPR_INSV: /* Insert field. */
@ -2422,14 +2465,20 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
break; break;
case ETIR__C_OPR_SEL: /* Select. */ case ETIR__C_OPR_SEL: /* Select. */
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
if (op1 & 0x01L) if (op1 & 0x01L)
_bfd_vms_pop (abfd, &op1, &rel1); {
if (!_bfd_vms_pop (abfd, &op1, &rel1))
return FALSE;
}
else else
{ {
_bfd_vms_pop (abfd, &op1, &rel1); if (!_bfd_vms_pop (abfd, &op1, &rel1)
_bfd_vms_pop (abfd, &op2, &rel2); || !_bfd_vms_pop (abfd, &op2, &rel2))
_bfd_vms_push (abfd, op1, rel1); return FALSE;
if (!_bfd_vms_push (abfd, op1, rel1))
return FALSE;
} }
break; break;