From 3f4ffff0734f7ab97234e292a10b963c3fd99376 Mon Sep 17 00:00:00 2001 From: Christian Buschau Date: Thu, 24 Jan 2019 12:06:23 +0100 Subject: [PATCH] busybox: fix CVE-2018-20679, CVE-2019-5747 closes #7663 --- srcpkgs/busybox/patches/CVE-2018-20679.patch | 128 +++++++++++++++++++ srcpkgs/busybox/patches/CVE-2019-5747.patch | 50 ++++++++ srcpkgs/busybox/template | 4 +- 3 files changed, 180 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/busybox/patches/CVE-2018-20679.patch create mode 100644 srcpkgs/busybox/patches/CVE-2019-5747.patch diff --git a/srcpkgs/busybox/patches/CVE-2018-20679.patch b/srcpkgs/busybox/patches/CVE-2018-20679.patch new file mode 100644 index 0000000000..eeabf21cc8 --- /dev/null +++ b/srcpkgs/busybox/patches/CVE-2018-20679.patch @@ -0,0 +1,128 @@ +commit 6d3b4bb24da9a07c263f3c1acf8df85382ff562c +Author: Denys Vlasenko +Date: Mon Dec 17 18:07:18 2018 +0100 + + udhcpc: check that 4-byte options are indeed 4-byte, closes 11506 + + function old new delta + udhcp_get_option32 - 27 +27 + udhcp_get_option 231 248 +17 + ------------------------------------------------------------------------------ + (add/remove: 1/0 grow/shrink: 1/0 up/down: 44/0) Total: 44 bytes + + Signed-off-by: Denys Vlasenko + +diff --git networking/udhcp/common.c networking/udhcp/common.c +index e5fd74f91..41b05b855 100644 +--- networking/udhcp/common.c ++++ networking/udhcp/common.c +@@ -272,6 +272,15 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code) + goto complain; /* complain and return NULL */ + + if (optionptr[OPT_CODE] == code) { ++ if (optionptr[OPT_LEN] == 0) { ++ /* So far no valid option with length 0 known. ++ * Having this check means that searching ++ * for DHCP_MESSAGE_TYPE need not worry ++ * that returned pointer might be unsafe ++ * to dereference. ++ */ ++ goto complain; /* complain and return NULL */ ++ } + log_option("option found", optionptr); + return optionptr + OPT_DATA; + } +@@ -289,6 +298,16 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code) + return NULL; + } + ++uint8_t* FAST_FUNC udhcp_get_option32(struct dhcp_packet *packet, int code) ++{ ++ uint8_t *r = udhcp_get_option(packet, code); ++ if (r) { ++ if (r[-1] != 4) ++ r = NULL; ++ } ++ return r; ++} ++ + /* Return the position of the 'end' option (no bounds checking) */ + int FAST_FUNC udhcp_end_option(uint8_t *optionptr) + { +diff --git networking/udhcp/common.h networking/udhcp/common.h +index 7ad603d33..9511152ff 100644 +--- networking/udhcp/common.h ++++ networking/udhcp/common.h +@@ -205,6 +205,10 @@ extern const uint8_t dhcp_option_lengths[] ALIGN1; + unsigned FAST_FUNC udhcp_option_idx(const char *name, const char *option_strings); + + uint8_t *udhcp_get_option(struct dhcp_packet *packet, int code) FAST_FUNC; ++/* Same as above + ensures that option length is 4 bytes ++ * (returns NULL if size is different) ++ */ ++uint8_t *udhcp_get_option32(struct dhcp_packet *packet, int code) FAST_FUNC; + int udhcp_end_option(uint8_t *optionptr) FAST_FUNC; + void udhcp_add_binary_option(struct dhcp_packet *packet, uint8_t *addopt) FAST_FUNC; + #if ENABLE_UDHCPC || ENABLE_UDHCPD +diff --git networking/udhcp/dhcpc.c networking/udhcp/dhcpc.c +index 4b23e4d39..5b3fd531c 100644 +--- networking/udhcp/dhcpc.c ++++ networking/udhcp/dhcpc.c +@@ -1691,7 +1691,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) + * They say ISC DHCP client supports this case. + */ + server_addr = 0; +- temp = udhcp_get_option(&packet, DHCP_SERVER_ID); ++ temp = udhcp_get_option32(&packet, DHCP_SERVER_ID); + if (!temp) { + bb_error_msg("no server ID, using 0.0.0.0"); + } else { +@@ -1718,7 +1718,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) + struct in_addr temp_addr; + uint8_t *temp; + +- temp = udhcp_get_option(&packet, DHCP_LEASE_TIME); ++ temp = udhcp_get_option32(&packet, DHCP_LEASE_TIME); + if (!temp) { + bb_error_msg("no lease time with ACK, using 1 hour lease"); + lease_seconds = 60 * 60; +@@ -1813,7 +1813,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) + uint32_t svid; + uint8_t *temp; + +- temp = udhcp_get_option(&packet, DHCP_SERVER_ID); ++ temp = udhcp_get_option32(&packet, DHCP_SERVER_ID); + if (!temp) { + non_matching_svid: + log1("received DHCP NAK with wrong" +diff --git networking/udhcp/dhcpd.c networking/udhcp/dhcpd.c +index a8cd3f03b..477856d11 100644 +--- networking/udhcp/dhcpd.c ++++ networking/udhcp/dhcpd.c +@@ -640,7 +640,7 @@ static void add_server_options(struct dhcp_packet *packet) + static uint32_t select_lease_time(struct dhcp_packet *packet) + { + uint32_t lease_time_sec = server_config.max_lease_sec; +- uint8_t *lease_time_opt = udhcp_get_option(packet, DHCP_LEASE_TIME); ++ uint8_t *lease_time_opt = udhcp_get_option32(packet, DHCP_LEASE_TIME); + if (lease_time_opt) { + move_from_unaligned32(lease_time_sec, lease_time_opt); + lease_time_sec = ntohl(lease_time_sec); +@@ -987,7 +987,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) + } + + /* Get SERVER_ID if present */ +- server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID); ++ server_id_opt = udhcp_get_option32(&packet, DHCP_SERVER_ID); + if (server_id_opt) { + uint32_t server_id_network_order; + move_from_unaligned32(server_id_network_order, server_id_opt); +@@ -1011,7 +1011,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) + } + + /* Get REQUESTED_IP if present */ +- requested_ip_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP); ++ requested_ip_opt = udhcp_get_option32(&packet, DHCP_REQUESTED_IP); + if (requested_ip_opt) { + move_from_unaligned32(requested_nip, requested_ip_opt); + } diff --git a/srcpkgs/busybox/patches/CVE-2019-5747.patch b/srcpkgs/busybox/patches/CVE-2019-5747.patch new file mode 100644 index 0000000000..0a7a3512d7 --- /dev/null +++ b/srcpkgs/busybox/patches/CVE-2019-5747.patch @@ -0,0 +1,50 @@ +commit 74d9f1ba37010face4bd1449df4d60dd84450b06 +Author: Denys Vlasenko +Date: Mon Jan 7 15:33:42 2019 +0100 + + 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 + +diff --git networking/udhcp/common.c networking/udhcp/common.c +index 4c2221b77..fc4de5716 100644 +--- networking/udhcp/common.c ++++ networking/udhcp/common.c +@@ -302,7 +302,7 @@ uint8_t* FAST_FUNC udhcp_get_option32(struct dhcp_packet *packet, int code) + { + uint8_t *r = udhcp_get_option(packet, code); + if (r) { +- if (r[-1] != 4) ++ if (r[-OPT_DATA + OPT_LEN] != 4) + r = NULL; + } + return r; +diff --git networking/udhcp/common.h networking/udhcp/common.h +index 9511152ff..62f9a2a4a 100644 +--- networking/udhcp/common.h ++++ networking/udhcp/common.h +@@ -119,7 +119,7 @@ enum { + //#define DHCP_TIME_SERVER 0x04 /* RFC 868 time server (32-bit, 0 = 1.1.1900) */ + //#define DHCP_NAME_SERVER 0x05 /* IEN 116 _really_ ancient kind of NS */ + //#define DHCP_DNS_SERVER 0x06 +-//#define DHCP_LOG_SERVER 0x07 /* port 704 UDP log (not syslog) ++//#define DHCP_LOG_SERVER 0x07 /* port 704 UDP log (not syslog) */ + //#define DHCP_COOKIE_SERVER 0x08 /* "quote of the day" server */ + //#define DHCP_LPR_SERVER 0x09 + #define DHCP_HOST_NAME 0x0c /* 12: either client informs server or server gives name to client */ +diff --git networking/udhcp/dhcpc.c networking/udhcp/dhcpc.c +index 5b3fd531c..dcec8cdfd 100644 +--- networking/udhcp/dhcpc.c ++++ networking/udhcp/dhcpc.c +@@ -531,7 +531,7 @@ static char **fill_envp(struct dhcp_packet *packet) + temp = udhcp_get_option(packet, code); + *curr = xmalloc_optname_optval(temp, &dhcp_optflags[i], opt_name); + putenv(*curr++); +- if (code == DHCP_SUBNET) { ++ if (code == DHCP_SUBNET && temp[-OPT_DATA + OPT_LEN] == 4) { + /* Subnet option: make things like "$ip/$mask" possible */ + uint32_t subnet; + move_from_unaligned32(subnet, temp); diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index ec54293fb0..0a0c6f998e 100644 --- a/srcpkgs/busybox/template +++ b/srcpkgs/busybox/template @@ -1,10 +1,10 @@ # Template file for 'busybox' pkgname=busybox version=1.29.3 -revision=1 +revision=2 hostmakedepends="perl" checkdepends="zip" -short_desc="The Swiss Army Knife of Embedded Linux" +short_desc="Swiss Army Knife of Embedded Linux" maintainer="Juan RP " license="GPL-2.0-only" homepage="http://www.busybox.net"