diff options
| author | Markus Armbruster <armbru@redhat.com> | 2016-04-27 16:29:08 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-04-28 08:19:20 +0200 |
| commit | d9d3aaea0b3fbb5028e20316bdb93359487cd01f (patch) | |
| tree | 694e1415d48f74546d9a2a925100040882ff1b56 | |
| parent | 37f32349ea43f41ee8b9a253977ce1e46f576fc7 (diff) | |
| download | qemu-d9d3aaea0b3fbb5028e20316bdb93359487cd01f.zip qemu-d9d3aaea0b3fbb5028e20316bdb93359487cd01f.tar.gz qemu-d9d3aaea0b3fbb5028e20316bdb93359487cd01f.tar.bz2 | |
replay: Fix dangling location bug in replay_configure()
replay_configure() pushes and pops a Location with automatic storage
duration. Except it fails to pop when -icount parameter "rr" isn't
given. cur_loc then points to unused stack space, and will most
likely get clobbered in short order.
Clobbered cur_loc can make loc_pop() and error_print_loc() crash or
report bogus locations.
Broken in commit 890ad55.
I didn't take the time to find a reproducer.
Cc: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1461767349-15329-3-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | replay/replay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/replay/replay.c b/replay/replay.c index 7c2573a..167fd29 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -275,7 +275,7 @@ void replay_configure(QemuOpts *opts) rr = qemu_opt_get(opts, "rr"); if (!rr) { /* Just enabling icount */ - return; + goto out; } else if (!strcmp(rr, "record")) { mode = REPLAY_MODE_RECORD; } else if (!strcmp(rr, "replay")) { @@ -293,6 +293,7 @@ void replay_configure(QemuOpts *opts) replay_enable(fname, mode); +out: loc_pop(&loc); } |