xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-02-12 23:58:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qcow: fix memory leaks related to encryption

Browse Source 
Fix leak of the 'encryptopts' string, which was mistakenly
declared const.

Fix leak of QemuOpts entry which should not have been deleted
from the opts array.

Reported by: coverity
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170714103105.5781-1-berrange@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Daniel P. Berrange 2017-07-14 11:31:05 +01:00 committed by Max Reitz
parent 4c4414a438
commit 0696ae2c92
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/qcow.c
View File

@ -768,7 +768,7 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp)
Error *local_err = NULL; Error *local_err = NULL;
int ret; int ret;
BlockBackend *qcow_blk; BlockBackend *qcow_blk;
const char *encryptfmt = NULL; char *encryptfmt = NULL;
QDict *options; QDict *options;
QDict *encryptopts = NULL; QDict *encryptopts = NULL;
QCryptoBlockCreateOptions *crypto_opts = NULL; QCryptoBlockCreateOptions *crypto_opts = NULL;
@ -793,7 +793,7 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp)
goto cleanup; goto cleanup;
} }
} else if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ENCRYPT, false)) { } else if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ENCRYPT, false)) {
encryptfmt = "aes"; encryptfmt = g_strdup("aes");
} }
ret = bdrv_create_file(filename, opts, &local_err); ret = bdrv_create_file(filename, opts, &local_err);
@ -908,6 +908,7 @@ exit:
blk_unref(qcow_blk); blk_unref(qcow_blk);
cleanup: cleanup:
QDECREF(encryptopts); QDECREF(encryptopts);
g_free(encryptfmt);
qcrypto_block_free(crypto); qcrypto_block_free(crypto);
qapi_free_QCryptoBlockCreateOptions(crypto_opts); qapi_free_QCryptoBlockCreateOptions(crypto_opts);
g_free(backing_file); g_free(backing_file);

7
block/qcow2.c
View File

@ -2905,7 +2905,7 @@ static int qcow2_create(const char *filename, QemuOpts *opts, Error **errp)
int version; int version;
uint64_t refcount_bits; uint64_t refcount_bits;
int refcount_order; int refcount_order;
const char *encryptfmt = NULL; char *encryptfmt = NULL;
Error *local_err = NULL; Error *local_err = NULL;
int ret; int ret;
@ -2916,14 +2916,14 @@ static int qcow2_create(const char *filename, QemuOpts *opts, Error **errp)
backing_fmt = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FMT); backing_fmt = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FMT);
encryptfmt = qemu_opt_get_del(opts, BLOCK_OPT_ENCRYPT_FORMAT); encryptfmt = qemu_opt_get_del(opts, BLOCK_OPT_ENCRYPT_FORMAT);
if (encryptfmt) { if (encryptfmt) {
if (qemu_opt_get_del(opts, BLOCK_OPT_ENCRYPT)) { if (qemu_opt_get(opts, BLOCK_OPT_ENCRYPT)) {
error_setg(errp, "Options " BLOCK_OPT_ENCRYPT " and " error_setg(errp, "Options " BLOCK_OPT_ENCRYPT " and "
BLOCK_OPT_ENCRYPT_FORMAT " are mutually exclusive"); BLOCK_OPT_ENCRYPT_FORMAT " are mutually exclusive");
ret = -EINVAL; ret = -EINVAL;
goto finish; goto finish;
} }
} else if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ENCRYPT, false)) { } else if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ENCRYPT, false)) {
encryptfmt = "aes"; encryptfmt = g_strdup("aes");
} }
cluster_size = qcow2_opt_get_cluster_size_del(opts, &local_err); cluster_size = qcow2_opt_get_cluster_size_del(opts, &local_err);
if (local_err) { if (local_err) {
@ -2983,6 +2983,7 @@ static int qcow2_create(const char *filename, QemuOpts *opts, Error **errp)
finish: finish:
g_free(backing_file); g_free(backing_file);
g_free(backing_fmt); g_free(backing_fmt);
g_free(encryptfmt);
g_free(buf); g_free(buf);
return ret; return ret;
} }