package/jasper: Apply fix for CVE-2018-19541
PATCH 1/3 package/jasper: Apply fix for CVE-2018-19541
Add 0001-verify-data-range-CVE-2018-19541.patch:
We need to verify the data is in the expected range. Otherwise we get problems later.
Patch was proposed upstream[1] but upstream is very inactive. Linux distributions use the same fix to patch their packages.
1: https://github.com/mdadams/jasper/pull/211
--- .../0001-verify-data-range-CVE-2018-19541.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/jasper/0001-verify-data-range-CVE-2018-19541.patch
package/jasper/0001-verify-data-range-CVE-2018-19541.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 24fc4d6f01d2d4c8297d1bebec02360f796e01c2 Mon Sep 17 00:00:00 2001 +From: Michael Vetter <[email protected]> +Date: Mon, 4 Nov 2019 18:17:44 +0100 +Subject: [PATCH] Verify range data in jp2_pclr_getdata + +This fixes CVE-2018-19541. +We need to verify the data is in the expected range. Otherwise we get +problems later. + +This is a better fix for https://github.com/mdadams/jasper/pull/199 +which caused segfaults under certain circumstances. + +Patch by Adam Majer <[email protected]> +Signed-off-by: Michael Vetter <[email protected]> +--- + src/libjasper/jp2/jp2_cod.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/libjasper/jp2/jp2_cod.c b/src/libjasper/jp2/jp2_cod.c +index 890e6ad..0f8d804 100644 +--- a/src/libjasper/jp2/jp2_cod.c ++++ b/src/libjasper/jp2/jp2_cod.c +@@ -855,6 +855,12 @@ static int jp2_pclr_getdata(jp2_box_t *box, jas_stream_t *in) + jp2_getuint8(in, &pclr->numchans)) { + return -1; + } ++ ++ // verify in range data as per I.5.3.4 - Palette box ++ if (pclr->numchans < 1 || pclr->numlutents < 1 || pclr->numlutents > 1024) { ++ return -1; ++ } ++ + lutsize = pclr->numlutents * pclr->numchans; + if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) { + return -1;
Signature · 1 line
2.16.4
PATCH 2/3 package/jasper: Apply fix for CVE-2018-19542
Add 0002-check-null-in-jp2_decode.patch:
Patch was proposed upstream[1] but upstream is very inactive. Linux distributions use the same fix to patch their packages.
1: https://github.com/mdadams/jasper/pull/200
--- ...2-check-null-in-jp2_decode-CVE-2018-19542.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 package/jasper/0002-check-null-in-jp2_decode-CVE-2018-19542.patch
package/jasper/0002-check-null-in-jp2_decode-CVE-2018-19542.patch new file +24 -0
@@ -0,0 +1,24 @@ +From fc62d1b7164ded2405fd6a0604548b34a5a77462 Mon Sep 17 00:00:00 2001 +From: Timothy Lyanguzov <[email protected]> +Date: Mon, 18 Mar 2019 16:46:24 +1300 +Subject: [PATCH] Fix CVE-2018-19542: Check for NULL pointer in jp2_decode + +Signed-off-by: Michael Vetter <[email protected]> +--- + src/libjasper/jp2/jp2_dec.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/libjasper/jp2/jp2_dec.c b/src/libjasper/jp2/jp2_dec.c +index 03b0eaf..a535c19 100644 +--- a/src/libjasper/jp2/jp2_dec.c ++++ b/src/libjasper/jp2/jp2_dec.c +@@ -388,6 +388,9 @@ jas_image_t *jp2_decode(jas_stream_t *in, const char *optstr) + jas_image_setcmpttype(dec->image, newcmptno, jp2_getct(jas_image_clrspc(dec->image), 0, channo + 1)); + } + #endif ++ } else { ++ jas_eprintf("error: invalid MTYP in CMAP box\n"); ++ goto error; + } + } + }
Signature · 1 line
2.16.4
PATCH 2/3 package/jasper: Apply fix for CVE-2018-19542
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Vetter <[email protected]> writes:
Add 0002-check-null-in-jp2_decode.patch:
Patch was proposed upstream[1] but upstream is very inactive. Linux distributions use the same fix to patch their packages.1: https://github.com/mdadams/jasper/pull/200
Signed-off-by Michael Vetter <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/3 package/jasper: Apply fix for CVE-2018-19542
In reply to Michael VetterQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Vetter <[email protected]> writes:
Add 0002-check-null-in-jp2_decode.patch:
Patch was proposed upstream[1] but upstream is very inactive. Linux distributions use the same fix to patch their packages.1: https://github.com/mdadams/jasper/pull/200
Signed-off-by Michael Vetter <[email protected]>
Committed to 2019.02.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/3 package/jasper: Apply fix for CVE-2018-19540
In reply to Michael VetterAdd 0003-test-asclen-CVE-2018-19540.patch:
If txtdesc->asclen is < 1, the array index of txtdesc->ascdata will be negative which causes the heap based overflow.
Patch was proposed upstream[1] but upstream is very inactive. Linux distributions use the same fix to patch their packages.
1: https://github.com/mdadams/jasper/pull/198
--- .../jasper/0003-test-asclen-CVE-2018-19540.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/jasper/0003-test-asclen-CVE-2018-19540.patch
package/jasper/0003-test-asclen-CVE-2018-19540.patch new file +29 -0
@@ -0,0 +1,29 @@ +From e38454aa1a15b78c028a778fc8bfba3587e25c25 Mon Sep 17 00:00:00 2001 +From: Michael Vetter <[email protected]> +Date: Fri, 15 Mar 2019 11:01:02 +0100 +Subject: [PATCH] Make sure asclen is at least 1 + +If txtdesc->asclen is < 1, the array index of txtdesc->ascdata will be negative which causes the heap based overflow. + +Regards CVE-2018-19540. +Regards https://github.com/mdadams/jasper/issues/182 bug#3 +Fix by Markus Koschany <[email protected]>. +From https://gist.github.com/apoleon/13598a45bf6522f6a79b77a629205823 +Signed-off-by: Michael Vetter <[email protected]> +--- + src/libjasper/base/jas_icc.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libjasper/base/jas_icc.c b/src/libjasper/base/jas_icc.c +index 4607930..762c0e8 100644 +--- a/src/libjasper/base/jas_icc.c ++++ b/src/libjasper/base/jas_icc.c +@@ -1104,6 +1104,8 @@ static int jas_icctxtdesc_input(jas_iccattrval_t *attrval, jas_stream_t *in, + if (jas_stream_read(in, txtdesc->ascdata, txtdesc->asclen) != + JAS_CAST(int, txtdesc->asclen)) + goto error; ++ if (txtdesc->asclen < 1) ++ goto error; + txtdesc->ascdata[txtdesc->asclen - 1] = '\0'; + if (jas_iccgetuint32(in, &txtdesc->uclangcode) || + jas_iccgetuint32(in, &txtdesc->uclen))
Signature · 1 line
2.16.4
PATCH 3/3 package/jasper: Apply fix for CVE-2018-19540
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Vetter <[email protected]> writes:
Add 0003-test-asclen-CVE-2018-19540.patch:
Iftxtdesc->asclenis < 1, the array index of
txtdesc-> ascdata will be negative which causes the heap based overflow.Patch was proposed upstream[1] but upstream is very inactive. Linux distributions use the same fix to patch their packages.
1: https://github.com/mdadams/jasper/pull/198
Signed-off-by Michael Vetter <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/3 package/jasper: Apply fix for CVE-2018-19540
In reply to Michael VetterQuoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Vetter <[email protected]> writes:
Add 0003-test-asclen-CVE-2018-19540.patch:
Iftxtdesc->asclenis < 1, the array index of
txtdesc-> ascdata will be negative which causes the heap based overflow.Patch was proposed upstream[1] but upstream is very inactive. Linux distributions use the same fix to patch their packages.
1: https://github.com/mdadams/jasper/pull/198
Signed-off-by Michael Vetter <[email protected]>
Committed to 2019.02.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/3 package/jasper: Apply fix for CVE-2018-19541
In reply to Michael VetterQuoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Vetter <[email protected]> writes:
Add 0001-verify-data-range-CVE-2018-19541.patch:
We need to verify the data is in the expected range. Otherwise we get problems later.Patch was proposed upstream[1] but upstream is very inactive. Linux distributions use the same fix to patch their packages.
1: https://github.com/mdadams/jasper/pull/211
Signed-off-by Michael Vetter <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/3 package/jasper: Apply fix for CVE-2018-19541
In reply to Michael VetterQuoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Vetter <[email protected]> writes:
Add 0001-verify-data-range-CVE-2018-19541.patch:
We need to verify the data is in the expected range. Otherwise we get problems later.Patch was proposed upstream[1] but upstream is very inactive. Linux distributions use the same fix to patch their packages.
1: https://github.com/mdadams/jasper/pull/211
Signed-off-by Michael Vetter <[email protected]>
Committed to 2019.02.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/3 package/jasper: Apply fix for CVE-2018-19541
In reply to Michael VetterQuoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Vetter <[email protected]> writes:
Add 0001-verify-data-range-CVE-2018-19541.patch:
We need to verify the data is in the expected range. Otherwise we get problems later.Patch was proposed upstream[1] but upstream is very inactive. Linux distributions use the same fix to patch their packages.
1: https://github.com/mdadams/jasper/pull/211
Signed-off-by Michael Vetter <[email protected]>
Committed all 3 to 2019.11.x as well, thanks.
Signature · 1 line
Bye, Peter Korsgaard