diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2013-01-19 10:19:40 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-01-19 10:19:40 +0000 |
| commit | fc54f26150c9cbf353d0142f20d529589cbafd93 (patch) | |
| tree | 9ab8248d67c8160acde681d20fae0d5c9670d234 /package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch | |
| parent | 2f62c6c150945f8c5fa9525215633618f2dc4aac (diff) | |
| download | upstream-fc54f26150c9cbf353d0142f20d529589cbafd93.tar.gz upstream-fc54f26150c9cbf353d0142f20d529589cbafd93.tar.bz2 upstream-fc54f26150c9cbf353d0142f20d529589cbafd93.zip | |
AA: busybox: merge r35239
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@35241 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.patch | 12 |
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 "), |