[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 1/8] cipher: fix leak on initialization error
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v2 1/8] cipher: fix leak on initialization error |
Date: |
Thu, 22 Dec 2016 10:47:33 +0000 |
From: Marc-André Lureau <address@hidden>
On error path, ctx may be leaked. Assign ctx earlier, and call
qcrypto_cipher_free() on error.
Spotted thanks to ASAN.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
crypto/cipher-nettle.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c
index cd094cd..5798910 100644
--- a/crypto/cipher-nettle.c
+++ b/crypto/cipher-nettle.c
@@ -254,6 +254,7 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm
alg,
cipher->mode = mode;
ctx = g_new0(QCryptoCipherNettle, 1);
+ cipher->opaque = ctx;
switch (alg) {
case QCRYPTO_CIPHER_ALG_DES_RFB:
@@ -384,13 +385,11 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm
alg,
}
ctx->iv = g_new0(uint8_t, ctx->blocksize);
- cipher->opaque = ctx;
return cipher;
error:
- g_free(cipher);
- g_free(ctx);
+ qcrypto_cipher_free(cipher);
return NULL;
}
--
2.9.3
- [Qemu-devel] [PULL v2 0/8] Merge qcrypto 2016-12-21, Daniel P. Berrange, 2016/12/22
- [Qemu-devel] [PULL v2 1/8] cipher: fix leak on initialization error,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v2 2/8] crypto: add 3des-ede support when using libgcrypt/nettle, Daniel P. Berrange, 2016/12/22
- [Qemu-devel] [PULL v2 3/8] configure: add CONFIG_GCRYPT_HMAC item, Daniel P. Berrange, 2016/12/22
- [Qemu-devel] [PULL v2 5/8] crypto: support HMAC algorithms based on libgcrypt, Daniel P. Berrange, 2016/12/22
- [Qemu-devel] [PULL v2 4/8] crypto: add HMAC algorithms framework, Daniel P. Berrange, 2016/12/22
- [Qemu-devel] [PULL v2 6/8] crypto: support HMAC algorithms based on glib, Daniel P. Berrange, 2016/12/22
- [Qemu-devel] [PULL v2 7/8] crypto: support HMAC algorithms based on nettle, Daniel P. Berrange, 2016/12/22
- [Qemu-devel] [PULL v2 8/8] crypto: add HMAC algorithms testcases, Daniel P. Berrange, 2016/12/22
- Re: [Qemu-devel] [PULL v2 0/8] Merge qcrypto 2016-12-21, Peter Maydell, 2016/12/22