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>
This commit is contained in:
Armin Kuster 2016-02-05 06:05:08 -08:00 committed by Richard Purdie
parent fbe015523f
commit e1a2fb6e85
2 changed files with 30 additions and 0 deletions

View File

@ -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

View File

@ -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"