summaryrefslogtreecommitdiff
path: root/net/dhcpv6.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-06-14 15:50:04 -0400
committerTom Rini <trini@konsulko.com>2023-06-14 15:50:04 -0400
commit2f4664f5c3edc55b18d8906f256a4c8e303243c0 (patch)
tree438153aa69df3c1af0dc04848b507f5a833787dd /net/dhcpv6.c
parent19b77d3d23966a0d6dbb3c86187765f11100fb6f (diff)
parent2f7c7159ea4c0e5c2aa7671c5b5a2889d0abe7ce (diff)
Merge branch '2023-06-14-assorted-fixes'
- Fix some issues Coverity Scan reported in IPv6, SPL EXTn support fix, two small bootstd fixes, one Kconfig dependency fix, and fix booting on Pinephone Pro
Diffstat (limited to 'net/dhcpv6.c')
-rw-r--r--net/dhcpv6.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/dhcpv6.c b/net/dhcpv6.c
index 0d1c600632f..73a1067877c 100644
--- a/net/dhcpv6.c
+++ b/net/dhcpv6.c
@@ -316,6 +316,11 @@ static void dhcp6_parse_options(uchar *rx_pkt, unsigned int len)
option_ptr = ((uchar *)option_hdr) + sizeof(struct dhcp6_hdr);
option_len = ntohs(option_hdr->option_len);
+ if (option_ptr + option_len > rx_pkt + len) {
+ debug("Invalid option length\n");
+ return;
+ }
+
switch (ntohs(option_hdr->option_id)) {
case DHCP6_OPTION_CLIENTID:
if (memcmp(option_ptr, sm_params.duid, option_len)