Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

net/dhcpv6: Improve option handling in dhcpv6 advertise #20801

Merged
merged 1 commit into from
Jul 31, 2024
Merged

net/dhcpv6: Improve option handling in dhcpv6 advertise #20801

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions sys/net/application_layer/dhcpv6/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,15 +654,27 @@ static int _preparse_advertise(uint8_t *adv, size_t len, uint8_t **buf)
}
switch (byteorder_ntohs(opt->type)) {
case DHCPV6_OPT_CID:
if (_opt_len(opt) < sizeof(dhcpv6_opt_duid_t)) {
return -1;
}
cid = (dhcpv6_opt_duid_t *)opt;
break;
case DHCPV6_OPT_SID:
if (_opt_len(opt) < sizeof(dhcpv6_opt_duid_t)) {
return -1;
}
sid = (dhcpv6_opt_duid_t *)opt;
break;
case DHCPV6_OPT_STATUS:
if (_opt_len(opt) < sizeof(dhcpv6_opt_status_t)) {
return -1;
}
status = (dhcpv6_opt_status_t *)opt;
break;
case DHCPV6_OPT_PREF:
if (_opt_len(opt) < sizeof(dhcpv6_opt_pref_t)) {
return -1;
}
pref = (dhcpv6_opt_pref_t *)opt;
break;
default:
Expand All @@ -686,6 +698,10 @@ static int _preparse_advertise(uint8_t *adv, size_t len, uint8_t **buf)
*buf = best_adv;
}
server.duid_len = byteorder_ntohs(sid->len);
if (server.duid_len > DHCPV6_DUID_MAX_LEN) {
DEBUG("DHCPv6 client: DUID length is too long.\n");
return -1;
}
memcpy(server.duid.u8, sid->duid, server.duid_len);
server.pref = pref_val;
}
Expand Down
Loading