From: SophieK <35367649+suishixingkong@users.noreply.github.com>
Date: Thu, 9 May 2019 07:20:30 +0000 (+0800)
Subject: keymat_v1: Avoid memory leak during IKE key derivation in some error cases
X-Git-Tag: 5.8.0rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e0e3ef4e0b6ab236003a1f8dec5846a6d4bd358;p=thirdparty%2Fstrongswan.git

keymat_v1: Avoid memory leak during IKE key derivation in some error cases

Closes strongswan/strongswan#138.
---

diff --git a/src/libcharon/sa/ikev1/keymat_v1.c b/src/libcharon/sa/ikev1/keymat_v1.c
index bcea1f3889..34bae4391c 100644
--- a/src/libcharon/sa/ikev1/keymat_v1.c
+++ b/src/libcharon/sa/ikev1/keymat_v1.c
@@ -416,6 +416,7 @@ METHOD(keymat_v1_t, derive_ike_keys, bool,
 	{
 		chunk_clear(&g_xy);
 		chunk_clear(&data);
+		chunk_clear(&skeyid);
 		return FALSE;
 	}
 	chunk_clear(&data);
@@ -427,6 +428,7 @@ METHOD(keymat_v1_t, derive_ike_keys, bool,
 	{
 		chunk_clear(&g_xy);
 		chunk_clear(&data);
+		chunk_clear(&skeyid);
 		return FALSE;
 	}
 	chunk_clear(&data);
@@ -438,6 +440,7 @@ METHOD(keymat_v1_t, derive_ike_keys, bool,
 	{
 		chunk_clear(&g_xy);
 		chunk_clear(&data);
+		chunk_clear(&skeyid);
 		return FALSE;
 	}
 	chunk_clear(&data);