Fix DHCP renew handling
cover Fix DHCP renew handling
From: Lars Steubesand <[email protected]>
It appears that commit58d397ba7487 ("gdhcp: Avoid reading invalid data in dhcp_get_option") broke DHCP renew handling. Fix this and add more robust handling of DHCP options with length checks.
The patch
[PATCH 3/3] gdhcp: Add unit tests for dhcp_get_option some minimal form of unit testing for parsing DHCP options. If not required or not desired this way the patch can be dropped.
Lars Steubesand (2):
gdhcp: Further check invalid data in dhcp_get_option
gdhcp: Add unit tests for dhcp_get_option
Lauser, Simon (1):
gdhcp: Set packet length when receiving L3 packet
.gitignore | 1 + Makefile.am | 9 + gdhcp/client.c | 11 +- gdhcp/common.c | 73 +++++++- gdhcp/common.h | 2 +- gdhcp/server.c | 6 +- unit/test-dhcp-options.c | 365 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 449 insertions(+), 18 deletions(-) create mode 100644 unit/test-dhcp-options.c
base-commit: b335791af9194d1bd7b9821f4c5abc5405109557
Signature · 1 line
2.17.1
PATCH 1/3 gdhcp: Set packet length when receiving L3 packet
From: "Lauser, Simon" <[email protected]>
The L3 receive path was not setting the packet length. As a result, the DHCP options could not be retrieved from the DHCP packet. Thus, renewing was not properly working, e.g. IP address was proper but netmask was default set to /32.
dhcp_get_option")
--- gdhcp/client.c | 1 + 1 file changed, 1 insertion(+)
gdhcp/client.c +1 -0
@@ -2314,6 +2314,7 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition, }else { re =dhcp_recv_l3_packet (&packet, dhcp_client->listener_sockfd); + pkt_len = (uint16_t )(unsigned int )re; xid = packet.xid; } }else if (dhcp_client->listen_mode ==L_ARP ) {
Signature · 1 line
2.17.1
PATCH 2/3 gdhcp: Further check invalid data in dhcp_get_option
In reply to Lars SteubesandFrom: Lars Steubesand <[email protected]>
Improve error case handling for invalid DHCP options by fixing dhcp_get_option and checking valid lengths of known DHCP options.
--- gdhcp/common.c | 53 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-)
gdhcp/common.c +46 -7
@@ -73,6 +73,36 @@ GDHCPOptionType dhcp_get_code_type(uint8_t code)return OPTION_UNKNOWN ; } +bool dhcp_check_option (uint8_t code,uint8_t data_len) +{ +GDHCPOptionType type =dhcp_get_code_type (code); +uint8_t len; + +if (type ==OPTION_UNKNOWN ) +return true; + + len = dhcp_option_lengths[type &OPTION_TYPE_MASK ]; + +if ((type & ~OPTION_TYPE_MASK ) ==OPTION_LIST ) { +if ((data_len ==0 ) || (data_len % len !=0 )) { +printf ("Invalid option len %d (expecting multiple of %d) for code 0x%x\n" , + data_len, len, code); +return false; + } + }else if (type ==OPTION_STRING ) { +if (data_len >=1 ) +return true; +else +return false; + }else if (len != data_len) { +printf ("Invalid option len %d (expecting %d) for code 0x%x\n" , + data_len, len, code); +return false; + } + +return true; +} +uint8_t *dhcp_get_option (struct dhcp_packet *packet,uint16_t packet_len,int code) {int len, rem;
@@ -83,13 +113,18 @@ uint8_t *dhcp_get_option(struct dhcp_packet *packet, uint16_t packet_len, int co/* option bytes: [code][len][data1][data2]..[dataLEN] */ optionptr = packet->options; rem =sizeof (packet->options); - options_len = packet_len - (sizeof (*packet) -sizeof (packet->options)); + +if (offsetof(struct dhcp_packet , options) >= packet_len) +return NULL ; + + options_len = packet_len - offsetof(struct dhcp_packet , options); options_end = optionptr + options_len -1 ;while (1 ) { -if ((rem <=0 ) && (optionptr +OPT_CODE > options_end)) +if ((rem <=0 ) || (optionptr +OPT_CODE > options_end)) {/* Bad packet, malformed option field */ return NULL ; + }if (optionptr[OPT_CODE ] ==DHCP_PADDING ) { rem--;
@@ -125,17 +160,21 @@ uint8_t *dhcp_get_option(struct dhcp_packet *packet, uint16_t packet_len, int co len =2 + optionptr[OPT_LEN ]; +if (optionptr + len > options_end) { +/* bad packet, option length points OOB */ +return NULL ; + } + rem -= len;if (rem <0 ) -continue ;/* complain and return NULL */ +return NULL ;if (optionptr[OPT_CODE ] == code) { -if (optionptr + len > options_end) { -/* bad packet, option length points OOB */ +if (!dhcp_check_option (code, optionptr[OPT_LEN ])) {return NULL ; - }else { -return optionptr +OPT_DATA ; } +else +return optionptr +OPT_DATA ; }if (optionptr[OPT_CODE ] ==DHCP_OPTION_OVERLOAD )
Signature · 1 line
2.17.1
PATCH 3/3 gdhcp: Add unit tests for dhcp_get_option
In reply to Lars SteubesandFrom: Lars Steubesand <[email protected]>
--- .gitignore | 1 + Makefile.am | 9 + gdhcp/client.c | 10 +- gdhcp/common.c | 20 ++- gdhcp/common.h | 2 +- gdhcp/server.c | 6 +- unit/test-dhcp-options.c | 365 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 402 insertions(+), 11 deletions(-) create mode 100644 unit/test-dhcp-options.c
.gitignore +1 -0
@@ -69,6 +69,7 @@ tools/netlink-test unit/test-ippool unit/test-nat unit/test-iptables +unit/test-dhcp-options doc/*.bak doc/*.stamp
Makefile.am +9 -0
@@ -324,6 +324,15 @@ unit_test_ippool_LDADD = gdbus/libgdbus-internal.la \ TESTS = unit/test-ippool +noinst_PROGRAMS += unit/test-dhcp-options + +unit_test_dhcp_options_SOURCES = $(backtrace_sources) src/log.c \ + src/error.c src/util.c gdhcp/common.c unit/test-dhcp-options.c +unit_test_dhcp_options_LDADD = gdbus/libgdbus-internal.la \ + @GLIB_LIBS@ @DBUS_LIBS@ -ldl + +TESTS += unit/test-dhcp-options + if WISPR noinst_PROGRAMS += tools/wispr
gdhcp/client.c +5 -5
@@ -1634,7 +1634,7 @@ static uint32_t get_lease(struct dhcp_packet *packet, uint16_t packet_len)uint8_t *option;uint32_t lease_seconds; - option =dhcp_get_option (packet, packet_len,DHCP_LEASE_TIME ); + option =dhcp_get_option (packet, packet_len,DHCP_LEASE_TIME ,NULL );if (!option)return 3600 ;
@@ -2238,7 +2238,7 @@ static void get_request(GDHCPClient *dhcp_client, struct dhcp_packet *packet,for (list = dhcp_client->request_list; list; list = list->next) { code = (uint8_t )GPOINTER_TO_INT (list->data); - option =dhcp_get_option (packet, packet_len, code); + option =dhcp_get_option (packet, packet_len, code,NULL );if (!option) {g_hash_table_remove (dhcp_client->code_value_hash,GINT_TO_POINTER ((int ) code));
@@ -2364,7 +2364,7 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition, dhcp_client->status_code = status; } }else { - message_type =dhcp_get_option (&packet, pkt_len,DHCP_MESSAGE_TYPE ); + message_type =dhcp_get_option (&packet, pkt_len,DHCP_MESSAGE_TYPE ,NULL );if (!message_type)return TRUE; }
@@ -2381,7 +2381,7 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition, dhcp_client->timeout =0 ; dhcp_client->retry_times =0 ; - option =dhcp_get_option (&packet, pkt_len,DHCP_SERVER_ID ); + option =dhcp_get_option (&packet, pkt_len,DHCP_SERVER_ID ,NULL );if (!option)return TRUE;
@@ -2445,7 +2445,7 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition,if (dhcp_client->state ==REBOOTING ) { option =dhcp_get_option (&packet, pkt_len, -DHCP_SERVER_ID ); +DHCP_SERVER_ID ,NULL );if (!option)return TRUE; dhcp_client->server_ip =get_be32 (option);
gdhcp/common.c +18 -2
@@ -103,7 +103,7 @@ bool dhcp_check_option(uint8_t code, uint8_t data_len)return true; } -uint8_t *dhcp_get_option (struct dhcp_packet *packet,uint16_t packet_len,int code) +uint8_t *dhcp_get_option (struct dhcp_packet *packet,uint16_t packet_len,int code,int *error) {int len, rem;uint8_t *optionptr, *options_end;
@@ -115,7 +115,12 @@ uint8_t *dhcp_get_option(struct dhcp_packet *packet, uint16_t packet_len, int co rem =sizeof (packet->options);if (offsetof(struct dhcp_packet , options) >= packet_len) + { +if (error) + *error =1 ; +return NULL ; + } options_len = packet_len - offsetof(struct dhcp_packet , options); options_end = optionptr + options_len -1 ;
@@ -123,6 +128,8 @@ uint8_t *dhcp_get_option(struct dhcp_packet *packet, uint16_t packet_len, int cowhile (1 ) {if ((rem <=0 ) || (optionptr +OPT_CODE > options_end)) {/* Bad packet, malformed option field */ +if (error) + *error =2 ;return NULL ; }
@@ -155,6 +162,8 @@ uint8_t *dhcp_get_option(struct dhcp_packet *packet, uint16_t packet_len, int coif (optionptr +OPT_LEN > options_end) {/* bad packet, would read length field from OOB */ +if (error) + *error =3 ;return NULL ; }
@@ -162,15 +171,22 @@ uint8_t *dhcp_get_option(struct dhcp_packet *packet, uint16_t packet_len, int coif (optionptr + len > options_end) {/* bad packet, option length points OOB */ +if (error) + *error =4 ;return NULL ; } rem -= len; -if (rem <0 ) +if (rem <0 ) { +if (error) + *error =5 ;return NULL ; + }if (optionptr[OPT_CODE ] == code) {if (!dhcp_check_option (code, optionptr[OPT_LEN ])) { +if (error) + *error =6 ;return NULL ; }else
gdhcp/common.h +1 -1
@@ -179,7 +179,7 @@ struct in6_pktinfo { };#endif -uint8_t *dhcp_get_option (struct dhcp_packet *packet,uint16_t packet_len,int code); +uint8_t *dhcp_get_option (struct dhcp_packet *packet,uint16_t packet_len,int code,int *error);uint8_t *dhcpv6_get_option (struct dhcpv6_packet *packet,uint16_t pkt_len,int code,uint16_t *option_len,int *option_count); uint8_t *dhcpv6_get_sub_option(unsigned char *option, uint16_t max_len,
gdhcp/server.c +3 -3
@@ -423,7 +423,7 @@ static uint8_t check_packet_type(struct dhcp_packet *packet, uint16_t packet_lenif (packet->op !=BOOTREQUEST )return 0 ; - type =dhcp_get_option (packet, packet_len,DHCP_MESSAGE_TYPE ); + type =dhcp_get_option (packet, packet_len,DHCP_MESSAGE_TYPE ,NULL );if (!type)return 0 ;
@@ -668,7 +668,7 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition,if (type ==0 )return TRUE; - server_id_option =dhcp_get_option (&packet, packet_len,DHCP_SERVER_ID ); + server_id_option =dhcp_get_option (&packet, packet_len,DHCP_SERVER_ID ,NULL );if (server_id_option) {uint32_t server_nid =get_unaligned ((const uint32_t *) server_id_option);
@@ -677,7 +677,7 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition,return TRUE; } - request_ip_option =dhcp_get_option (&packet, packet_len,DHCP_REQUESTED_IP ); + request_ip_option =dhcp_get_option (&packet, packet_len,DHCP_REQUESTED_IP ,NULL );if (request_ip_option) requested_nip =get_be32 (request_ip_option);
unit/test-dhcp-options.c new file +365 -0
365 lines not on this page · raw message
Signature · 1 line
2.17.1