mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-25 00:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply patch #9536: netif: Prevent possible NULL pointer dereference in netif_set_addr in a modified version

Browse Source 
Replace NULL pointers by IP4_ADDR_ANY4 - at sometime in the future, we make the NULL pointer handling obsolete and we can remove all the NULL pointer checks in the code
This commit is contained in:
Dirk Ziegelmeier 2018-01-09 07:51:09 +01:00
parent 1affbb4bd5
commit 05ded5516d
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/netif.c
View File

@ -479,6 +479,11 @@ netif_do_set_ipaddr(struct netif *netif, const ip4_addr_t *ipaddr, u8_t callback
void void
netif_set_ipaddr(struct netif *netif, const ip4_addr_t *ipaddr) netif_set_ipaddr(struct netif *netif, const ip4_addr_t *ipaddr)
{ {
/* Don't propagate NULL pointer (IPv4 ANY) to subsequent functions */
if (ipaddr == NULL) {
ipaddr = IP4_ADDR_ANY4;
}
LWIP_ASSERT_CORE_LOCKED(); LWIP_ASSERT_CORE_LOCKED();
netif_do_set_ipaddr(netif, ipaddr, 1); netif_do_set_ipaddr(netif, ipaddr, 1);
@ -530,6 +535,11 @@ netif_set_netmask(struct netif *netif, const ip4_addr_t *netmask)
{ {
LWIP_ASSERT_CORE_LOCKED(); LWIP_ASSERT_CORE_LOCKED();
/* Don't propagate NULL pointer (IPv4 ANY) to subsequent functions */
if (netmask == NULL) {
netmask = IP4_ADDR_ANY4;
}
netif_do_set_netmask(netif, netmask, 1); netif_do_set_netmask(netif, netmask, 1);
} }
@ -575,6 +585,11 @@ netif_set_gw(struct netif *netif, const ip4_addr_t *gw)
{ {
LWIP_ASSERT_CORE_LOCKED(); LWIP_ASSERT_CORE_LOCKED();
/* Don't propagate NULL pointer (IPv4 ANY) to subsequent functions */
if (gw == NULL) {
gw = IP4_ADDR_ANY4;
}
netif_do_set_gw(netif, gw, 1); netif_do_set_gw(netif, gw, 1);
} }
@ -594,7 +609,22 @@ netif_set_addr(struct netif *netif, const ip4_addr_t *ipaddr, const ip4_addr_t *
{ {
#if LWIP_NETIF_EXT_STATUS_CALLBACK #if LWIP_NETIF_EXT_STATUS_CALLBACK
u8_t something_changed = 0; u8_t something_changed = 0;
#endif
LWIP_ASSERT_CORE_LOCKED();
/* Don't propagate NULL pointer (IPv4 ANY) to subsequent functions */
if (ipaddr == NULL) {
ipaddr = IP4_ADDR_ANY4;
}
if (netmask == NULL) {
netmask = IP4_ADDR_ANY4;
}
if (gw == NULL) {
gw = IP4_ADDR_ANY4;
}
#if LWIP_NETIF_EXT_STATUS_CALLBACK
if ((ip4_addr_cmp(ipaddr, netif_ip4_addr(netif)) == 0) || if ((ip4_addr_cmp(ipaddr, netif_ip4_addr(netif)) == 0) ||
(ip4_addr_cmp(gw, netif_ip4_gw(netif)) == 0) || (ip4_addr_cmp(gw, netif_ip4_gw(netif)) == 0) ||
(ip4_addr_cmp(netmask, netif_ip4_netmask(netif)) == 0)) { (ip4_addr_cmp(netmask, netif_ip4_netmask(netif)) == 0)) {
@ -602,8 +632,6 @@ netif_set_addr(struct netif *netif, const ip4_addr_t *ipaddr, const ip4_addr_t *
} }
#endif #endif
LWIP_ASSERT_CORE_LOCKED();
if (ip4_addr_isany(ipaddr)) { if (ip4_addr_isany(ipaddr)) {
/* when removing an address, we have to remove it *before* changing netmask/gw /* when removing an address, we have to remove it *before* changing netmask/gw
to ensure that tcp RST segment can be sent correctly */ to ensure that tcp RST segment can be sent correctly */