summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2016-02-05 14:05:08 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-03 11:11:40 (GMT)
commite1a2fb6e857c0d15c12324be64654ff0a314cc57 (patch)
tree66cff82eeb78c8c3d278b8572b651a0453fac086
parentfbe015523fd9ef214d3c988e727f57196a4b1f27 (diff)
downloadpoky-e1a2fb6e857c0d15c12324be64654ff0a314cc57.tar.gz
libpng: Security fix CVE-2015-8472
libpng: Buffer overflow vulnerabilities in png_get_PLTE/png_set_PLTE functions this patch fixes an incomplete patch in CVE-2015-8126 adjusted dir to match this version. (From OE-Core master rev: f4a805702df691cbd2b80aa5f75d6adfb0f145eb) (From OE-Core rev: bed289a9ac39fb9b613e3075d5a062b24c59c956) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/libpng/libpng-1.6.16/CVE-2015-8472.patch29
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.6.16.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libpng/libpng-1.6.16/CVE-2015-8472.patch b/meta/recipes-multimedia/libpng/libpng-1.6.16/CVE-2015-8472.patch
new file mode 100644
index 0000000..404f012
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng-1.6.16/CVE-2015-8472.patch
@@ -0,0 +1,29 @@
1From 9f2ad4928e47036cf1ac9b8fe45a491f15be2324 Mon Sep 17 00:00:00 2001
2From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
3Date: Wed, 4 Nov 2015 23:47:42 -0600
4Subject: [PATCH] [libpng16] Fixed new bug with CRC error after reading an
5 over-length palette.
6
7Upstream-Status: Backport
8CVE: CVE-2015-8472
9
10https://github.com/glennrp/libpng/commit/9f2ad4928e47036cf1ac9b8fe45a491f15be2324
11Signed-off-by: Armin Kuster <akuster@mvista.com>
12
13---
14 pngrutil.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17Index: libpng-1.6.17/pngrutil.c
18===================================================================
19--- libpng-1.6.17.orig/pngrutil.c
20+++ libpng-1.6.17/pngrutil.c
21@@ -973,7 +973,7 @@ png_handle_PLTE(png_structrp png_ptr, pn
22 if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
23 #endif
24 {
25- png_crc_finish(png_ptr, 0);
26+ png_crc_finish(png_ptr, (int) length - num * 3);
27 }
28
29 #ifndef PNG_READ_OPT_PLTE_SUPPORTED
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.16.bb b/meta/recipes-multimedia/libpng/libpng_1.6.16.bb
index 8b92605..61939ad0 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.16.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.16.bb
@@ -15,6 +15,7 @@ SRC_URI += "\
15 file://CVE-2015-8126_2.patch \ 15 file://CVE-2015-8126_2.patch \
16 file://CVE-2015-8126_3.patch \ 16 file://CVE-2015-8126_3.patch \
17 file://CVE-2015-8126_4.patch \ 17 file://CVE-2015-8126_4.patch \
18 file://CVE-2015-8472.patch \
18 " 19 "
19 20
20SRC_URI[md5sum] = "23b7286b5d4a86de950fd2ffc5cac742" 21SRC_URI[md5sum] = "23b7286b5d4a86de950fd2ffc5cac742"