From bc82af0a6a8e7e9422f452a7106caa257af0b6b6 Mon Sep 17 00:00:00 2001
From: Sona Sarmadi <sona.sarmadi@enea.com>
Date: Tue, 15 Mar 2016 07:17:14 +0100
Subject: 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>
---
 .../libpng/libpng-1.6.13/CVE-2015-8472.patch       | 29 ++++++++++++++++++++++
 meta/recipes-multimedia/libpng/libpng_1.6.13.bb    |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta/recipes-multimedia/libpng/libpng-1.6.13/CVE-2015-8472.patch

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 0000000000..48430b841d
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng-1.6.13/CVE-2015-8472.patch
@@ -0,0 +1,29 @@
+From 9f2ad4928e47036cf1ac9b8fe45a491f15be2324 Mon Sep 17 00:00:00 2001
+From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
+Date: Wed, 4 Nov 2015 23:47:42 -0600
+Subject: [PATCH] [libpng16] Fixed new bug with CRC error after reading an
+ over-length palette.
+
+Upstream-Status: Backport
+CVE: CVE-2015-8472
+
+https://github.com/glennrp/libpng/commit/9f2ad4928e47036cf1ac9b8fe45a491f15be2324
+Signed-off-by: Armin Kuster <akuster@mvista.com>
+
+---
+ pngrutil.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libpng-1.6.17/pngrutil.c
+===================================================================
+--- libpng-1.6.17.orig/pngrutil.c
++++ libpng-1.6.17/pngrutil.c
+@@ -973,7 +973,7 @@ png_handle_PLTE(png_structrp png_ptr, pn
+    if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ #endif
+    {
+-      png_crc_finish(png_ptr, 0);
++      png_crc_finish(png_ptr, (int) length - num * 3);
+    }
+ 
+ #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 80dcc0a63f..b197a89677 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 += "\
             file://CVE-2015-8126_2.patch \
             file://CVE-2015-8126_3.patch \
             file://CVE-2015-8126_4.patch \
+            file://CVE-2015-8472.patch \
             "
 
 SRC_URI[md5sum] = "9822c25466f060142359f80ed142c9e5"
-- 
cgit v1.2.3-54-g00ecf