blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

fix(lwip): Fix potential data-race in ping tcpip callback

Browse Source 
Need to use tcpip_api_call() instead of tcpip_callback(), since the
former waits for the tcpip task to complete and thus prevents potential
data races with subsequent TCP/IP tasks.
This commit is contained in:
David Cermak 2025-01-20 10:43:18 +01:00 committed by David Čermák
parent 433817915c
commit e7a0a93a40
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/lwip/apps/ping/ping_sock.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2019-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -27,28 +27,26 @@
#include "esp_check.h" #include "esp_check.h"
#ifndef CONFIG_LWIP_NETIF_API #ifndef CONFIG_LWIP_NETIF_API
#include "lwip/priv/tcpip_priv.h"
// If POSIX NETIF_API not enabled, we need to supply the implementation of if_indextoname() // If POSIX NETIF_API not enabled, we need to supply the implementation of if_indextoname()
// using tcpip_callback() // using tcpip_api_call()
#include "lwip/priv/tcpip_priv.h"
struct tcpip_netif_name { struct tcpip_netif_name {
struct tcpip_api_call_data call; struct tcpip_api_call_data call;
u8_t ifindex; u8_t ifindex;
char *ifname; char *ifname;
err_t err;
}; };
static void do_netif_index_to_name(void *ctx) static err_t do_netif_index_to_name(struct tcpip_api_call_data *msg)
{ {
struct tcpip_netif_name *params = ctx; struct tcpip_netif_name *params = __containerof(msg, struct tcpip_netif_name, call);
params->err = netif_index_to_name(params->ifindex, params->ifname) ? ERR_OK : ERR_IF; return netif_index_to_name(params->ifindex, params->ifname) ? ERR_OK : ERR_IF;
} }
char *if_indextoname(unsigned int ifindex, char *ifname) char *if_indextoname(unsigned int ifindex, char *ifname)
{ {
struct tcpip_netif_name params = { .ifindex = ifindex, .ifname = ifname }; struct tcpip_netif_name params = { .ifindex = ifindex, .ifname = ifname };
if (tcpip_callback(do_netif_index_to_name, &params) != ERR_OK || params.err != ERR_OK) { if (tcpip_api_call(do_netif_index_to_name, &params.call) != ERR_OK) {
return NULL; return NULL;
} }
return ifname; return ifname;