diff mbox series

[meta-oe,kirkstone,3/5] imagemagick: patch CVE-2025-62171

Message ID 20251224193434.2631122-3-skandigraun@gmail.com
State New
Headers show
Series [meta-oe,kirkstone,1/5] imagemagick: patch CVE-2022-1115 | expand

Commit Message

Gyorgy Sarvari Dec. 24, 2025, 7:34 p.m. UTC 
Details: https://nvd.nist.gov/vuln/detail/CVE-2025-62171

Pick the patch that's mentioned in the nvd report.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
 .../imagemagick/files/CVE-2025-62171.patch    | 26 +++++++++++++++++++
 .../imagemagick/imagemagick_7.0.10.bb         |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 meta-oe/recipes-support/imagemagick/files/CVE-2025-62171.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/imagemagick/files/CVE-2025-62171.patch b/meta-oe/recipes-support/imagemagick/files/CVE-2025-62171.patch
new file mode 100644
index 0000000000..7b6012657e
--- /dev/null
+++ b/meta-oe/recipes-support/imagemagick/files/CVE-2025-62171.patch
@@ -0,0 +1,26 @@ 
+From 12e9e846c20e8429940c1aab01ca8ffb9067bed0 Mon Sep 17 00:00:00 2001
+From: Dirk Lemstra <dirk@lemstra.org>
+Date: Sun, 12 Oct 2025 20:43:14 +0200
+Subject: [PATCH] Added extra check to resolve issue on 32-bit systems
+ (https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-9pp9-cfwx-54rm)
+
+CVE: CVE-2025-62171
+Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/cea1693e2ded51b4cc91c70c54096cbed1691c00]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ coders/bmp.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/coders/bmp.c b/coders/bmp.c
+index 37f54e7f8..26deb34fe 100644
+--- a/coders/bmp.c
++++ b/coders/bmp.c
+@@ -976,6 +976,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
+       ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+     if (bmp_info.compression == BI_RLE4)
+       bmp_info.bits_per_pixel<<=1;
++    if (BMPOverflowCheck(image->columns,bmp_info.bits_per_pixel) != MagickFalse)
++      ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+     extent=image->columns*bmp_info.bits_per_pixel;
+     bytes_per_line=4*((extent+31)/32);
+     if (BMPOverflowCheck(bytes_per_line,image->rows) != MagickFalse)
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
index 83e9ff2fd0..81f4596456 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
@@ -47,6 +47,7 @@  SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt
     file://0011-ImageMagick-Fix-CVE-2023-34151.patch \
     file://CVE-2022-1115.patch \
     file://CVE-2025-65955.patch \
+    file://CVE-2025-62171.patch \
 "
 
 SRCREV = "35b4991eb0939a327f3489988c366e21068b0178"