From: Joshua Rogers <MegaManSec@users.noreply.github.com>
Date: Mon, 13 Oct 2025 14:35:43 +0000 (+0800)
Subject: apps/s_socket: fix double close of listening socket when naccept==0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88b5412a831d3c80824d6de5e05916e1db3f07dc;p=thirdparty%2Fopenssl.git

apps/s_socket: fix double close of listening socket when naccept==0

Signed-off-by: Joshua Rogers <MegaManSec@users.noreply.github.com>

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28813)

(cherry picked from commit 76b4fa346c364cccc9123efdeac95e5dc85f0a75)
---

diff --git a/apps/lib/s_socket.c b/apps/lib/s_socket.c
index 9a91b3190f4..22edd58ce47 100644
--- a/apps/lib/s_socket.c
+++ b/apps/lib/s_socket.c
@@ -427,8 +427,6 @@ int do_server(int *accept_sock, const char *host, const char *port,
 
             if (naccept != -1)
                 naccept--;
-            if (naccept == 0)
-                BIO_closesocket(asock);
 
             BIO_set_tcp_ndelay(sock, 1);
             i = (*cb)(sock, type, protocol, context);
@@ -468,6 +466,7 @@ int do_server(int *accept_sock, const char *host, const char *port,
 
         if (i < 0 || naccept == 0) {
             BIO_closesocket(asock);
+            asock = INVALID_SOCKET;
             ret = i;
             break;
         }