api_msg: Fix potential tcp_abort() thread safety issue

2.1.3-esp: 10197b2 api_msg: fix tcp_abort thread safety
espressif · Sep 11, 2024 · 9aae28d · 9aae28d
1 parent 353e8ff
commit 9aae28d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 88 deletions.
diff --git a/contrib/ports/unix/port/include/arch/cc.h b/contrib/ports/unix/port/include/arch/cc.h
@@ -86,4 +86,8 @@ typedef struct sio_status_s sio_status_t;
 
 typedef unsigned int sys_prot_t;
 
+#ifndef __containerof
+#define __containerof(ptr, type, member) ((type *)(void *)((char *)ptr - offsetof(type, member)))
+#endif
+
 #endif /* LWIP_ARCH_CC_H */
diff --git a/src/api/api_msg.c b/src/api/api_msg.c
@@ -841,6 +841,20 @@ netconn_free(struct netconn *conn)
   memp_free(MEMP_NETCONN, conn);
 }
 
+#if ESP_LWIP
+struct tcp_psb_msg {
+  struct tcpip_api_call_data call;
+  struct tcp_pcb *pcb;
+};
+
+static err_t tcp_do_abort(struct tcpip_api_call_data *msg)
+{
+  struct tcp_psb_msg *pcb_msg = __containerof(msg, struct tcp_psb_msg, call);
+  tcp_abort(pcb_msg->pcb);
+  return ERR_OK;
+}
+#endif /* ESP_LWIP */
+
 /**
  * Delete rcvmbox and acceptmbox of a netconn and free the left-over data in
  * these mboxes
@@ -903,7 +917,13 @@ netconn_drain(struct netconn *conn)
 #endif /* ESP_LWIP */
           netconn_drain(newconn);
           if (newconn->pcb.tcp != NULL) {
+#if ESP_LWIP
+            struct tcp_psb_msg pcb_msg = { 0 };
+            pcb_msg.pcb = newconn->pcb.tcp;
+            tcpip_api_call(tcp_do_abort, &pcb_msg.call);
+#else
             tcp_abort(newconn->pcb.tcp);
+#endif /* ESP_LWIP */
             newconn->pcb.tcp = NULL;
           }
           netconn_free(newconn);

diff --git a/test/unit/cc_esp_platform.h b/test/unit/cc_esp_platform.h