]> git.proxmox.com Git - mirror_qemu.git/commit
QemuOpts: Fix qemu_opts_foreach() dangling location regression
authorMarkus Armbruster <armbru@redhat.com>
Wed, 27 Apr 2016 14:29:07 +0000 (16:29 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 28 Apr 2016 06:18:56 +0000 (08:18 +0200)
commit37f32349ea43f41ee8b9a253977ce1e46f576fc7
tree4e396a0752ba45512d72a23898c1c3a375b5fa32
parentf419a626c76bcb26697883af702862e8623056f9
QemuOpts: Fix qemu_opts_foreach() dangling location regression

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>
util/qemu-option.c