From: tobhe <tobhe@openbsd.org>
Date: Thu, 18 Feb 2021 21:30:52 +0000 (+0000)
Subject: Pass ownership instead of duplicating ibuf msg_ke.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=56b37e4fb4ef0d189c7755d3b0aaa880eee2a668;p=openbsd

Pass ownership instead of duplicating ibuf msg_ke.

ok patrick@
---

diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c
index 9a9bc781725..34f0de0972d 100644
--- a/sbin/iked/ikev2.c
+++ b/sbin/iked/ikev2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ikev2.c,v 1.307 2021/02/13 16:14:12 tobhe Exp $	*/
+/*	$OpenBSD: ikev2.c,v 1.308 2021/02/18 21:30:52 tobhe Exp $	*/
 
 /*
  * Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de>
@@ -5162,10 +5162,8 @@ ikev2_sa_initiator_dh(struct iked_sa *sa, struct iked_message *msg,
 			log_debug("%s: invalid peer dh exchange", __func__);
 			return (-1);
 		}
-		if ((sa->sa_dhrexchange = ibuf_dup(msg->msg_ke)) == NULL) {
-			log_debug("%s: failed to copy dh exchange", __func__);
-			return (-1);
-		}
+		sa->sa_dhrexchange = msg->msg_ke;
+		msg->msg_ke = NULL;
 	}
 
 	/* Set a pointer to the peer exchange */
@@ -5322,13 +5320,8 @@ ikev2_sa_responder_dh(struct iked_kex *kex, struct iked_proposals *proposals,
 	}
 
 	if (!ibuf_length(kex->kex_dhiexchange)) {
-		if ((kex->kex_dhiexchange = ibuf_dup(msg->msg_ke)) == NULL) {
-			/* XXX send notification to peer */
-			log_info("%s: invalid dh, size %zu",
-			    SPI_SA(msg->msg_sa, __func__),
-			    ibuf_length(msg->msg_ke));
-			return (-1);
-		}
+		kex->kex_dhiexchange = msg->msg_ke;
+		msg->msg_ke = NULL;
 	}
 
 	if (!ibuf_length(kex->kex_dhrexchange)) {