mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 18:07:25 +00:00
Code Issues Releases Wiki Activity

Use offsetof() instead of sizeof() to get the sizes for dhcpv6_relay_packet

Browse Source 
and dhcpv6_packet in several more places.  Thanks to a report from
Bruno Verstuyft and Vincent Demaertelaere of Excentis.
[ISC-Bugs #27941]
This commit is contained in:
Shawn Routhier 2012-03-20 00:31:34 +00:00
parent d13db163c7
commit b342f2e77c
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RELNOTES
View File

@ -104,6 +104,11 @@ work on other platforms. Please report any problems and suggested fixes to
weren't removed from the DNS. weren't removed from the DNS.
[ISC-BUGS #27858] [ISC-BUGS #27858]
- Use offsetof() instead of sizeof() to get the sizes for dhcpv6_relay_packet
and dhcpv6_packet in several more places. Thanks to a report from
Bruno Verstuyft and Vincent Demaertelaere of Excentis.
[ISC-Bugs #27941]
Changes since 4.2.2 Changes since 4.2.2
- Fix the code that checks for an existing DDNS transaction to cancel - Fix the code that checks for an existing DDNS transaction to cancel

6
common/options.c
View File

@ -3845,6 +3845,7 @@ do_packet6(struct interface_info *interface, const char *packet,
msg_type = packet[0]; msg_type = packet[0];
if ((msg_type == DHCPV6_RELAY_FORW) || if ((msg_type == DHCPV6_RELAY_FORW) ||
(msg_type == DHCPV6_RELAY_REPL)) { (msg_type == DHCPV6_RELAY_REPL)) {
int relaylen = (int)(offsetof(struct dhcpv6_relay_packet, options));
relay = (const struct dhcpv6_relay_packet *)packet; relay = (const struct dhcpv6_relay_packet *)packet;
decoded_packet->dhcpv6_msg_type = relay->msg_type; decoded_packet->dhcpv6_msg_type = relay->msg_type;
@ -3856,7 +3857,7 @@ do_packet6(struct interface_info *interface, const char *packet,
relay->peer_address, sizeof(relay->peer_address)); relay->peer_address, sizeof(relay->peer_address));
if (!parse_option_buffer(decoded_packet->options, if (!parse_option_buffer(decoded_packet->options,
relay->options, len-sizeof(*relay), relay->options, len - relaylen,
&dhcpv6_universe)) { &dhcpv6_universe)) {
/* no logging here, as parse_option_buffer() logs all /* no logging here, as parse_option_buffer() logs all
cases where it fails */ cases where it fails */
@ -3864,6 +3865,7 @@ do_packet6(struct interface_info *interface, const char *packet,
return; return;
} }
} else { } else {
int msglen = (int)(offsetof(struct dhcpv6_packet, options));
msg = (const struct dhcpv6_packet *)packet; msg = (const struct dhcpv6_packet *)packet;
decoded_packet->dhcpv6_msg_type = msg->msg_type; decoded_packet->dhcpv6_msg_type = msg->msg_type;
@ -3873,7 +3875,7 @@ do_packet6(struct interface_info *interface, const char *packet,
sizeof(decoded_packet->dhcpv6_transaction_id)); sizeof(decoded_packet->dhcpv6_transaction_id));
if (!parse_option_buffer(decoded_packet->options, if (!parse_option_buffer(decoded_packet->options,
msg->options, len-sizeof(*msg), msg->options, len - msglen,
&dhcpv6_universe)) { &dhcpv6_universe)) {
/* no logging here, as parse_option_buffer() logs all /* no logging here, as parse_option_buffer() logs all
cases where it fails */ cases where it fails */

6
server/dhcpv6.c
View File

@ -5527,6 +5527,7 @@ dhcpv6_relay_forw(struct data_string *reply_ret, struct packet *packet) {
msg_type = enc_opt_data.data[0]; msg_type = enc_opt_data.data[0];
if ((msg_type == DHCPV6_RELAY_FORW) || if ((msg_type == DHCPV6_RELAY_FORW) ||
(msg_type == DHCPV6_RELAY_REPL)) { (msg_type == DHCPV6_RELAY_REPL)) {
int relaylen = (int)(offsetof(struct dhcpv6_relay_packet, options));
relay = (struct dhcpv6_relay_packet *)enc_opt_data.data; relay = (struct dhcpv6_relay_packet *)enc_opt_data.data;
enc_packet->dhcpv6_msg_type = relay->msg_type; enc_packet->dhcpv6_msg_type = relay->msg_type;
@ -5539,13 +5540,14 @@ dhcpv6_relay_forw(struct data_string *reply_ret, struct packet *packet) {
if (!parse_option_buffer(enc_packet->options, if (!parse_option_buffer(enc_packet->options,
relay->options, relay->options,
enc_opt_data.len-sizeof(*relay), enc_opt_data.len - relaylen,
&dhcpv6_universe)) { &dhcpv6_universe)) {
/* no logging here, as parse_option_buffer() logs all /* no logging here, as parse_option_buffer() logs all
cases where it fails */ cases where it fails */
goto exit; goto exit;
} }
} else { } else {
int msglen = (int)(offsetof(struct dhcpv6_packet, options));
msg = (struct dhcpv6_packet *)enc_opt_data.data; msg = (struct dhcpv6_packet *)enc_opt_data.data;
enc_packet->dhcpv6_msg_type = msg->msg_type; enc_packet->dhcpv6_msg_type = msg->msg_type;
@ -5556,7 +5558,7 @@ dhcpv6_relay_forw(struct data_string *reply_ret, struct packet *packet) {
if (!parse_option_buffer(enc_packet->options, if (!parse_option_buffer(enc_packet->options,
msg->options, msg->options,
enc_opt_data.len-sizeof(*msg), enc_opt_data.len - msglen,
&dhcpv6_universe)) { &dhcpv6_universe)) {
/* no logging here, as parse_option_buffer() logs all /* no logging here, as parse_option_buffer() logs all
cases where it fails */ cases where it fails */