Details: https://nvd.nist.gov/vuln/detail/CVE-2025-66628
Pick the patch that refers to the relevant github advisory[1] explicitly in its commit message. [1]: https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-6hjr-v6g4-3fm8 Signed-off-by: Gyorgy Sarvari <[email protected]> --- .../imagemagick/CVE-2025-66628.patch | 27 +++++++++++++++++++ .../imagemagick/imagemagick_7.1.1.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick/CVE-2025-66628.patch diff --git a/meta-oe/recipes-support/imagemagick/imagemagick/CVE-2025-66628.patch b/meta-oe/recipes-support/imagemagick/imagemagick/CVE-2025-66628.patch new file mode 100644 index 0000000000..7894d12ab6 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick/CVE-2025-66628.patch @@ -0,0 +1,27 @@ +From 3853a72088f6a72fe3d7405655d8f9cbed605e75 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra <[email protected]> +Date: Tue, 2 Dec 2025 22:49:12 +0100 +Subject: [PATCH] Added extra check to avoid an overflow on 32-bit machines + (GHSA-6hjr-v6g4-3fm8) + +CVE: CVE-2025-66628 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/bdae0681ad1e572defe62df85834218f01e6d670] +Signed-off-by: Gyorgy Sarvari <[email protected]> +--- + coders/tim.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/coders/tim.c b/coders/tim.c +index 4c094ac5f..fcfd9266f 100644 +--- a/coders/tim.c ++++ b/coders/tim.c +@@ -231,7 +231,8 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception) + (void) ReadBlobLSBShort(image); + width=ReadBlobLSBShort(image); + height=ReadBlobLSBShort(image); +- image_size=2*width*height; ++ if (HeapOverflowSanityCheckGetSize(2*width,height,&image_size) != MagickFalse) ++ ThrowReaderException(CorruptImageError,"ImproperImageHeader"); + if (image_size > GetBlobSize(image)) + ThrowReaderException(CorruptImageError,"InsufficientImageDataInFile"); + bytes_per_line=width*2; diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb index 99632967c2..40e57b7f1d 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb @@ -25,6 +25,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://CVE-2025-57807.patch \ file://CVE-2025-62171.patch \ file://CVE-2025-65955.patch \ + file://CVE-2025-66628.patch \ " SRCREV = "82572afc879b439cbf8c9c6f3a9ac7626adf98fb"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#124242): https://lists.openembedded.org/g/openembedded-devel/message/124242 Mute This Topic: https://lists.openembedded.org/mt/117686809/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
