RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #20882 from Teufelchen1/fix/dhcpv6

Browse Source 
net/dhcpv6: Improve option parsing in dhcpv6 advertise
This commit is contained in:
benpicco 2024-10-03 12:50:12 +00:00 committed by GitHub
commit 8a933a56ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/net/application_layer/dhcpv6/client.c
View File

@ -802,6 +802,10 @@ static void _parse_advertise(uint8_t *adv, size_t len)
len > 0; len -= _opt_len(opt), opt = _opt_next(opt)) { len > 0; len -= _opt_len(opt), opt = _opt_next(opt)) {
switch (byteorder_ntohs(opt->type)) { switch (byteorder_ntohs(opt->type)) {
case DHCPV6_OPT_IA_PD: case DHCPV6_OPT_IA_PD:
if (_opt_len(opt) < sizeof(dhcpv6_opt_ia_pd_t)) {
DEBUG("DHCPv6 client: IA_PD option underflow minimum size\n");
return;
}
for (unsigned i = 0; for (unsigned i = 0;
IS_USED(MODULE_DHCPV6_CLIENT_IA_PD) && IS_USED(MODULE_DHCPV6_CLIENT_IA_PD) &&
(i < CONFIG_DHCPV6_CLIENT_PFX_LEASE_MAX); (i < CONFIG_DHCPV6_CLIENT_PFX_LEASE_MAX);
@ -843,6 +847,10 @@ static void _parse_advertise(uint8_t *adv, size_t len)
} }
break; break;
case DHCPV6_OPT_IA_NA: case DHCPV6_OPT_IA_NA:
if (_opt_len(opt) < sizeof(dhcpv6_opt_ia_na_t)) {
DEBUG("DHCPv6 client: IA_NA option underflows minimum size\n");
return;
}
for (unsigned i = 0; for (unsigned i = 0;
IS_USED(MODULE_DHCPV6_CLIENT_IA_NA) && IS_USED(MODULE_DHCPV6_CLIENT_IA_NA) &&
i < CONFIG_DHCPV6_CLIENT_ADDR_LEASE_MAX; i < CONFIG_DHCPV6_CLIENT_ADDR_LEASE_MAX;
@ -885,6 +893,10 @@ static void _parse_advertise(uint8_t *adv, size_t len)
} }
break; break;
case DHCPV6_OPT_SMR: case DHCPV6_OPT_SMR:
if (_opt_len(opt) < sizeof(dhcpv6_opt_smr_t)) {
DEBUG("DHCPv6 client: SMR option underflows minimum size\n");
return;
}
smr = (dhcpv6_opt_smr_t *)opt; smr = (dhcpv6_opt_smr_t *)opt;
break; break;
default: default: