[oe-commits] [openembedded-core] 09/19: libpng: Security fix CVE-2015-8472

[git at git.openembedded.org]

rpurdie pushed a commit to branch fido
in repository openembedded-core.

commit bed289a9ac39fb9b613e3075d5a062b24c59c956
Author: Armin Kuster <akuster at mvista.com>
AuthorDate: Fri Feb 5 06:05:08 2016 -0800

    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)
    
    Signed-off-by: Armin Kuster <akuster at mvista.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster at mvista.com>
    Signed-off-by: Joshua Lock <joshua.g.lock at intel.com>
---
 .../libpng/libpng-1.6.16/CVE-2015-8472.patch       | 29 ++++++++++++++++++++++
 meta/recipes-multimedia/libpng/libpng_1.6.16.bb    |  1 +
 2 files changed, 30 insertions(+)

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 @@
+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 at 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.16.bb b/meta/recipes-multimedia/libpng/libpng_1.6.16.bb
index 8b92605..61939ad 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 += "\
             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] = "23b7286b5d4a86de950fd2ffc5cac742"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.