summaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-19 10:11:34 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-19 10:11:34 +0000
commita850f477fbdf2d411ab615b1baf76a3bd050dcef (patch)
tree305bc2d9a9c95522bd835c97169e878c530b532a /package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch
parentaaec4f96718a46c42b091dfd72311134893d6f60 (diff)
busybox: add an upstream ntpd fix (#12841)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35239 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 94d5f34a1..532fcee0f 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 "),