mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-13 17:39:57 +00:00
Code Issues Projects Releases Wiki Activity

ImageMagick: Fix CVE-2025-55154

Browse Source 
Backport the fix for CVE-2025-55154

Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/db986e4782e9f6cc42a0e50151dc4fe43641b337]

Add below patch to fix
0009-ImageMagick-Fix-CVE-2025-55154.patch

Signed-off-by: Divyanshu Rathore <Divyanshu.Rathore@bmwtechworks.in>
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
Divyanshu Rathore
2025-12-12 20:29:45 +05:30
committed by Gyorgy Sarvari
parent 4f4cf3248e
commit a137e10750
2 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/imagemagick/files/0009-ImageMagick-Fix-CVE-2025-55154.patch
+84
View File
@@ -0,0 +1,84 @@
From f7f5f0f11631dcbd50c0b9a14e7fd4d794eff744 Mon Sep 17 00:00:00 2001
From: Divyanshu Rathore <Divyanshu.Rathore@bmwtechworks.in>
Date: Tue, 28 Oct 2025 14:12:27 +0530
Subject: [PATCH 09/18] ImageMagick: Fix CVE-2025-55154
CVE: CVE-2025-55154
Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/db986e4782e9f6cc42a0e50151dc4fe43641b337]
Comment: Refreshed hunk to match latest kirkstone
Signed-off-by: Divyanshu Rathore <Divyanshu.Rathore@bmwtechworks.in>
---
coders/png.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/coders/png.c b/coders/png.c
index 343934ce8..e730edb03 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -6841,19 +6841,19 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
mng_info->magn_methy = 1;
if (mng_info->magn_methx == 1)
{
- magnified_width=mng_info->magn_ml;
+ magnified_width=(size_t) mng_info->magn_ml;
if (image->columns > 1)
magnified_width += mng_info->magn_mr;
if (image->columns > 2)
- magnified_width += (png_uint_32)
+ magnified_width += (size_t)
((image->columns-2)*(mng_info->magn_mx));
}
else
{
- magnified_width=(png_uint_32) image->columns;
+ magnified_width=(size_t) image->columns;
if (image->columns > 1)
magnified_width += mng_info->magn_ml-1;
@@ -6862,25 +6862,25 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
magnified_width += mng_info->magn_mr-1;
if (image->columns > 3)
- magnified_width += (png_uint_32)
+ magnified_width += (size_t)
((image->columns-3)*(mng_info->magn_mx-1));
}
if (mng_info->magn_methy == 1)
{
- magnified_height=mng_info->magn_mt;
+ magnified_height=(size_t) mng_info->magn_mt;
if (image->rows > 1)
magnified_height += mng_info->magn_mb;
if (image->rows > 2)
- magnified_height += (png_uint_32)
+ magnified_height += (size_t)
((image->rows-2)*(mng_info->magn_my));
}
else
{
- magnified_height=(png_uint_32) image->rows;
+ magnified_height=(size_t) image->rows;
if (image->rows > 1)
magnified_height += mng_info->magn_mt-1;
@@ -6889,7 +6889,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
magnified_height += mng_info->magn_mb-1;
if (image->rows > 3)
- magnified_height += (png_uint_32)
+ magnified_height += (size_t)
((image->rows-3)*(mng_info->magn_my-1));
}
--
2.34.1
meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
+1
View File
@@ -35,6 +35,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt
file://0007-ImageMagick-Add-support-patch-to-fix-CVE-2025-57803.patch \
file://0007-ImageMagick-Fix-CVE-2025-57803.patch \
file://0008-ImageMagick-Fix-CVE-2025-57807.patch \
file://0009-ImageMagick-Fix-CVE-2025-55154.patch \
"
SRCREV = "35b4991eb0939a327f3489988c366e21068b0178"