hw/sd/sdhci: Don't leak memory region in sdhci_sysbus_realize()

[qemu.git] / qemu-img.c

diff --git a/qemu-img.c b/qemu-img.c
index 1acddf693c649616e9bf4ff9b9ea2bd5e6e2bf44..ad04f5956547f7d2944a7ce56eb856e664ad8aaa 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -261,15 +261,16 @@ static int print_block_option_help(const char *filename, const char *fmt)
             return 1;
         }
         if (!proto_drv->create_opts) {
             return 1;
         }
         if (!proto_drv->create_opts) {

-            error_report("Protocal driver '%s' does not support image creation",
+            error_report("Protocol driver '%s' does not support image creation",

                          proto_drv->format_name);
                          proto_drv->format_name);

+            qemu_opts_free(create_opts);

             return 1;
         }
         create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
     }
 
     printf("Supported options:\n");
             return 1;
         }
         create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
     }
 
     printf("Supported options:\n");

-    qemu_opts_print_help(create_opts);
+    qemu_opts_print_help(create_opts, false);

     qemu_opts_free(create_opts);
     return 0;
 }
     qemu_opts_free(create_opts);
     return 0;
 }


@@ -345,21 +346,6 @@ static int img_add_key_secrets(void *opaque,
     return 0;
 }
 
     return 0;
 }
 

-static BlockBackend *img_open_new_file(const char *filename,
-                                       QemuOpts *create_opts,
-                                       const char *fmt, int flags,
-                                       bool writethrough, bool quiet,
-                                       bool force_share)
-{
-    QDict *options = NULL;
-
-    options = qdict_new();
-    qemu_opt_foreach(create_opts, img_add_key_secrets, options, &error_abort);
-
-    return img_open_file(filename, options, fmt, flags, writethrough, quiet,
-                         force_share);
-}
-

 
 static BlockBackend *img_open(bool image_opts,
                               const char *filename,
 
 static BlockBackend *img_open(bool image_opts,
                               const char *filename,


@@ -1044,6 +1030,7 @@ static int img_commit(int argc, char **argv)
     }
 
     job = block_job_get("commit");
     }
 
     job = block_job_get("commit");

+    assert(job);

     run_block_job(job, &local_err);
     if (local_err) {
         goto unref_backing;
     run_block_job(job, &local_err);
     if (local_err) {
         goto unref_backing;


@@ -2018,6 +2005,7 @@ static int img_convert(int argc, char **argv)
     BlockDriverState *out_bs;
     QemuOpts *opts = NULL, *sn_opts = NULL;
     QemuOptsList *create_opts = NULL;
     BlockDriverState *out_bs;
     QemuOpts *opts = NULL, *sn_opts = NULL;
     QemuOptsList *create_opts = NULL;

+    QDict *open_opts = NULL;

     char *options = NULL;
     Error *local_err = NULL;
     bool writethrough, src_writethrough, quiet = false, image_opts = false,
     char *options = NULL;
     Error *local_err = NULL;
     bool writethrough, src_writethrough, quiet = false, image_opts = false,


@@ -2362,6 +2350,16 @@ static int img_convert(int argc, char **argv)
         }
     }
 
         }
     }
 

+    /*
+     * The later open call will need any decryption secrets, and
+     * bdrv_create() will purge "opts", so extract them now before
+     * they are lost.
+     */
+    if (!skip_create) {
+        open_opts = qdict_new();
+        qemu_opt_foreach(opts, img_add_key_secrets, open_opts, &error_abort);
+    }
+

     if (!skip_create) {
         /* Create the new image */
         ret = bdrv_create(drv, out_filename, opts, &local_err);
     if (!skip_create) {
         /* Create the new image */
         ret = bdrv_create(drv, out_filename, opts, &local_err);


@@ -2388,8 +2386,9 @@ static int img_convert(int argc, char **argv)
          * That has to wait for bdrv_create to be improved
          * to allow filenames in option syntax
          */
          * That has to wait for bdrv_create to be improved
          * to allow filenames in option syntax
          */

-        s.target = img_open_new_file(out_filename, opts, out_fmt,
-                                     flags, writethrough, quiet, false);
+        s.target = img_open_file(out_filename, open_opts, out_fmt,
+                                 flags, writethrough, quiet, false);
+        open_opts = NULL; /* blk_new_open will have freed it */

     }
     if (!s.target) {
         ret = -1;
     }
     if (!s.target) {
         ret = -1;


@@ -2464,6 +2463,7 @@ out:
     qemu_opts_del(opts);
     qemu_opts_free(create_opts);
     qemu_opts_del(sn_opts);
     qemu_opts_del(opts);
     qemu_opts_free(create_opts);
     qemu_opts_del(sn_opts);

+    qobject_unref(open_opts);

     blk_unref(s.target);
     if (s.src) {
         for (bs_i = 0; bs_i < s.src_num; bs_i++) {
     blk_unref(s.target);
     if (s.src) {
         for (bs_i = 0; bs_i < s.src_num; bs_i++) {


@@ -3775,7 +3775,7 @@ static int print_amend_option_help(const char *format)
     assert(drv->create_opts);
 
     printf("Creation options for '%s':\n", format);
     assert(drv->create_opts);
 
     printf("Creation options for '%s':\n", format);

-    qemu_opts_print_help(drv->create_opts);
+    qemu_opts_print_help(drv->create_opts, false);

     printf("\nNote that not all of these options may be amendable.\n");
     return 0;
 }
     printf("\nNote that not all of these options may be amendable.\n");
     return 0;
 }