summaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2013-01-19 10:11:34 +0000
committerJo-Philipp Wich <jow@openwrt.org>2013-01-19 10:11:34 +0000
commit3afbe1669f179d9c3535a9b85167837bb16a82d2 (patch)
treec855cdffb5b1e8ecddf4ee01e26fb282941346b6 /package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch
parent60dde219d42e576f0d9b7cd14f7becda9172b692 (diff)
downloadmaster-31e0f0ae-3afbe1669f179d9c3535a9b85167837bb16a82d2.tar.gz
master-31e0f0ae-3afbe1669f179d9c3535a9b85167837bb16a82d2.tar.bz2
master-31e0f0ae-3afbe1669f179d9c3535a9b85167837bb16a82d2.zip
busybox: add an upstream ntpd fix (#12841)
SVN-Revision: 35239
Diffstat (limited to 'package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch')
-rw-r--r--package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch b/package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch
index 94d5f34a16..532fcee0fb 100644
--- a/package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch
+++ b/package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch
@@ -1,5 +1,5 @@
---- busybox-1.19.4/networking/udhcp/common.c
-+++ busybox-1.19.4-udhcp/networking/udhcp/common.c
+--- a/networking/udhcp/common.c
++++ b/networking/udhcp/common.c
@@ -29,16 +29,16 @@ const struct dhcp_optflag dhcp_optflags[
// { OPTION_IP | OPTION_LIST , 0x07 }, /* DHCP_LOG_SERVER */
// { OPTION_IP | OPTION_LIST , 0x08 }, /* DHCP_COOKIE_SERVER */
@@ -56,8 +56,8 @@
#if ENABLE_FEATURE_UDHCP_RFC3397
case OPTION_DNS_STRING:
#endif
---- busybox-1.19.4/networking/udhcp/common.h
-+++ busybox-1.19.4-udhcp/networking/udhcp/common.h
+--- a/networking/udhcp/common.h
++++ b/networking/udhcp/common.h
@@ -80,6 +80,9 @@ enum {
OPTION_IP = 1,
OPTION_IP_PAIR,
@@ -68,8 +68,8 @@
// OPTION_BOOLEAN,
OPTION_U8,
OPTION_U16,
---- busybox-1.19.4/networking/udhcp/dhcpc.c
-+++ busybox-1.19.4-udhcp/networking/udhcp/dhcpc.c
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
@@ -101,6 +101,7 @@ static const uint8_t len_of_option_as_st
[OPTION_IP_PAIR ] = sizeof("255.255.255.255 ") * 2,
[OPTION_STATIC_ROUTES ] = sizeof("255.255.255.255/32 255.255.255.255 "),