Commit b6e4e9de authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

jasper: add patches to fix CVE-2014-8137 and CVE-2014-8138 



Fixes:
CVE-2014-8137 - double-free in jas_iccattrval_destroy()
CVE-2014-8138 - heap overflow in jp2_decode()

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 59b3b3ed

package/jasper/0002-fix-CVE-2014-8138.patch

0 → 100644
+18 −0
Original line number Diff line number Diff line 
See https://bugzilla.redhat.com/show_bug.cgi?id=1173162



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c	2014-12-11 14:06:44.000000000 +0100

+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c	2014-12-11 14:06:26.000000000 +0100

@@ -386,6 +386,11 @@ jas_image_t *jp2_decode(jas_stream_t *in

 	/* Determine the type of each component. */

 	if (dec->cdef) {

 		for (i = 0; i < dec->numchans; ++i) {

+			/* Is the channel number reasonable? */

+			if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) {

+				jas_eprintf("error: invalid channel number in CDEF box\n");

+				goto error;

+			}

 			jas_image_setcmpttype(dec->image,

 			  dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo],

 			  jp2_getct(jas_image_clrspc(dec->image),

package/jasper/0003-fix-CVE-2014-8137-1.patch

0 → 100644
+47 −0
Original line number Diff line number Diff line 
See https://bugzilla.redhat.com/show_bug.cgi?id=1173157



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c	2014-12-11 14:06:44.000000000 +0100

+++ jasper-1.900.1/src/libjasper/base/jas_icc.c	2014-12-11 15:16:37.971272386 +0100

@@ -1009,7 +1009,6 @@ static int jas_icccurv_input(jas_iccattr

 	return 0;

 

 error:

-	jas_icccurv_destroy(attrval);

 	return -1;

 }

 

@@ -1127,7 +1126,6 @@ static int jas_icctxtdesc_input(jas_icca

 #endif

 	return 0;

 error:

-	jas_icctxtdesc_destroy(attrval);

 	return -1;

 }

 

@@ -1206,8 +1204,6 @@ static int jas_icctxt_input(jas_iccattrv

 		goto error;

 	return 0;

 error:

-	if (txt->string)

-		jas_free(txt->string);

 	return -1;

 }

 

@@ -1328,7 +1324,6 @@ static int jas_icclut8_input(jas_iccattr

 		goto error;

 	return 0;

 error:

-	jas_icclut8_destroy(attrval);

 	return -1;

 }

 

@@ -1497,7 +1492,6 @@ static int jas_icclut16_input(jas_iccatt

 		goto error;

 	return 0;

 error:

-	jas_icclut16_destroy(attrval);

 	return -1;

 }

package/jasper/0004-fix-CVE-2014-8137-2.patch

0 → 100644
+18 −0
Original line number Diff line number Diff line 
See https://bugzilla.redhat.com/show_bug.cgi?id=1173157



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c	2014-12-11 14:30:54.193209780 +0100

+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c	2014-12-11 14:36:46.313217814 +0100

@@ -291,7 +291,10 @@ jas_image_t *jp2_decode(jas_stream_t *in

 	case JP2_COLR_ICC:

 		iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp,

 		  dec->colr->data.colr.iccplen);

-		assert(iccprof);

+		if (!iccprof) {

+			jas_eprintf("error: failed to parse ICC profile\n");

+			goto error;

+		}

 		jas_iccprof_gethdr(iccprof, &icchdr);

 		jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc);

 		jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc));