Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/lwip_sec_high_v6.1' into 'release/v6.1'

Browse Source 
fix(lwip): high severity lwip fixes (v6.1)

See merge request espressif/esp-idf!50590
This commit is contained in:
Jiang Jiang Jian
2026-07-16 11:35:55 +08:00
parent b3f2e9e67b 0eafcb83e0
commit 6005d5bb6a
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/lwip/apps/dhcpserver/dhcpserver.c
View File

@@ -1239,11 +1239,19 @@ static s16_t parse_msg(dhcps_t *dhcps, struct dhcps_msg *m, u16_t len)
pnode = NULL;
} else {
pdhcps_pool = (struct dhcps_pool *)mem_calloc(1, sizeof(struct dhcps_pool));
if (pdhcps_pool == NULL) {
return 0;
}
pdhcps_pool->ip.addr = dhcps->client_address.addr;
memcpy(pdhcps_pool->mac, m->chaddr, sizeof(pdhcps_pool->mac));
pdhcps_pool->lease_timer = lease_timer;
pnode = (list_node *)mem_calloc(1, sizeof(list_node));
if (pnode == NULL) {
mem_free(pdhcps_pool);
pdhcps_pool = NULL;
return 0;
}
pnode->pnode = pdhcps_pool;
pnode->pnext = NULL;

2
components/lwip/lwip

Submodule components/lwip/lwip updated: 9d2d804124...c6f2f878e7

3
components/lwip/port/hooks/lwip_default_hooks.c
View File

@@ -234,6 +234,9 @@ void dhcp_parse_extra_opts(struct dhcp *dhcp, uint8_t state, uint8_t option, uin
NETIF_FOREACH(netif) {
/* find the netif related to this dhcp */
if (dhcp == netif_dhcp_data(netif)) {
if (mtu < 68) { /* RFC 2132 requires MTU >= 68 */
return;
}
if (mtu < netif->mtu) {
netif->mtu = mtu;
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_parse_extra_opts(): Negotiated netif MTU is %d\n", netif->mtu));