vapier 14/10/18 22:57:51 Added: busybox-1.22.1-lzop.patch busybox-1.22.1-nc.patch Log: Add lzop fix from upstream #515254 by Kristian Fiskerstrand. Add USE=debug to control build debug options and switch to defconfig #525586 by emil karlson. (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.1 sys-apps/busybox/files/busybox-1.22.1-lzop.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/files/busybox-1.22.1-lzop.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/files/busybox-1.22.1-lzop.patch?rev=1.1&content-type=text/plain Index: busybox-1.22.1-lzop.patch =================================================================== >From a9dc7c2f59dc5e92870d2d46316ea5c1f14740e3 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko <[email protected]> Date: Mon, 30 Jun 2014 10:14:34 +0200 Subject: [PATCH] lzop: add overflow check See CVE-2014-4607 http://www.openwall.com/lists/oss-security/2014/06/26/20 function old new delta lzo1x_decompress_safe 1010 1031 +21 Signed-off-by: Denys Vlasenko <[email protected]> --- archival/libarchive/liblzo.h | 2 ++ archival/libarchive/lzo1x_d.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/archival/libarchive/liblzo.h b/archival/libarchive/liblzo.h index 843997c..4596620 100644 --- a/archival/libarchive/liblzo.h +++ b/archival/libarchive/liblzo.h @@ -76,11 +76,13 @@ # define TEST_IP (ip < ip_end) # define NEED_IP(x) \ if ((unsigned)(ip_end - ip) < (unsigned)(x)) goto input_overrun +# define TEST_IV(x) if ((x) > (unsigned)0 - (511)) goto input_overrun # undef TEST_OP /* don't need both of the tests here */ # define TEST_OP 1 # define NEED_OP(x) \ if ((unsigned)(op_end - op) < (unsigned)(x)) goto output_overrun +# define TEST_OV(x) if ((x) > (unsigned)0 - (511)) goto output_overrun #define HAVE_ANY_OP 1 diff --git a/archival/libarchive/lzo1x_d.c b/archival/libarchive/lzo1x_d.c index 9bc1270..40b167e 100644 --- a/archival/libarchive/lzo1x_d.c +++ b/archival/libarchive/lzo1x_d.c @@ -92,6 +92,7 @@ int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len, ip++; NEED_IP(1); } + TEST_IV(t); t += 15 + *ip++; } /* copy literals */ @@ -224,6 +225,7 @@ int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len, ip++; NEED_IP(1); } + TEST_IV(t); t += 31 + *ip++; } #if defined(COPY_DICT) @@ -265,6 +267,7 @@ int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len, ip++; NEED_IP(1); } + TEST_IV(t); t += 7 + *ip++; } #if defined(COPY_DICT) -- 2.1.2 1.1 sys-apps/busybox/files/busybox-1.22.1-nc.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/files/busybox-1.22.1-nc.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/files/busybox-1.22.1-nc.patch?rev=1.1&content-type=text/plain Index: busybox-1.22.1-nc.patch =================================================================== --- busybox-1.22.1/networking/nc_bloaty.c +++ busybox-1.22.1-nc/networking/nc_bloaty.c @@ -175,9 +175,9 @@ enum { OPT_w = (1 << 5), OPT_l = (1 << 6) * ENABLE_NC_SERVER, OPT_k = (1 << 7) * ENABLE_NC_SERVER, - OPT_i = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, - OPT_o = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, - OPT_z = (1 << (9+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, + OPT_i = (1 << (6+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, + OPT_o = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, + OPT_z = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, }; #define o_nflag (option_mask32 & OPT_n)
