kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-26 23:11:19 +01:00
Code Releases Activity

pkg/lwip: Lock core before calling netif_get_ip6_addr_match in sock

Browse Source
This commit is contained in:
Erik Ekman 2021-03-28 19:53:18 +02:00
parent c50604b63c
commit e04da0d828
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/lwip/contrib/sock/ip/lwip_sock_ip.c
View File

@ -101,12 +101,15 @@ static uint16_t _ip6_addr_to_netif(const ip6_addr_p_t *_addr)
ip6_addr_copy_from_packed(addr, *_addr);
if (!ip6_addr_isany_val(addr)) {
struct netif *netif;
LOCK_TCPIP_CORE();
/* cppcheck-suppress uninitvar ; assigned by macro */
NETIF_FOREACH(netif) {
if (netif_get_ip6_addr_match(netif, &addr) >= 0) {
UNLOCK_TCPIP_CORE();
return (int)netif->num + 1;
}
}
UNLOCK_TCPIP_CORE();
}
return SOCK_ADDR_ANY_NETIF;
}

12
pkg/lwip/contrib/sock/lwip_sock.c
View File

@ -137,9 +137,13 @@ static bool _addr_on_netif(int family, int netif_num, const ip_addr_t *addr)
return ip_2_ip4(&netif->ip_addr)->addr == ip_2_ip4(addr)->addr;
#endif
#if LWIP_IPV6
case AF_INET6:
case AF_INET6: {
LOCK_TCPIP_CORE();
/* link-local address is always the 0th */
return (netif_get_ip6_addr_match(netif, ip_2_ip6(addr)) >= 0);
s8_t match = netif_get_ip6_addr_match(netif, ip_2_ip6(addr));
UNLOCK_TCPIP_CORE();
return match >= 0;
}
#endif
default:
return false;
@ -445,11 +449,13 @@ uint16_t lwip_sock_bind_addr_to_netif(const ip_addr_t *bind_addr)
if (!ip_addr_isany(bind_addr)) {
struct netif *netif;
LOCK_TCPIP_CORE();
/* cppcheck-suppress uninitvar ; assigned by macro */
NETIF_FOREACH(netif) {
if (IP_IS_V6(bind_addr)) { /* XXX crappy API yields crappy code */
#if LWIP_IPV6
if (netif_get_ip6_addr_match(netif, ip_2_ip6(bind_addr)) >= 0) {
UNLOCK_TCPIP_CORE();
return (int)netif->num + 1;
}
#endif
@ -457,11 +463,13 @@ uint16_t lwip_sock_bind_addr_to_netif(const ip_addr_t *bind_addr)
else {
#if LWIP_IPV4
if (netif_ip4_addr(netif)->addr == ip_2_ip4(bind_addr)->addr) {
UNLOCK_TCPIP_CORE();
return (int)netif->num + 1;
}
#endif
}
}
UNLOCK_TCPIP_CORE();
}
return SOCK_ADDR_ANY_NETIF;
}