| Message ID | 1439942592-28888-1-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 08/18/2015 05:03 PM, Max Reitz wrote: > Example: > $ ./qemu-img create -f qcow2 /tmp/t.qcow2 64M > $ ./qemu-img amend -f qcow2 -o backing_file=/tmp/t.qcow2, -o help \ > /tmp/t.qcow2 > > This should not crash. This actually is tested by iotest 082, but not > caught due to the segmentation fault being silent (which is something > that needs to be fixed, too). As long as we don't forget to do that, I'm okay with having this patch separate from the testsuite enhancement. However... > > Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Cc: qemu-stable <qemu-stable@nongnu.org> > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > qemu-img.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/qemu-img.c b/qemu-img.c > index 75f4ee4..3ddb391 100644 > --- a/qemu-img.c > +++ b/qemu-img.c > @@ -2930,8 +2930,7 @@ static int img_amend(int argc, char **argv) > case 'o': > if (!is_valid_option_list(optarg)) { > error_report("Invalid option list: %s", optarg); > - ret = -1; > - goto out; > + return 1; > } > if (!options) { > options = g_strdup(optarg); This leaks memory if I call 'qemu-img amend -f qcow2 -o help -o backing_file=/tmp/t.qcow2, -o help /tmp/t.qcow2', because it allocates 'options' on the first pass, and only cleans up the allocation in the out label. I think you HAVE to goto out, but fix THAT part of the function to not crash when in this inconsistent state. Looking forward to v2.
diff --git a/qemu-img.c b/qemu-img.c index 75f4ee4..3ddb391 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2930,8 +2930,7 @@ static int img_amend(int argc, char **argv) case 'o': if (!is_valid_option_list(optarg)) { error_report("Invalid option list: %s", optarg); - ret = -1; - goto out; + return 1; } if (!options) { options = g_strdup(optarg);
Example: $ ./qemu-img create -f qcow2 /tmp/t.qcow2 64M $ ./qemu-img amend -f qcow2 -o backing_file=/tmp/t.qcow2, -o help \ /tmp/t.qcow2 This should not crash. This actually is tested by iotest 082, but not caught due to the segmentation fault being silent (which is something that needs to be fixed, too). Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Cc: qemu-stable <qemu-stable@nongnu.org> Signed-off-by: Max Reitz <mreitz@redhat.com> --- qemu-img.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)