diff options
| author | Mark Wielaard <[email protected]> | 2014-11-16 11:40:08 +0100 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2014-11-16 11:40:49 +0100 |
| commit | 2af7b4942ad1e08d6e0609afec4edc82588f089e (patch) | |
| tree | 1722a00a569d9e7657603cbfd39f7a90fcab7463 /src/readelf.c | |
| parent | 8ea90b7a5c030321d70bea246c989fc18c404a14 (diff) | |
readelf: Robustify print_cfa_program.
Check block len before calling print_ops.
Signed-off-by: Mark Wielaard <[email protected]>
Diffstat (limited to 'src/readelf.c')
| -rw-r--r-- | src/readelf.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/readelf.c b/src/readelf.c index 065ee1c3..697a0e50 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -4980,6 +4980,12 @@ print_cfa_program (const unsigned char *readp, const unsigned char *const endp, // XXX overflow check get_uleb128 (op1, readp); /* Length of DW_FORM_block. */ printf (" def_cfa_expression %" PRIu64 "\n", op1); + if ((uint64_t) (endp - readp) < op1) + { + invalid: + fputs (gettext (" <INVALID DATA>\n"), stdout); + return; + } print_ops (dwflmod, dbg, 10, 10, version, ptr_size, 0, NULL, op1, readp); readp += op1; @@ -4990,6 +4996,8 @@ print_cfa_program (const unsigned char *readp, const unsigned char *const endp, get_uleb128 (op2, readp); /* Length of DW_FORM_block. */ printf (" expression r%" PRIu64 " (%s) \n", op1, regname (op1)); + if ((uint64_t) (endp - readp) < op1) + goto invalid; print_ops (dwflmod, dbg, 10, 10, version, ptr_size, 0, NULL, op2, readp); readp += op2; @@ -5034,6 +5042,8 @@ print_cfa_program (const unsigned char *readp, const unsigned char *const endp, get_uleb128 (op2, readp); /* Length of DW_FORM_block. */ printf (" val_expression r%" PRIu64 " (%s)\n", op1, regname (op1)); + if ((uint64_t) (endp - readp) < op2) + goto invalid; print_ops (dwflmod, dbg, 10, 10, version, ptr_size, 0, NULL, op2, readp); readp += op2; |