From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 6 Jul 2012 08:54:06 +0000 (+0200)
Subject: Check rng return value when generating COOKIE2 during MOBIKE
X-Git-Tag: 5.0.1~347
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=504918348dec1355a5d11a513830bdffb7204b8c;p=thirdparty%2Fstrongswan.git

Check rng return value when generating COOKIE2 during MOBIKE
---

diff --git a/src/libcharon/sa/ikev2/tasks/ike_mobike.c b/src/libcharon/sa/ikev2/tasks/ike_mobike.c
index 8295bea0af..90c38666b2 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_mobike.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_mobike.c
@@ -227,18 +227,20 @@ static void build_address_list(private_ike_mobike_t *this, message_t *message)
 /**
  * build a cookie and add it to the message
  */
-static void build_cookie(private_ike_mobike_t *this, message_t *message)
+static bool build_cookie(private_ike_mobike_t *this, message_t *message)
 {
 	rng_t *rng;
 
 	chunk_free(&this->cookie2);
 	rng = lib->crypto->create_rng(lib->crypto, RNG_STRONG);
-	if (rng)
+	if (!rng || !rng->allocate_bytes(rng, COOKIE2_SIZE, &this->cookie2))
 	{
-		rng->allocate_bytes(rng, COOKIE2_SIZE, &this->cookie2);
-		rng->destroy(rng);
-		message->add_notify(message, FALSE, COOKIE2, this->cookie2);
+		DESTROY_IF(rng);
+		return FALSE;
 	}
+	message->add_notify(message, FALSE, COOKIE2, this->cookie2);
+	rng->destroy(rng);
+	return TRUE;
 }
 
 /**
@@ -358,7 +360,10 @@ METHOD(task_t, build_i, status_t,
 		{
 			message->add_notify(message, FALSE, UPDATE_SA_ADDRESSES,
 								chunk_empty);
-			build_cookie(this, message);
+			if (!build_cookie(this, message))
+			{
+				return FAILED;
+			}
 			update_children(this);
 		}
 		if (this->address && !this->check)