Skip to contentSkip to conversation

busybox: Add fix for CVE-2019-5747

PATCH New Rahul Taya 1 participant 1 message Jan 6, 2021

lore
Share & tools
lore

Rahul Taya

author Applied
#0 lore raw

PATCH 1/1 busybox: Add fix for CVE-2019-5747

Applied patch that Ubuntu applied to busybox 1.27.2

The patch is available from file:
http://archive.ubuntu.com/ubuntu/pool/main/b/busybox/busybox_1.27.2-2ubuntu3.2.debian.tar.xz
in path debian/patches/.

The below patch is added:

CVE-2019-5747.patch

---
 .../busybox/busybox/CVE-2019-5747.patch       | 57 +++++++++++++++++++
 meta/recipes-core/busybox/busybox_1.27.2.bb   |  1 +
 2 files changed, 58 insertions(+)
 create mode 100644 meta/recipes-core/busybox/busybox/CVE-2019-5747.patch
meta/recipes-core/busybox/busybox/CVE-2019-5747.patch new file +57 -0
new file mode 100644
index 0000000000..c209e48e73
@@ -0,0 +1,57 @@
+From 74d9f1ba37010face4bd1449df4d60dd84450b06 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <[email protected]>
+Date: Mon, 7 Jan 2019 15:33:42 +0100
+Subject: 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 <[email protected]>
+CVE-2019-5747
+[http://archive.ubuntu.com/ubuntu/pool/main/b/busybox/busybox_1.27.2-2ubuntu3.2.debian.tar.xz]
+Upstream-Status: Backport
+---
+ networking/udhcp/common.c | 2 +-
+ networking/udhcp/common.h | 2 +-
+ networking/udhcp/dhcpc.c  | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: busybox-1.27.2/networking/udhcp/common.c
+===================================================================
+--- busybox-1.27.2.orig/networking/udhcp/common.c      2019-03-06 15:10:51.569626885 -0500
++++ busybox-1.27.2/networking/udhcp/common.c   2019-03-06 15:10:51.569626885 -0500
+@@ -300,7 +300,7 @@ uint8_t* FAST_FUNC udhcp_get_option32(st
+ {
+       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;
+Index: busybox-1.27.2/networking/udhcp/common.h
+===================================================================
+--- busybox-1.27.2.orig/networking/udhcp/common.h      2019-03-06 15:10:51.569626885 -0500
++++ busybox-1.27.2/networking/udhcp/common.h   2019-03-06 15:10:51.569626885 -0500
+@@ -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 /* either client informs server or server gives name to client */
+Index: busybox-1.27.2/networking/udhcp/dhcpc.c
+===================================================================
+--- busybox-1.27.2.orig/networking/udhcp/dhcpc.c       2019-03-06 15:10:51.569626885 -0500
++++ busybox-1.27.2/networking/udhcp/dhcpc.c    2019-03-06 15:10:51.569626885 -0500
+@@ -524,7 +524,7 @@ static char **fill_envp(struct dhcp_pack
+               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);
meta/recipes-core/busybox/busybox_1.27.2.bb +1 -0
index 716a0650fc..4f0b0db69c 100644
@@ -49,6 +49,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://busybox-fix-lzma-segfaults.patch \
            file://umount-ignore-c.patch \
            file://CVE-2017-15874.patch \
+           file://CVE-2019-5747.patch \
 "
 SRC_URI_append_libc-musl = " file://musl.cfg "
 

--
2.17.1

This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails.