diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2013-12-27 15:49:44 +0100 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2013-12-27 15:49:44 +0100 |
| commit | 68ac18ed5d5b4c2d403396764f08c92a160b4a18 (patch) | |
| tree | 2dd7ba722995bb6ab6bf94a126f123834ee8bdf0 /src/odhcp6c.h | |
| parent | 1339588a2a1143e4029a9e7558130c9b17fd6a3e (diff) | |
| download | odhcp6c-68ac18ed5d5b4c2d403396764f08c92a160b4a18.tar.gz | |
Revert "Fix handling of DHCPv6 messages containing option lengths exceeding the message"
This reverts commit 26c5d8724355b29694af684ee29b47e52129a33c.
Diffstat (limited to 'src/odhcp6c.h')
| -rw-r--r-- | src/odhcp6c.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/odhcp6c.h b/src/odhcp6c.h index 8771521..15be59a 100644 --- a/src/odhcp6c.h +++ b/src/odhcp6c.h @@ -155,7 +155,7 @@ struct dhcpv6_auth_reconfigure { #define dhcpv6_for_each_option(start, end, otype, olen, odata)\ for (uint8_t *_o = (uint8_t*)(start); _o + 4 <= (uint8_t*)(end) &&\ ((otype) = _o[0] << 8 | _o[1]) && ((odata) = (void*)&_o[4]) &&\ - ((olen) = _o[2] << 8 | _o[3]); \ + ((olen) = _o[2] << 8 | _o[3]) + (odata) <= (uint8_t*)(end); \ _o += 4 + (_o[2] << 8 | _o[3])) |