From: Wang Mingyu <[email protected]> CVE-2025-54874.patch removed since it's included in 2.5.4
Signed-off-by: Wang Mingyu <[email protected]> Signed-off-by: Khem Raj <[email protected]> (cherry picked from commit 2cc81690424b6134a05bd6f6fb612501bd3534ca) Signed-off-by: Ankur Tyagi <[email protected]> --- .../openjpeg/openjpeg/CVE-2025-54874.patch | 44 ------------------- .../{openjpeg_2.5.3.bb => openjpeg_2.5.4.bb} | 3 +- 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2025-54874.patch rename meta-oe/recipes-graphics/openjpeg/{openjpeg_2.5.3.bb => openjpeg_2.5.4.bb} (86%) diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2025-54874.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2025-54874.patch deleted file mode 100644 index 187557a35c..0000000000 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2025-54874.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f809b80c67717c152a5ad30bf06774f00da4fd2d Mon Sep 17 00:00:00 2001 -From: Sebastian Rasmussen <[email protected]> -Date: Thu, 16 Jan 2025 02:13:43 +0100 -Subject: [PATCH] opj_jp2_read_header: Check for error after parsing header. - -Consider the case where the caller has not set the p_image -pointer to NULL before calling opj_read_header(). - -If opj_j2k_read_header_procedure() fails while obtaining the rest -of the marker segment when calling opj_stream_read_data() because -the data stream is too short, then opj_j2k_read_header() will -never have the chance to initialize p_image, leaving it -uninitialized. - -opj_jp2_read_header() will check the p_image value whether -opj_j2k_read_header() suceeded or failed. This may be detected as -an error in valgrind or ASAN. - -The fix is to check whether opj_j2k_read_header() suceeded before -using the output argument p_image. - -CVE: CVE-2025-54874 -Upstream-Status: Backport [https://github.com/uclouvain/openjpeg/commit/f809b80c67717c152a5ad30bf06774f00da4fd2d] -Signed-off-by: Hitendra Prajapati <[email protected]> ---- - src/lib/openjp2/jp2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c -index 4df055a5..da506318 100644 ---- a/src/lib/openjp2/jp2.c -+++ b/src/lib/openjp2/jp2.c -@@ -2873,7 +2873,7 @@ OPJ_BOOL opj_jp2_read_header(opj_stream_private_t *p_stream, - p_image, - p_manager); - -- if (p_image && *p_image) { -+ if (ret && p_image && *p_image) { - /* Set Image Color Space */ - if (jp2->enumcs == 16) { - (*p_image)->color_space = OPJ_CLRSPC_SRGB; --- -2.50.1 - diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb similarity index 86% rename from meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb rename to meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb index 586bfeaf1f..945abbcc35 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb @@ -7,9 +7,8 @@ DEPENDS = "libpng tiff lcms zlib" SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ - file://CVE-2025-54874.patch \ " -SRCREV = "210a8a5690d0da66f02d49420d7176a21ef409dc" +SRCREV = "6c4a29b00211eb0430fa0e5e890f1ce5c80f409f" S = "${WORKDIR}/git" inherit cmake
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#121625): https://lists.openembedded.org/g/openembedded-devel/message/121625 Mute This Topic: https://lists.openembedded.org/mt/116270449/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
