summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreyk <reyk@openbsd.org>2007-12-05 23:02:05 +0000
committerreyk <reyk@openbsd.org>2007-12-05 23:02:05 +0000
commit450250f48d95740f9528bb477bd5b4aa006aac8e (patch)
tree21adbd90ad70c9a41fadf4385f91b0ea2f3e4392
parentre-sync yylex to the other parsers (diff)
downloadwireguard-openbsd-450250f48d95740f9528bb477bd5b4aa006aac8e.tar.xz
wireguard-openbsd-450250f48d95740f9528bb477bd5b4aa006aac8e.zip
fix fd/ssl leak in hoststated ssl checks
From Przemyslaw Frasunek, closes PR 5671
-rw-r--r--usr.sbin/hoststated/ssl.c3
-rw-r--r--usr.sbin/relayd/ssl.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/hoststated/ssl.c b/usr.sbin/hoststated/ssl.c
index 889857383af..3d572bd5bbc 100644
--- a/usr.sbin/hoststated/ssl.c
+++ b/usr.sbin/hoststated/ssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.c,v 1.11 2007/11/24 17:07:28 reyk Exp $ */
+/* $OpenBSD: ssl.c,v 1.12 2007/12/05 23:02:05 reyk Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -175,6 +175,7 @@ ssl_connect(int s, short event, void *arg)
if (event == EV_TIMEOUT) {
cte->host->up = HOST_DOWN;
hce_notify_done(cte->host, "ssl_connect: timeout");
+ ssl_cleanup(cte);
return;
}
diff --git a/usr.sbin/relayd/ssl.c b/usr.sbin/relayd/ssl.c
index 889857383af..3d572bd5bbc 100644
--- a/usr.sbin/relayd/ssl.c
+++ b/usr.sbin/relayd/ssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.c,v 1.11 2007/11/24 17:07:28 reyk Exp $ */
+/* $OpenBSD: ssl.c,v 1.12 2007/12/05 23:02:05 reyk Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -175,6 +175,7 @@ ssl_connect(int s, short event, void *arg)
if (event == EV_TIMEOUT) {
cte->host->up = HOST_DOWN;
hce_notify_done(cte->host, "ssl_connect: timeout");
+ ssl_cleanup(cte);
return;
}