vanhofen
6 years ago
8 changed files with 489 additions and 3 deletions
@ -0,0 +1,40 @@ |
|||
--- a/Makefile-libbz2_so
|
|||
+++ b/Makefile-libbz2_so
|
|||
@@ -22,9 +22,8 @@
|
|||
|
|||
|
|||
SHELL=/bin/sh |
|||
-CC=gcc
|
|||
BIGFILES=-D_FILE_OFFSET_BITS=64 |
|||
-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
|
|||
+CFLAGS=-fpic -fPIC -Wall -pipe -Os -g0 $(BIGFILES)
|
|||
|
|||
OBJS= blocksort.o \ |
|||
huffman.o \ |
|||
@@ -35,7 +35,7 @@
|
|||
bzlib.o |
|||
|
|||
all: $(OBJS) |
|||
- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
|
|||
+ $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
|
|||
$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 |
|||
rm -f libbz2.so.1.0 |
|||
ln -s libbz2.so.1.0.6 libbz2.so.1.0 |
|||
@@ -57,3 +56,17 @@
|
|||
$(CC) $(CFLAGS) -c decompress.c |
|||
bzlib.o: bzlib.c |
|||
$(CC) $(CFLAGS) -c bzlib.c |
|||
+
|
|||
+install:
|
|||
+ if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
|
|||
+ cp -f bzip2-shared $(PREFIX)/bin/bzip2
|
|||
+ chmod a+x $(PREFIX)/bin/bzip2
|
|||
+ if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
|
|||
+ cp -f bzlib.h $(PREFIX)/include
|
|||
+ chmod a+r $(PREFIX)/include/bzlib.h
|
|||
+ if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
|
|||
+ cp -f libbz2.so.1.0.6 $(PREFIX)/lib
|
|||
+ chmod a+r $(PREFIX)/lib/libbz2.so.1.0.6
|
|||
+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0
|
|||
+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1
|
|||
+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so
|
|||
@ -0,0 +1,22 @@ |
|||
Cairo: Fix Denial-of-Service Attack due to Logical Problem in Program |
|||
|
|||
https://bugs.freedesktop.org/show_bug.cgi?id=100763 |
|||
|
|||
CVE: CVE-2017-7475 |
|||
Upstream-Status: Submitted |
|||
|
|||
Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> |
|||
|
|||
Index: cairo-1.15.4/src/cairo-ft-font.c
|
|||
===================================================================
|
|||
--- cairo-1.15.4.orig/src/cairo-ft-font.c
|
|||
+++ cairo-1.15.4/src/cairo-ft-font.c
|
|||
@@ -1149,7 +1149,7 @@ _get_bitmap_surface (FT_Bitmap *bi
|
|||
width = bitmap->width; |
|||
height = bitmap->rows; |
|||
|
|||
- if (width == 0 || height == 0) {
|
|||
+ if (width == 0 || height == 0 || bitmap->buffer == NULL) {
|
|||
*surface = (cairo_image_surface_t *) |
|||
cairo_image_surface_create_for_data (NULL, format, 0, 0, 0); |
|||
return (*surface)->base.status; |
|||
@ -0,0 +1,12 @@ |
|||
--- a/Makefile.am
|
|||
+++ b/Makefile.am
|
|||
@@ -4,7 +4,7 @@
|
|||
|
|||
ACLOCAL_AMFLAGS = -I m4 |
|||
|
|||
-SUBDIRS = src util test docs
|
|||
+SUBDIRS = src util test
|
|||
|
|||
EXTRA_DIST = \ |
|||
autogen.sh \ |
|||
|
|||
@ -0,0 +1,39 @@ |
|||
--- a/jdhuff.c
|
|||
+++ b/jdhuff.c
|
|||
@@ -820,3 +820,35 @@
|
|||
entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL; |
|||
} |
|||
} |
|||
+/*
|
|||
+ * BEWARE OF KLUDGE: This subroutine is a hack for decoding illegal JPEG-in-
|
|||
+ * TIFF encapsulations produced by Microsoft's Wang Imaging
|
|||
+ * for Windows application with the public-domain TIFF Library. Based upon an
|
|||
+ * examination of selected output files, this program apparently divides a JPEG
|
|||
+ * bit-stream into consecutive horizontal TIFF "strips", such that the JPEG
|
|||
+ * encoder's/decoder's DC coefficients for each image component are reset before
|
|||
+ * each "strip". Moreover, a "strip" is not necessarily encoded in a multiple
|
|||
+ * of 8 bits, so one must sometimes discard 1-7 bits at the end of each "strip"
|
|||
+ * for alignment to the next input-Byte storage boundary. IJG JPEG Library
|
|||
+ * decoder state is not normally exposed to client applications, so this sub-
|
|||
+ * routine provides the TIFF Library with a "hook" to make these corrections.
|
|||
+ * It should be called after "jpeg_start_decompress()" and before
|
|||
+ * "jpeg_finish_decompress()", just before decoding each "strip" using
|
|||
+ * "jpeg_read_raw_data()" or "jpeg_read_scanlines()".
|
|||
+ *
|
|||
+ * This kludge is not sanctioned or supported by the Independent JPEG Group, and
|
|||
+ * future changes to the IJG JPEG Library might invalidate it. Do not send bug
|
|||
+ * reports about this code to IJG developers. Instead, contact the author for
|
|||
+ * advice: Scott B. Marovich <marovich@hpl.hp.com>, Hewlett-Packard Labs, 6/01.
|
|||
+ */
|
|||
+GLOBAL(void)
|
|||
+jpeg_reset_huff_decode (register j_decompress_ptr cinfo,register float *refbw)
|
|||
+{ register huff_entropy_ptr entropy = (huff_entropy_ptr)cinfo->entropy;
|
|||
+ register int ci = 0;
|
|||
+
|
|||
+ /* Re-initialize DC predictions */
|
|||
+ do entropy->saved.last_dc_val[ci] = -refbw[ci << 1];
|
|||
+ while (++ci < cinfo->comps_in_scan);
|
|||
+ /* Discard encoded input bits, up to the next Byte boundary */
|
|||
+ entropy->bitstate.bits_left &= ~7;
|
|||
+}
|
|||
|
|||
@ -0,0 +1,144 @@ |
|||
From a0f53e1dbb3851bb0f0efcfdbd565b05e4be9cac Mon Sep 17 00:00:00 2001 |
|||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
|||
Date: Thu, 23 Aug 2012 18:10:57 +0200 |
|||
Subject: [PATCH 1/2] ARM: qemu related workarounds in cpu features detection |
|||
code |
|||
MIME-Version: 1.0 |
|||
Content-Type: text/plain; charset=UTF-8 |
|||
Content-Transfer-Encoding: 8bit |
|||
|
|||
This was ported from meta-oe's patch [1]. The original pixman patch is found |
|||
at [2]. |
|||
|
|||
[1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch |
|||
[2] http://lists.freedesktop.org/archives/pixman/2011-January/000906.html |
|||
|
|||
Upstream-Status: Inappropriate [other] qemu fix |
|||
|
|||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> |
|||
---
|
|||
pixman/pixman-arm.c | 82 ++++++++++++++++++++++++++++++++++++++++---------- |
|||
1 files changed, 65 insertions(+), 17 deletions(-) |
|||
|
|||
diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c
|
|||
index 23374e4..d98bda6 100644
|
|||
--- a/pixman/pixman-arm.c
|
|||
+++ b/pixman/pixman-arm.c
|
|||
@@ -129,16 +129,35 @@ detect_cpu_features (void)
|
|||
#include <sys/types.h> |
|||
#include <sys/stat.h> |
|||
#include <sys/mman.h> |
|||
+#include <sys/utsname.h>
|
|||
#include <fcntl.h> |
|||
#include <string.h> |
|||
#include <elf.h> |
|||
|
|||
+/*
|
|||
+ * The whole CPU capabilities detection is a bit ugly: when running in
|
|||
+ * userspace qemu, we see /proc/self/auxv from the host system. To make
|
|||
+ * everything even worse, the size of each value is 64-bit when running
|
|||
+ * on a 64-bit host system. So the data is totally bogus because we expect
|
|||
+ * 32-bit values. As AT_PLATFORM value is used as a pointer, it may cause
|
|||
+ * segfault (null pointer dereference on x86-64 host). So in order to be
|
|||
+ * on a safe side, we require that AT_PLATFORM value is found only once,
|
|||
+ * and it has non-zero value (this is still not totally reliable for a big
|
|||
+ * endian 64-bit host system running qemu and may theoretically fail).
|
|||
+ */
|
|||
+#define ARM_HWCAP_VFP 64
|
|||
+#define ARM_HWCAP_IWMMXT 512
|
|||
+#define ARM_HWCAP_NEON 4096
|
|||
+
|
|||
static arm_cpu_features_t |
|||
detect_cpu_features (void) |
|||
{ |
|||
arm_cpu_features_t features = 0; |
|||
Elf32_auxv_t aux; |
|||
int fd; |
|||
+ uint32_t hwcap = 0;
|
|||
+ const char *plat = NULL;
|
|||
+ int plat_cnt = 0;
|
|||
|
|||
fd = open ("/proc/self/auxv", O_RDONLY); |
|||
if (fd >= 0) |
|||
@@ -147,32 +166,61 @@ detect_cpu_features (void)
|
|||
{ |
|||
if (aux.a_type == AT_HWCAP) |
|||
{ |
|||
- uint32_t hwcap = aux.a_un.a_val;
|
|||
-
|
|||
- /* hardcode these values to avoid depending on specific
|
|||
- * versions of the hwcap header, e.g. HWCAP_NEON
|
|||
- */
|
|||
- if ((hwcap & 64) != 0)
|
|||
- features |= ARM_VFP;
|
|||
- if ((hwcap & 512) != 0)
|
|||
- features |= ARM_IWMMXT;
|
|||
- /* this flag is only present on kernel 2.6.29 */
|
|||
- if ((hwcap & 4096) != 0)
|
|||
- features |= ARM_NEON;
|
|||
+ hwcap = aux.a_un.a_val;
|
|||
} |
|||
else if (aux.a_type == AT_PLATFORM) |
|||
{ |
|||
- const char *plat = (const char*) aux.a_un.a_val;
|
|||
-
|
|||
- if (strncmp (plat, "v7l", 3) == 0)
|
|||
+ plat = (const char*) aux.a_un.a_val;
|
|||
+ plat_cnt++;
|
|||
+ }
|
|||
+ }
|
|||
+ close (fd);
|
|||
+ if (plat == NULL || plat_cnt != 1 || *plat != 'v')
|
|||
+ {
|
|||
+ /*
|
|||
+ * Something seems to be really wrong, most likely we are
|
|||
+ * running under qemu. Let's use machine type from "uname" for
|
|||
+ * CPU capabilities detection:
|
|||
+ * http://www.mail-archive.com/qemu-devel at nongnu.org/msg22212.html
|
|||
+ */
|
|||
+ struct utsname u;
|
|||
+ hwcap = 0; /* clear hwcap, because it is bogus */
|
|||
+ if (uname (&u) == 0)
|
|||
+ {
|
|||
+ if (strcmp (u.machine, "armv7l") == 0)
|
|||
+ {
|
|||
features |= (ARM_V7 | ARM_V6); |
|||
- else if (strncmp (plat, "v6l", 3) == 0)
|
|||
+ hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */
|
|||
+ hwcap |= ARM_HWCAP_NEON; /* qemu is supposed to emulate neon */
|
|||
+ }
|
|||
+ else if (strcmp (u.machine, "armv6l") == 0)
|
|||
+ {
|
|||
features |= ARM_V6; |
|||
+ hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */
|
|||
+ }
|
|||
} |
|||
} |
|||
- close (fd);
|
|||
+ else if (strncmp (plat, "v7l", 3) == 0)
|
|||
+ {
|
|||
+ features |= (ARM_V7 | ARM_V6);
|
|||
+ }
|
|||
+ else if (strncmp (plat, "v6l", 3) == 0)
|
|||
+ {
|
|||
+ features |= ARM_V6;
|
|||
+ }
|
|||
} |
|||
|
|||
+ /* hardcode these values to avoid depending on specific
|
|||
+ * versions of the hwcap header, e.g. HWCAP_NEON
|
|||
+ */
|
|||
+ if ((hwcap & ARM_HWCAP_VFP) != 0)
|
|||
+ features |= ARM_VFP;
|
|||
+ if ((hwcap & ARM_HWCAP_IWMMXT) != 0)
|
|||
+ features |= ARM_IWMMXT;
|
|||
+ /* this flag is only present on kernel 2.6.29 */
|
|||
+ if ((hwcap & ARM_HWCAP_NEON) != 0)
|
|||
+ features |= ARM_NEON;
|
|||
+
|
|||
return features; |
|||
} |
|||
|
|||
--
|
|||
1.7.6.5 |
|||
|
|||
@ -0,0 +1,33 @@ |
|||
From 0ccd906b904d21536d5ab41c6196760e3e5d72cb Mon Sep 17 00:00:00 2001 |
|||
From: Khem Raj <raj.khem@gmail.com> |
|||
Date: Tue, 17 May 2016 17:30:00 -0700 |
|||
Subject: [PATCH] test/utils: Check for FE_INVALID definition before use |
|||
|
|||
Some architectures e.g. nios2 do not support all exceptions |
|||
|
|||
Signed-off-by: Khem Raj <raj.khem@gmail.com> |
|||
---
|
|||
Upstream-Status: Submitted |
|||
|
|||
test/utils.c | 2 ++ |
|||
1 file changed, 2 insertions(+) |
|||
|
|||
diff --git a/test/utils.c b/test/utils.c
|
|||
index f8e42a5..fe32b1e 100644
|
|||
--- a/test/utils.c
|
|||
+++ b/test/utils.c
|
|||
@@ -978,9 +978,11 @@ enable_invalid_exceptions (void)
|
|||
{ |
|||
#ifdef HAVE_FENV_H |
|||
#ifdef HAVE_FEENABLEEXCEPT |
|||
+#ifdef FE_INVALID
|
|||
feenableexcept (FE_INVALID); |
|||
#endif |
|||
#endif |
|||
+#endif
|
|||
} |
|||
|
|||
void * |
|||
--
|
|||
2.8.2 |
|||
|
|||
@ -0,0 +1,29 @@ |
|||
Fixes errors like |
|||
|
|||
Assembler messages: |
|||
Fatal error: can't create .libs/pixman-mips-dspr2-asm.o: No such file or directory |
|||
|
|||
it works with glibc because it uses gcc fixed-headers but thats not right. |
|||
|
|||
We move the include under C block |
|||
|
|||
Signed-off-by: Khem Raj <raj.khem@gmail.com> |
|||
Upstream-Status: Pending |
|||
Index: pixman-0.32.6/pixman/pixman-private.h
|
|||
===================================================================
|
|||
--- pixman-0.32.6.orig/pixman/pixman-private.h
|
|||
+++ pixman-0.32.6/pixman/pixman-private.h
|
|||
@@ -1,4 +1,3 @@
|
|||
-#include <float.h>
|
|||
|
|||
#ifndef PIXMAN_PRIVATE_H |
|||
#define PIXMAN_PRIVATE_H |
|||
@@ -17,6 +16,8 @@
|
|||
|
|||
#ifndef __ASSEMBLER__ |
|||
|
|||
+#include <float.h>
|
|||
+
|
|||
#ifndef PACKAGE |
|||
# error config.h must be included before pixman-private.h |
|||
#endif |
|||
Loading…
Reference in new issue