summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Sarmadi <sona.sarmadi@enea.com>2016-03-15 06:17:14 (GMT)
committerPaul Vaduva <Paul.Vaduva@enea.com>2016-03-17 12:28:08 (GMT)
commitbc82af0a6a8e7e9422f452a7106caa257af0b6b6 (patch)
tree045ac0af90720af5d30ee741d1893d12ff8c639e
parente556bbcee03a7ffab00b3748f3370be7f915c772 (diff)
downloadpoky-bc82af0a6a8e7e9422f452a7106caa257af0b6b6.tar.gz
libpng: CVE-2015-8472
Fixes buffer overflow vulnerabilities in png_get_PLTE/png_set_PLTE functions This patch fixes an incomplete patch in CVE-2015-8126 Reference: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-8472 Upstream patch: https://github.com/glennrp/libpng/commit/9f2ad4928e47036cf1ac9b8fe45a491f15be2324 Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
-rw-r--r--meta/recipes-multimedia/libpng/libpng-1.6.13/CVE-2015-8472.patch29
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.6.13.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libpng/libpng-1.6.13/CVE-2015-8472.patch b/meta/recipes-multimedia/libpng/libpng-1.6.13/CVE-2015-8472.patch
new file mode 100644
index 0000000..48430b8
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng-1.6.13/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.13.bb b/meta/recipes-multimedia/libpng/libpng_1.6.13.bb
index 80dcc0a..b197a89 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.13.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.13.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] = "9822c25466f060142359f80ed142c9e5" 21SRC_URI[md5sum] = "9822c25466f060142359f80ed142c9e5"