motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-21 17:11:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

crypto: Avoid memory leak on failure

Browse source 
Commit 7836857 introduced a memory leak due to invalid use of
Error vs. visit_type_end().  If visiting the intermediate
members fails, we clear the error and unconditionally use
visit_end_struct() on the same error object; but if that
cleanup succeeds, we then skip the qapi_free call.

Until a later patch adds visit_check_struct(), the only safe
approach is to use two separate error objects.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-id: 1459526222-30052-1-git-send-email-eblake@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Eric Blake 2016-04-01 09:57:02 -06:00 • committed by Max Reitz
parent 08db36f6ec
commit 95c3df5a24
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
block/crypto.c
View file

@ -196,6 +196,7 @@ block_crypto_open_opts_init(QCryptoBlockFormat format,
OptsVisitor *ov; OptsVisitor *ov;
QCryptoBlockOpenOptions *ret = NULL; QCryptoBlockOpenOptions *ret = NULL;
Error *local_err = NULL; Error *local_err = NULL;
Error *end_err = NULL;
ret = g_new0(QCryptoBlockOpenOptions, 1); ret = g_new0(QCryptoBlockOpenOptions, 1);
ret->format = format; ret->format = format;
@ -218,10 +219,9 @@ block_crypto_open_opts_init(QCryptoBlockFormat format,
error_setg(&local_err, "Unsupported block format %d", format); error_setg(&local_err, "Unsupported block format %d", format);
break; break;
} }
error_propagate(errp, local_err);
local_err = NULL;
visit_end_struct(opts_get_visitor(ov), &local_err); visit_end_struct(opts_get_visitor(ov), &end_err);
error_propagate(&local_err, end_err);
out: out:
if (local_err) { if (local_err) {
@ -242,6 +242,7 @@ block_crypto_create_opts_init(QCryptoBlockFormat format,
OptsVisitor *ov; OptsVisitor *ov;
QCryptoBlockCreateOptions *ret = NULL; QCryptoBlockCreateOptions *ret = NULL;
Error *local_err = NULL; Error *local_err = NULL;
Error *end_err = NULL;
ret = g_new0(QCryptoBlockCreateOptions, 1); ret = g_new0(QCryptoBlockCreateOptions, 1);
ret->format = format; ret->format = format;
@ -264,10 +265,9 @@ block_crypto_create_opts_init(QCryptoBlockFormat format,
error_setg(&local_err, "Unsupported block format %d", format); error_setg(&local_err, "Unsupported block format %d", format);
break; break;
} }
error_propagate(errp, local_err);
local_err = NULL;
visit_end_struct(opts_get_visitor(ov), &local_err); visit_end_struct(opts_get_visitor(ov), &end_err);
error_propagate(&local_err, end_err);
out: out:
if (local_err) { if (local_err) {