mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-10-21 20:19:33 +00:00
Rohini Sangam
e22d8fc3e1
Pick patch from [1] also mentioned at NVD report in [2] [1] https://github.com/python-pillow/Pillow/commit/13ada41172142f2fd9f0906f615a00ea623a11ca [2] https://nvd.nist.gov/vuln/detail/cve-2026-59204 Signed-off-by: Rohini Sangam <rsangam@mvista.com> Signed-off-by: Anuj Mittal <anuj.mittal@oss.qualcomm.com>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 13ada41172142f2fd9f0906f615a00ea623a11ca Mon Sep 17 00:00:00 2001
|
|
From: Andrew Murray <3112309+radarhere@users.noreply.github.com>
|
|
Date: Mon, 22 Jun 2026 10:34:18 +1000
|
|
Subject: [PATCH] Calculate JPEG2000 total_component_width for each tile in
|
|
isolation (#9704)
|
|
|
|
CVE: CVE-2026-59204
|
|
Upstream-Status: Backport [https://github.com/python-pillow/Pillow/commit/13ada41172142f2fd9f0906f615a00ea623a11ca]
|
|
|
|
Signed-off-by: Rohini Sangam <rsangam@mvista.com>
|
|
---
|
|
src/libImaging/Jpeg2KDecode.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/libImaging/Jpeg2KDecode.c b/src/libImaging/Jpeg2KDecode.c
|
|
index 13f363422..9faacaca8 100644
|
|
--- a/src/libImaging/Jpeg2KDecode.c
|
|
+++ b/src/libImaging/Jpeg2KDecode.c
|
|
@@ -657,7 +657,6 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
|
|
size_t buffer_size = 0, tile_bytes = 0;
|
|
unsigned n, tile_height, tile_width;
|
|
int subsampling;
|
|
- int total_component_width = 0;
|
|
|
|
stream = opj_stream_create(BUFFER_SIZE, OPJ_TRUE);
|
|
|
|
@@ -863,6 +862,7 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
|
|
a, and then a malicious file could have a smaller tile_bytes
|
|
*/
|
|
|
|
+ int total_component_width = 0;
|
|
for (n=0; n < tile_info.nb_comps; n++) {
|
|
// see csize /acsize calcs
|
|
int csize = (image->comps[n].prec + 7) >> 3;
|
|
--
|
|
2.44.4
|
|
|