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 e4e6e9d0e5a344e50a99d39b45af43865c33fce3
Author: Bowen Wang <[email protected]>
AuthorDate: Sun Jun 7 09:25:56 2026 +0800

    net/rpmsg: make conn->unbind atomic
    
    rpmsg_socket_ns_unbind() sets conn->unbind under recvlock, but every
    reader (wakeup, connect, poll, send, recv, shutdown) loads it without
    the lock, which is a data race on a plain bool.  Coverity reports it as
    a missing lock.
    
    Taking recvlock on all these fast paths only to read one flag is not
    worth it.  Make unbind an atomic_t, stored with atomic_set_release() and
    loaded with atomic_read().
    
    Signed-off-by: Bowen Wang <[email protected]>
---
 net/rpmsg/rpmsg_sockif.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/net/rpmsg/rpmsg_sockif.c b/net/rpmsg/rpmsg_sockif.c
index b639de96e04..a9d7d20cd17 100644
--- a/net/rpmsg/rpmsg_sockif.c
+++ b/net/rpmsg/rpmsg_sockif.c
@@ -35,6 +35,7 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 
+#include <nuttx/atomic.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/circbuf.h>
 #include <nuttx/crc32.h>
@@ -99,7 +100,7 @@ struct rpmsg_socket_conn_s
 
   struct socket_conn_s           sconn;
 
-  bool                           unbind;
+  atomic_t                       unbind;
   struct rpmsg_endpoint          ept;
 
   struct sockaddr_rpmsg          rpaddr;
@@ -334,7 +335,7 @@ static int rpmsg_socket_wakeup(FAR struct 
rpmsg_socket_conn_s *conn)
   uint32_t space;
   int ret = 0;
 
-  if (!conn->ept.rdev || conn->unbind)
+  if (!conn->ept.rdev || atomic_read(&conn->unbind))
     {
       return ret;
     }
@@ -612,7 +613,7 @@ static void rpmsg_socket_ns_unbind(FAR struct 
rpmsg_endpoint *ept)
   nxmutex_lock(&conn->recvlock);
   server = conn->server;
   conn->server = NULL;
-  conn->unbind = true;
+  atomic_set_release(&conn->unbind, 1);
   rpmsg_socket_post(&conn->sendsem);
   rpmsg_socket_post(&conn->recvsem);
   rpmsg_socket_poll_notify(conn, POLLIN | POLLOUT | POLLHUP | POLLERR);
@@ -1058,7 +1059,7 @@ static int rpmsg_socket_connect_internal(FAR struct 
socket *psock)
 
       ret = net_sem_timedwait(&conn->sendsem,
                               _SO_TIMEOUT(conn->sconn.s_sndtimeo));
-      if (!conn->ept.rdev || conn->unbind)
+      if (!conn->ept.rdev || atomic_read(&conn->unbind))
         {
           ret = -ECONNRESET;
         }
@@ -1199,7 +1200,7 @@ static int rpmsg_socket_poll(FAR struct socket *psock,
         }
       else if (_SS_ISCONNECTED(conn->sconn.s_flags))
         {
-          if (!conn->ept.rdev || conn->unbind)
+          if (!conn->ept.rdev || atomic_read(&conn->unbind))
             {
               eventset |= POLLHUP;
             }
@@ -1222,7 +1223,7 @@ static int rpmsg_socket_poll(FAR struct socket *psock,
         }
       else /* !_SS_ISCONNECTED(conn->sconn.s_flags) */
         {
-          if (conn->unbind ||
+          if (atomic_read(&conn->unbind) ||
               (!conn->ept.rdev && !_SS_INITD(conn->sconn.s_flags)))
             {
               eventset |= POLLHUP | POLLERR;
@@ -1314,7 +1315,7 @@ static ssize_t rpmsg_socket_send_continuous(FAR struct 
socket *psock,
 
           ret = net_sem_timedwait(&conn->sendsem,
                                   _SO_TIMEOUT(conn->sconn.s_sndtimeo));
-          if (!conn->ept.rdev || conn->unbind)
+          if (!conn->ept.rdev || atomic_read(&conn->unbind))
             {
               ret = -ECONNRESET;
             }
@@ -1419,7 +1420,7 @@ static ssize_t rpmsg_socket_send_single(FAR struct socket 
*psock,
 
           ret = net_sem_timedwait(&conn->sendsem,
                                   _SO_TIMEOUT(conn->sconn.s_sndtimeo));
-          if (!conn->ept.rdev || conn->unbind)
+          if (!conn->ept.rdev || atomic_read(&conn->unbind))
             {
               ret = -ECONNRESET;
             }
@@ -1522,7 +1523,7 @@ static ssize_t rpmsg_socket_sendmsg(FAR struct socket 
*psock,
         }
     }
 
-  if (!conn->ept.rdev || conn->unbind)
+  if (!conn->ept.rdev || atomic_read(&conn->unbind))
     {
       /* return ECONNRESET if lower IPC closed */
 
@@ -1611,7 +1612,7 @@ static ssize_t rpmsg_socket_recvmsg(FAR struct socket 
*psock,
       goto out;
     }
 
-  if (!conn->ept.rdev || conn->unbind)
+  if (!conn->ept.rdev || atomic_read(&conn->unbind))
     {
       /* return EOF if lower IPC closed */
 
@@ -1633,7 +1634,7 @@ static ssize_t rpmsg_socket_recvmsg(FAR struct socket 
*psock,
 
   ret = net_sem_timedwait(&conn->recvsem,
                           _SO_TIMEOUT(conn->sconn.s_rcvtimeo));
-  if (!conn->ept.rdev || conn->unbind)
+  if (!conn->ept.rdev || atomic_read(&conn->unbind))
     {
       ret = 0;
     }
@@ -1796,7 +1797,7 @@ static int rpmsg_socket_shutdown(FAR struct socket 
*psock, int how)
   struct rpmsg_socket_shutdown_s msg;
   int ret;
 
-  if (!conn->ept.rdev || conn->unbind)
+  if (!conn->ept.rdev || atomic_read(&conn->unbind))
     {
       return -ENOTCONN;
     }

Reply via email to