Skip to content

netutils/dhcp6c: validate stored option lengths #3898

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

Merged
acassis merged 1 commit into from
Oct 23, 2026
Merged

netutils/dhcp6c: validate stored option lengths #3898

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
60 changes: 43 additions & 17 deletions netutils/dhcp6c/dhcp6c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,31 +421,57 @@ static void dhcp6c_get_result(FAR void *handle,
}

s_data = dhcp6c_get_state(handle, STATE_IA_NA, &s_len);
dhcpv6_for_each_option(ite, s_data, s_data + s_len, otype, olen, odata)
if (s_data != NULL)
{
addr = (FAR void *)(odata - 4);
memcpy(&presult->addr, &addr->addr, sizeof(presult->addr));
inet_ntop(AF_INET6, &presult->addr, addr_str, sizeof(addr_str));
ninfo("IA_NA %s for iface %i\n", addr_str, pdhcp6c->ifindex);
dhcpv6_for_each_option(ite, s_data, s_data + s_len,
otype, olen, odata)
{
if (otype != DHCPV6_OPT_IA_ADDR ||
olen < sizeof(*addr) - sizeof(addr->type) -
sizeof(addr->len))
{
continue;
}

addr = (FAR void *)(odata - 4);
memcpy(&presult->addr, &addr->addr, sizeof(presult->addr));
inet_ntop(AF_INET6, &presult->addr, addr_str, sizeof(addr_str));
ninfo("IA_NA %s for iface %i\n", addr_str, pdhcp6c->ifindex);
}
}

s_data = dhcp6c_get_state(handle, STATE_IA_PD, &s_len);
dhcpv6_for_each_option(ite, s_data, s_data + s_len, otype, olen, odata)
if (s_data != NULL)
{
pd = (FAR void *)(odata - 4);
memcpy(&presult->pd, &pd->addr, sizeof(presult->pd));
presult->pl = pd->prefix;
netlib_prefix2ipv6netmask(presult->pl, &presult->netmask);
inet_ntop(AF_INET6, &presult->pd, addr_str, sizeof(addr_str));
ninfo("IA_PD %s for iface %i\n", addr_str, pdhcp6c->ifindex);
inet_ntop(AF_INET6, &presult->netmask, addr_str, sizeof(addr_str));
ninfo("netmask %s for iface %i\n", addr_str, pdhcp6c->ifindex);
dhcpv6_for_each_option(ite, s_data, s_data + s_len,
otype, olen, odata)
{
if (otype != DHCPV6_OPT_IA_PREFIX ||
olen < sizeof(*pd) - sizeof(pd->type) - sizeof(pd->len))
{
continue;
}

pd = (FAR void *)(odata - 4);
memcpy(&presult->pd, &pd->addr, sizeof(presult->pd));
presult->pl = pd->prefix;
netlib_prefix2ipv6netmask(presult->pl, &presult->netmask);
inet_ntop(AF_INET6, &presult->pd, addr_str, sizeof(addr_str));
ninfo("IA_PD %s for iface %i\n", addr_str, pdhcp6c->ifindex);
inet_ntop(AF_INET6, &presult->netmask, addr_str,
sizeof(addr_str));
ninfo("netmask %s for iface %i\n", addr_str, pdhcp6c->ifindex);
}
}

dns = dhcp6c_get_state(handle, STATE_DNS, &s_len);
memcpy(&presult->dns, dns, sizeof(presult->dns));
inet_ntop(AF_INET6, &presult->dns, addr_str, sizeof(addr_str));
ninfo("DNS server %s for iface %i\n", addr_str, pdhcp6c->ifindex);
if (dns != NULL && s_len >= sizeof(presult->dns) &&
s_len % sizeof(*dns) == 0)
{
memcpy(&presult->dns, dns, sizeof(presult->dns));
inet_ntop(AF_INET6, &presult->dns, addr_str, sizeof(addr_str));
ninfo("DNS server %s for iface %i\n", addr_str, pdhcp6c->ifindex);
}

presult->t1 = pdhcp6c->t1;
presult->t2 = pdhcp6c->t2;
Expand Down
Loading