Revert "Fix parsing of Router Advertisement messsages"

[odhcp6c.git] / src / dhcpv6.c

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index cd8e43800dca33315047cd000262a5697c985be5..75bc50e84e89f641f0b6f450650f86c60f1b83b3 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -569,7 +569,11 @@ static bool dhcpv6_response_is_valid(const void *buf, ssize_t len,
        void *server_id = odhcp6c_get_state(STATE_SERVER_ID, &server_id_len);
 
        dhcpv6_for_each_option(&rep[1], end, otype, olen, odata) {
-               if (otype == DHCPV6_OPT_CLIENTID) {
+               if ((odata + olen) > end) {
+                       options_valid = false;
+                       break;
+               }
+               else if (otype == DHCPV6_OPT_CLIENTID) {
                        clientid_ok = (olen + 4U == client_id_len) && !memcmp(
                                        &odata[-4], client_id, client_id_len);
                } else if (otype == DHCPV6_OPT_SERVERID) {