summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobhe <tobhe@openbsd.org>2020-07-08 21:35:35 +0000
committertobhe <tobhe@openbsd.org>2020-07-08 21:35:35 +0000
commit6b0a9ee9bf9b28bb7c15e0463598d11f7fee8bc4 (patch)
tree6e6acfdedbb2dcaa3bba55c9ef5d4c0868aba883
parentInfo leaks in semctl SEM_GET, the pads (unknown old contents) and base (a (diff)
downloadwireguard-openbsd-6b0a9ee9bf9b28bb7c15e0463598d11f7fee8bc4.tar.xz
wireguard-openbsd-6b0a9ee9bf9b28bb7c15e0463598d11f7fee8bc4.zip
Always try to retransmit on sendtofrom() errors to ensure the SA
is properly cleaned up in ikev2_msg_retransmit_timeout(). ok patrick@
-rw-r--r--sbin/iked/ikev2_msg.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sbin/iked/ikev2_msg.c b/sbin/iked/ikev2_msg.c
index cc76dfde3f5..c865b6f3d96 100644
--- a/sbin/iked/ikev2_msg.c
+++ b/sbin/iked/ikev2_msg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ikev2_msg.c,v 1.68 2020/05/26 20:24:31 tobhe Exp $ */
+/* $OpenBSD: ikev2_msg.c,v 1.69 2020/07/08 21:35:35 tobhe Exp $ */
/*
* Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de>
@@ -293,8 +293,6 @@ ikev2_msg_send(struct iked *env, struct iked_message *msg)
timer_add(env, &sa->sa_timer,
IKED_IKE_SA_DELETE_TIMEOUT);
}
- if (sa != NULL)
- return (-1);
}
if (sa == NULL)