OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

QemuOpts: Fix qemu_opts_foreach() dangling location regression

Browse Source 
qemu_opts_foreach() pushes and pops a Location with automatic storage
duration.  Except it fails to pop when @func() returns non-zero.
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.

Affects several qemu command line options as well as qemu-img,
qemu-io, qemu-nbd -object, and blkdebug's configuration file.

Broken in commit a4c7367, v2.4.0.

Reproducer:
    $ qemu-system-x86_64 -nodefaults -display none -object secret,id=foo,foo=bar

main() reports "Property '.foo' not found" like this:

    if (qemu_opts_foreach(qemu_find_opts("object"),
                          user_creatable_add_opts_foreach,
                          object_create_delayed, &err)) {
        error_report_err(err);
        exit(1);
    }

cur_loc then points to where qemu_opts_foreach()'s Location used to
be, i.e. unused stack space.  With optimization, this Location doesn't
get clobbered for me, and also happens to be the correct location.
Without optimization, it does get clobbered in a way that makes
error_report_err() report no location.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1461767349-15329-2-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2016-04-27 16:29:07 +02:00
parent f419a626c7
commit 37f32349ea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/qemu-option.c
View File

@ -1108,19 +1108,19 @@ int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func,
{ {
Location loc; Location loc;
QemuOpts *opts; QemuOpts *opts;
int rc; int rc = 0;
loc_push_none(&loc); loc_push_none(&loc);
QTAILQ_FOREACH(opts, &list->head, next) { QTAILQ_FOREACH(opts, &list->head, next) {
loc_restore(&opts->loc); loc_restore(&opts->loc);
rc = func(opaque, opts, errp); rc = func(opaque, opts, errp);
if (rc) { if (rc) {
return rc; break;
} }
assert(!errp || !*errp); assert(!errp || !*errp);
} }
loc_pop(&loc); loc_pop(&loc);
return 0; return rc;
} }
static size_t count_opts_list(QemuOptsList *list) static size_t count_opts_list(QemuOptsList *list)