commit aa6ae3f64991beaa41847c017c1e2c9f2f2845a6
author makejian <makejian@xiaomi.com> Mon Oct 21 20:13:49 2024 +0800
committer makejian <makejian@xiaomi.com> Tue Oct 22 20:06:10 2024 +0800
tree 7a270402a6b3dbcb02bc828224edfa00502ebd56
parent 17d2fb85217fb737f79cef54f04706950a38c219

net/mbedtls_net_connect: Preventing double close problem

In the test examples and real usage scenarios, 'mbedtls_net_free' is called after 'mbedtls_net_connect' fails, which will cause the problem of double close the same fd. It is possible to close this closed fd which has been applied by other link.

Signed-off-by: makejian <makejian@xiaomi.com>

library/net_sockets.c

diff --git a/library/net_sockets.c b/library/net_sockets.c
index 5d985ef..87b5a43 100644
--- a/library/net_sockets.c
+++ b/library/net_sockets.c
@@ -195,7 +195,7 @@
             break;
         }
 
-        close(ctx->fd);
+        mbedtls_net_close(ctx);
         ret = MBEDTLS_ERR_NET_CONNECT_FAILED;
     }
 
@@ -242,13 +242,13 @@
         n = 1;
         if (setsockopt(ctx->fd, SOL_SOCKET, SO_REUSEADDR,
                        (const char *) &n, sizeof(n)) != 0) {
-            close(ctx->fd);
+            mbedtls_net_close(ctx);
             ret = MBEDTLS_ERR_NET_SOCKET_FAILED;
             continue;
         }
 
         if (bind(ctx->fd, cur->ai_addr, MSVC_INT_CAST cur->ai_addrlen) != 0) {
-            close(ctx->fd);
+            mbedtls_net_close(ctx);
             ret = MBEDTLS_ERR_NET_BIND_FAILED;
             continue;
         }
@@ -256,7 +256,7 @@
         /* Listen only makes sense for TCP */
         if (proto == MBEDTLS_NET_PROTO_TCP) {
             if (listen(ctx->fd, MBEDTLS_NET_LISTEN_BACKLOG) != 0) {
-                close(ctx->fd);
+                mbedtls_net_close(ctx);
                 ret = MBEDTLS_ERR_NET_LISTEN_FAILED;
                 continue;
             }