netlink:add tls cleanup protection to protect waitsem in netlink_get_…

…response Signed-off-by: wangchen <[email protected]>
wangchen61698 · Aug 20, 2024 · d998c33 · d998c33
1 parent fe2dc34
commit d998c33
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/net/netlink/netlink.h b/net/netlink/netlink.h
@@ -379,7 +379,7 @@ int netlink_notifier_setup(worker_t worker, FAR struct netlink_conn_s *conn,
  *
  ****************************************************************************/
 
-void netlink_notifier_teardown(FAR struct netlink_conn_s *conn);
+void netlink_notifier_teardown(FAR void *conn);
 
 /****************************************************************************
  * Name: netlink_notifier_signal

diff --git a/net/netlink/netlink_conn.c b/net/netlink/netlink_conn.c
@@ -39,6 +39,7 @@
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/netlink.h>
+#include <nuttx/tls.h>
 
 #include "utils/utils.h"
 #include "netlink/netlink.h"
@@ -451,7 +452,9 @@ int netlink_get_response(FAR struct netlink_conn_s *conn,
         {
           /* Wait for a response to be queued */
 
+          tls_cleanup_push(tls_get_info(), netlink_notifier_teardown, conn);
           ret = net_sem_wait(&waitsem);
+          tls_cleanup_pop(tls_get_info(), 0);
         }
 
       /* Clean-up the semaphore */

diff --git a/net/netlink/netlink_notifier.c b/net/netlink/netlink_notifier.c
@@ -95,8 +95,9 @@ int netlink_notifier_setup(worker_t worker, FAR struct netlink_conn_s *conn,
  *
  ****************************************************************************/
 
-void netlink_notifier_teardown(FAR struct netlink_conn_s *conn)
+void netlink_notifier_teardown(FAR void *arg)
 {
+  FAR struct netlink_conn_s *conn = arg;
   DEBUGASSERT(conn != NULL);
 
   /* This is just a simple wrapper around work_notifier_teardown(). */