diff options
| author | Max Reitz <mreitz@redhat.com> | 2014-12-02 18:32:47 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2015-01-07 15:08:35 -0600 |
| commit | 07ede68671f8b14fd42b72a43bd95af7d45f3611 (patch) | |
| tree | e19cac265d08d5bc1a42c2c3d9992dc1bba2807b | |
| parent | 2fbad1f9445534fe9f920950bed510714d58e8c8 (diff) | |
| download | qemu-07ede68671f8b14fd42b72a43bd95af7d45f3611.tar.gz | |
qemu-img: Check create_opts before image amendment
The image options which can be amended are described by the .create_opts
field for every driver. This field must therefore be non-NULL so that
anything can be amended in the first place. Check that this holds true
before going into qemu_opts_create() (because if .create_opts is NULL,
the create_opts pointer in img_amend() will be NULL after
qemu_opts_append()).
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit b2439d26f078c826e5e06b34d978a6f6d5c7c56f)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | qemu-img.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qemu-img.c b/qemu-img.c index 309c14bbae..27ac1fcd81 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2775,6 +2775,13 @@ static int img_amend(int argc, char **argv) goto out; } + if (!bs->drv->create_opts) { + error_report("Format driver '%s' does not support any options to amend", + fmt); + ret = -1; + goto out; + } + create_opts = qemu_opts_append(create_opts, bs->drv->create_opts); opts = qemu_opts_create(create_opts, NULL, 0, &error_abort); if (options && qemu_opts_do_parse(opts, options, NULL)) { |