diff options
| author | Tom Tromey <tom@tromey.com> | 2018-11-28 10:34:15 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-11-29 10:49:38 -0700 |
| commit | 3d5500e9580ec0f3cffeb1f1373834cbc1d2101d (patch) | |
| tree | 2837b482e2aa5d2460995233132b01a3b4b85ff8 /gdb | |
| parent | d105de22fc385da878e8db44c9503a7f30419322 (diff) | |
| download | gdb-3d5500e9580ec0f3cffeb1f1373834cbc1d2101d.zip gdb-3d5500e9580ec0f3cffeb1f1373834cbc1d2101d.tar.gz gdb-3d5500e9580ec0f3cffeb1f1373834cbc1d2101d.tar.bz2 | |
Avoid buffer overflow in value_x_unop
Commit 6b1747cd1 ("invoke_xmethod & array_view") contains this change:
- argvec = (struct value **) alloca (sizeof (struct value *) * 4);
+ value *argvec_storage[3];
+ gdb::array_view<value *> argvec = argvec_storage;
However, value_x_unop still does:
argvec[2] = value_from_longest (builtin_type (gdbarch)->builtin_int, 0);
argvec[3] = 0;
This triggers an error with -fsanitize=address from userdef.exp:
ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7ffdcf185068 at pc 0x000000e4f912 bp 0x7ffdcf184d80 sp 0x7ffdcf184d70
WRITE of size 8 at 0x7ffdcf185068 thread T0
#0 0xe4f911 in value_x_unop(value*, exp_opcode, noside) ../../binutils-gdb/gdb/valarith.c:557
[...]
I think the two assignments to argvec[3] should just be removed, and
that this was intended in the earlier patch but just missed.
This passes userdef.exp with -fsanitize=address.
gdb/ChangeLog
2018-11-29 Tom Tromey <tom@tromey.com>
* valarith.c (value_x_unop): Don't set argvec[3].
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/valarith.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1c714dd..70d4c06 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2018-11-29 Tom Tromey <tom@tromey.com> + + * valarith.c (value_x_unop): Don't set argvec[3]. + 2018-11-26 Simon Marchi <simon.marchi@ericsson.com> PR gdb/23917 diff --git a/gdb/valarith.c b/gdb/valarith.c index 3a59ada..66cd904 100644 --- a/gdb/valarith.c +++ b/gdb/valarith.c @@ -554,13 +554,11 @@ value_x_unop (struct value *arg1, enum exp_opcode op, enum noside noside) case UNOP_POSTINCREMENT: strcpy (ptr, "++"); argvec[2] = value_from_longest (builtin_type (gdbarch)->builtin_int, 0); - argvec[3] = 0; nargs ++; break; case UNOP_POSTDECREMENT: strcpy (ptr, "--"); argvec[2] = value_from_longest (builtin_type (gdbarch)->builtin_int, 0); - argvec[3] = 0; nargs ++; break; case UNOP_LOGICAL_NOT: |