Skip to contentSkip to conversation

libjpeg-turbo: patch CVE-2023-2804

PATCH Marko, Peter 1 participant 1 message Jul 23, 2023 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Please ignore this dunfell patch, I'll send a v2.
Peter

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Peter Marko via lists.openembedded.org
Sent: Sunday, July 23, 2023 13:07
To: [email protected]
Cc: Marko, Peter (ADV D EU SK BFS1) <[email protected]>
Subject: [OE-core][dunfell][PATCH] libjpeg-turbo: patch CVE-2023-2804

From: Peter Marko <[email protected]>

Relevant links:
* linked fronm NVD:
* https://github.com/libjpeg-turbo/libjpeg-turbo/issues/668#issuecomment-1492586118
* follow-up analysis:
* https://github.com/libjpeg-turbo/libjpeg-turbo/issues/668#issuecomment-1496473989
* picked commits fix all issues mentioned in this analysis

---
 .../jpeg/files/CVE-2023-2804-1.patch          | 100 ++++++++++++++++++
 .../jpeg/files/CVE-2023-2804-2.patch          |  75 +++++++++++++
 .../jpeg/libjpeg-turbo_2.0.4.bb               |   2 +
 3 files changed, 177 insertions(+)
 create mode 100644 meta/recipes-graphics/jpeg/files/CVE-2023-2804-1.patch
 create mode 100644 meta/recipes-graphics/jpeg/files/CVE-2023-2804-2.patch
meta/recipes-graphics/jpeg/files/CVE-2023-2804-1.patch new file +100 -0
new file mode 100644
index 0000000000..b708392d6c
@@ -0,0 +1,100 @@
+From 9679473547874c472569d54fecce32b463999a9d Mon Sep 17 00:00:00 2001
+From: DRC <[email protected]>
+Date: Tue, 4 Apr 2023 19:06:20 -0500
+Subject: [PATCH] Decomp: Don't enable 2-pass color quant w/ RGB565
+
+The 2-pass color quantization algorithm assumes 3-sample pixels.  
+RGB565 is the only 3-component colorspace that doesn't have 3-sample 
+pixels, so we need to treat it as a special case when determining 
+whether to enable 2-pass color quantization.  Otherwise, attempting to 
+initialize 2-pass color quantization with an RGB565 output buffer could 
+cause
+prescan_quantize() to read from uninitialized memory and subsequently 
+underflow/overflow the histogram array.
+
+djpeg is supposed to fail gracefully if both -rgb565 and -colors are 
+specified, because none of its destination managers (image writers) 
+support color quantization with RGB565.  However, prescan_quantize() 
+was called before that could occur.  It is possible but very unlikely 
+that these issues could have been reproduced in applications other than 
+djpeg.  The issues involve the use of two features (12-bit precision 
+and
+RGB565) that are incompatible, and they also involve the use of two 
+rarely-used legacy features (RGB565 and color quantization) that don't 
+make much sense when combined.
+
+Fixes #668
+Fixes #671
+Fixes #680
+
+CVE: CVE-2023-2804
+Upstream-Status: Backport 
+[https://github.com/libjpeg-turbo/libjpeg-turbo/commit/9679473547874c47
+2569d54fecce32b463999a9d]
+
+Signed-off-by: Peter Marko <[email protected]>
+---
+ ChangeLog.md | 6 ++++++
+ jdmaster.c   | 5 +++--
+ jquant2.c    | 5 +++--
+ 3 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/ChangeLog.md b/ChangeLog.md index e605abe73..de0c4d0dd 
+100644
+--- a/ChangeLog.md
++++ b/ChangeLog.md
+@@ -48,6 +48,12 @@ quality values.
+ input image was not transformed into a progressive JPEG image prior to  
+decompression.
+ 
++9. Fixed an oversight in 1.4 beta1[8] that caused various segfaults 
++and buffer overruns when attempting to decompress various 
++specially-crafted malformed 12-bit-per-component JPEG images using a 
++12-bit-per-component build of djpeg
++(`-DWITH_12BIT=1`) with both color quantization and RGB565 color 
++conversion enabled.
++
+ 
+ 2.0.8 ESR
+ =========
+diff --git a/jdmaster.c b/jdmaster.c
+index b20906438..8d8ef9956 100644
+--- a/jdmaster.c
++++ b/jdmaster.c
+@@ -5,7 +5,7 @@
+  * Copyright (C) 1991-1997, Thomas G. Lane.
+  * Modified 2002-2009 by Guido Vollbeding.
+  * libjpeg-turbo Modifications:
+- * Copyright (C) 2009-2011, 2016, D. R. Commander.
++ * Copyright (C) 2009-2011, 2016, 2023, D. R. Commander.
+  * Copyright (C) 2013, Linaro Limited.
+  * Copyright (C) 2015, Google, Inc.
+  * For conditions of distribution and use, see the accompanying 
+README.ijg @@ -492,7 +492,8 @@ master_selection(j_decompress_ptr cinfo)
+     if (cinfo->raw_data_out)
+       ERREXIT(cinfo, JERR_NOTIMPL);
+     /* 2-pass quantizer only works in 3-component color space. */
+-    if (cinfo->out_color_components != 3) {
++    if (cinfo->out_color_components != 3 ||
++        cinfo->out_color_space == JCS_RGB565) {
+       cinfo->enable_1pass_quant = TRUE;
+       cinfo->enable_external_quant = FALSE;
+       cinfo->enable_2pass_quant = FALSE; diff --git a/jquant2.c 
+b/jquant2.c index 6570613bb..c760380fb 100644
+--- a/jquant2.c
++++ b/jquant2.c
+@@ -4,7 +4,7 @@
+  * This file was part of the Independent JPEG Group's software:
+  * Copyright (C) 1991-1996, Thomas G. Lane.
+  * libjpeg-turbo Modifications:
+- * Copyright (C) 2009, 2014-2015, 2020, D. R. Commander.
++ * Copyright (C) 2009, 2014-2015, 2020, 2023, D. R. Commander.
+  * For conditions of distribution and use, see the accompanying 
+README.ijg
+  * file.
+  *
+@@ -1230,7 +1230,8 @@ jinit_2pass_quantizer(j_decompress_ptr cinfo)
+   cquantize->error_limiter = NULL;
+ 
+   /* Make sure jdmaster didn't give me a case I can't handle */
+-  if (cinfo->out_color_components != 3)

++ if (cinfo->out_color_components != 3 ||
++ cinfo->out_color_space == JCS_RGB565)
+ ERREXIT(cinfo, JERR_NOTIMPL);
+
+ /* Allocate the histogram/inverse colormap storage */

meta/recipes-graphics/jpeg/files/CVE-2023-2804-2.patch new file +75 -0

75 lines not on this page · raw message

++ cinfo->_min_DCT_scaled_size));
+ if (compptr->downsampled_width < 2 && orig_downsampled_width >= 2)
+ reinit_upsampler = TRUE;
+

meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.4.bb +2 -0
index 630b20300f..fda425c219 100644
@@ -16,6 +16,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
            file://CVE-2021-46822.patch \
            file://CVE-2020-35538-1.patch \
            file://CVE-2020-35538-2.patch \
+           file://CVE-2023-2804-1.patch \
+           file://CVE-2023-2804-2.patch \
            "
 
 SRC_URI[md5sum] = "d01d9e0c28c27bc0de9f4e2e8ff49855"

--
2.30.2