This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit f3adf376531b89bcd6d1b0ddf228c87a268db556
Author: zhangshuai39 <[email protected]>
AuthorDate: Mon Mar 9 16:50:41 2026 +0800

    net/tcp: Fix non-blocking connect race by extending lock scope
    
    Move conn_dev_lock() before the blocking/non-blocking branch
    so the lock covers tcp_add_active_conn() through
    tcp_start_monitor(), preventing the handshake from completing
    before TCP_CONNECTED callback is registered.
    
    Signed-off-by: zhangshuai39 <[email protected]>
---
 net/tcp/tcp_connect.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/net/tcp/tcp_connect.c b/net/tcp/tcp_connect.c
index 3419929a85a..305903d7253 100644
--- a/net/tcp/tcp_connect.c
+++ b/net/tcp/tcp_connect.c
@@ -354,6 +354,8 @@ int psock_tcp_connect(FAR struct socket *psock,
         }
 #endif /* CONFIG_NET_IPv4 */
 
+      conn_dev_lock(&conn->sconn, conn->dev);
+
       /* Non-blocking connection ? set the socket error
        * and start the monitor
        */
@@ -367,7 +369,6 @@ int psock_tcp_connect(FAR struct socket *psock,
         {
           /* Set up the callbacks in the connection */
 
-          conn_dev_lock(&conn->sconn, conn->dev);
           tcp_add_active_conn(conn);
           ret = psock_setup_callbacks(psock, &state);
           if (ret >= 0)
@@ -417,8 +418,6 @@ int psock_tcp_connect(FAR struct socket *psock,
 
               psock_teardown_callbacks(&state, ret);
             }
-
-          conn_dev_unlock(&conn->sconn, conn->dev);
         }
 
       /* Check if the socket was successfully connected. */
@@ -448,6 +447,8 @@ int psock_tcp_connect(FAR struct socket *psock,
 
           netdev_txnotify_dev(conn->dev, TCP_POLL);
         }
+
+      conn_dev_unlock(&conn->sconn, conn->dev);
     }
 
   return ret;

Reply via email to