espressif/esp-lwip
1
0
Fork 0
mirror of https://github.com/espressif/esp-lwip.git synced 2026-06-05 21:04:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

api_msg: Fix potential tcp_abort() thread safety issue

Browse Source 
2.1.3-esp: 10197b21 api_msg: fix tcp_abort thread safety
This commit is contained in:
David Cermak
2022-11-04 11:50:42 +01:00
parent 353e8ff2da
commit 9aae28d074
3 changed files with 24 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/ports/unix/port/include/arch/cc.h
+4
View File
@@ -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 */
src/api/api_msg.c
+20
View File
@@ -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);
test/unit/cc_esp_platform.h
-88
View File
@@ -1,88 +0,0 @@
/*
* Copyright (c) 2001-2003 Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
* This file is part of the lwIP TCP/IP stack.
*
* Author: Adam Dunkels <adam@sics.se>
*
*/
#ifndef LWIP_ARCH_CC_ESP_H
#define LWIP_ARCH_CC_ESP_H
/* see https://sourceforge.net/p/predef/wiki/OperatingSystems/ */
#if defined __ANDROID__
#define LWIP_UNIX_ANDROID
#elif defined __linux__
#define LWIP_UNIX_LINUX
#elif defined __APPLE__
#define LWIP_UNIX_MACH
#elif defined __OpenBSD__
#define LWIP_UNIX_OPENBSD
#elif defined __CYGWIN__
#define LWIP_UNIX_CYGWIN
#elif defined __GNU__
#define LWIP_UNIX_HURD
#endif
#define LWIP_TIMEVAL_PRIVATE 0
#include <sys/time.h>
#define LWIP_ERRNO_INCLUDE <errno.h>
#if defined(LWIP_UNIX_LINUX) || defined(LWIP_UNIX_HURD)
#define LWIP_ERRNO_STDINCLUDE 1
#endif
#ifdef LWIP_RAND
#define LWIP_RAND() ((u32_t)rand())
#endif
/* different handling for unit test, normally not needed */
#ifdef LWIP_NOASSERT_ON_ERROR
#define LWIP_ERROR(message, expression, handler) do { if (!(expression)) { \
handler;}} while(0)
#endif
#if defined(LWIP_UNIX_ANDROID) && defined(FD_SET)
typedef __kernel_fd_set fd_set;
#endif
#if defined(LWIP_UNIX_MACH)
/* sys/types.h and signal.h bring in Darwin byte order macros. pull the
header here and disable LwIP's version so that apps still can get
the macros via LwIP headers and use system headers */
#include <sys/types.h>
#define LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS
#endif
struct sio_status_s;
typedef struct sio_status_s sio_status_t;
#define sio_fd_t sio_status_t*
#define __sio_fd_t_defined
typedef unsigned int sys_prot_t;
#endif /* LWIP_ARCH_CC_ESP_H */