diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2019-01-07 15:33:42 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2019-01-07 15:33:42 +0100 |
| commit | 74d9f1ba37010face4bd1449df4d60dd84450b06 (patch) | |
| tree | ec6b078d67826b01c69ad533376be7c763596bd2 | |
| parent | b80bdeba0248e2742cf801e7429d5d7aad69d26d (diff) | |
| download | busybox-w32-74d9f1ba37010face4bd1449df4d60dd84450b06.tar.gz busybox-w32-74d9f1ba37010face4bd1449df4d60dd84450b06.tar.bz2 busybox-w32-74d9f1ba37010face4bd1449df4d60dd84450b06.zip | |
udhcpc: when decoding DHCP_SUBNET, ensure it is 4 bytes long
function old new delta
udhcp_run_script 795 801 +6
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | networking/udhcp/common.c | 2 | ||||
| -rw-r--r-- | networking/udhcp/common.h | 2 | ||||
| -rw-r--r-- | networking/udhcp/dhcpc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c index 4c2221b77..fc4de5716 100644 --- a/networking/udhcp/common.c +++ b/networking/udhcp/common.c | |||
| @@ -302,7 +302,7 @@ uint8_t* FAST_FUNC udhcp_get_option32(struct dhcp_packet *packet, int code) | |||
| 302 | { | 302 | { |
| 303 | uint8_t *r = udhcp_get_option(packet, code); | 303 | uint8_t *r = udhcp_get_option(packet, code); |
| 304 | if (r) { | 304 | if (r) { |
| 305 | if (r[-1] != 4) | 305 | if (r[-OPT_DATA + OPT_LEN] != 4) |
| 306 | r = NULL; | 306 | r = NULL; |
| 307 | } | 307 | } |
| 308 | return r; | 308 | return r; |
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h index 9511152ff..62f9a2a4a 100644 --- a/networking/udhcp/common.h +++ b/networking/udhcp/common.h | |||
| @@ -119,7 +119,7 @@ enum { | |||
| 119 | //#define DHCP_TIME_SERVER 0x04 /* RFC 868 time server (32-bit, 0 = 1.1.1900) */ | 119 | //#define DHCP_TIME_SERVER 0x04 /* RFC 868 time server (32-bit, 0 = 1.1.1900) */ |
| 120 | //#define DHCP_NAME_SERVER 0x05 /* IEN 116 _really_ ancient kind of NS */ | 120 | //#define DHCP_NAME_SERVER 0x05 /* IEN 116 _really_ ancient kind of NS */ |
| 121 | //#define DHCP_DNS_SERVER 0x06 | 121 | //#define DHCP_DNS_SERVER 0x06 |
| 122 | //#define DHCP_LOG_SERVER 0x07 /* port 704 UDP log (not syslog) | 122 | //#define DHCP_LOG_SERVER 0x07 /* port 704 UDP log (not syslog) */ |
| 123 | //#define DHCP_COOKIE_SERVER 0x08 /* "quote of the day" server */ | 123 | //#define DHCP_COOKIE_SERVER 0x08 /* "quote of the day" server */ |
| 124 | //#define DHCP_LPR_SERVER 0x09 | 124 | //#define DHCP_LPR_SERVER 0x09 |
| 125 | #define DHCP_HOST_NAME 0x0c /* 12: either client informs server or server gives name to client */ | 125 | #define DHCP_HOST_NAME 0x0c /* 12: either client informs server or server gives name to client */ |
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index 5b3fd531c..dcec8cdfd 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c | |||
| @@ -531,7 +531,7 @@ static char **fill_envp(struct dhcp_packet *packet) | |||
| 531 | temp = udhcp_get_option(packet, code); | 531 | temp = udhcp_get_option(packet, code); |
| 532 | *curr = xmalloc_optname_optval(temp, &dhcp_optflags[i], opt_name); | 532 | *curr = xmalloc_optname_optval(temp, &dhcp_optflags[i], opt_name); |
| 533 | putenv(*curr++); | 533 | putenv(*curr++); |
| 534 | if (code == DHCP_SUBNET) { | 534 | if (code == DHCP_SUBNET && temp[-OPT_DATA + OPT_LEN] == 4) { |
| 535 | /* Subnet option: make things like "$ip/$mask" possible */ | 535 | /* Subnet option: make things like "$ip/$mask" possible */ |
| 536 | uint32_t subnet; | 536 | uint32_t subnet; |
| 537 | move_from_unaligned32(subnet, temp); | 537 | move_from_unaligned32(subnet, temp); |