diff options
| -rw-r--r-- | meta-oe/recipes-support/imagemagick/imagemagick/0001-CVE-2025-57807.patch | 46 | ||||
| -rw-r--r-- | meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick/0001-CVE-2025-57807.patch b/meta-oe/recipes-support/imagemagick/imagemagick/0001-CVE-2025-57807.patch new file mode 100644 index 0000000000..6178e31e1c --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick/0001-CVE-2025-57807.patch | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | From f8e4069153330021aefa6fc7c6c09df2444de021 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Cristy <urban-warrior@imagemagick.org> | ||
| 3 | Date: Sun, 24 Aug 2025 12:32:18 -0400 | ||
| 4 | Subject: [PATCH] CVE-2025-57807 | ||
| 5 | |||
| 6 | https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-23hg-53q6-hqfg | ||
| 7 | |||
| 8 | CVE: CVE-2025-57807 | ||
| 9 | Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/077a417a19a5ea8c85559b602754a5b928eef23e] | ||
| 10 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 11 | --- | ||
| 12 | MagickCore/blob.c | 11 +++++++---- | ||
| 13 | 1 file changed, 7 insertions(+), 4 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/MagickCore/blob.c b/MagickCore/blob.c | ||
| 16 | index d00b0ac57..5ee81a68b 100644 | ||
| 17 | --- a/MagickCore/blob.c | ||
| 18 | +++ b/MagickCore/blob.c | ||
| 19 | @@ -1630,7 +1630,7 @@ static inline ssize_t WriteBlobStream(Image *image,const size_t length, | ||
| 20 | extent=(MagickSizeType) (blob_info->offset+(MagickOffsetType) length); | ||
| 21 | if (extent >= blob_info->extent) | ||
| 22 | { | ||
| 23 | - extent=blob_info->extent+blob_info->quantum+length; | ||
| 24 | + extent+=blob_info->quantum+length; | ||
| 25 | blob_info->quantum<<=1; | ||
| 26 | if (SetBlobExtent(image,extent) == MagickFalse) | ||
| 27 | return(0); | ||
| 28 | @@ -5912,12 +5912,15 @@ MagickExport ssize_t WriteBlob(Image *image,const size_t length, | ||
| 29 | } | ||
| 30 | case BlobStream: | ||
| 31 | { | ||
| 32 | - if ((blob_info->offset+(MagickOffsetType) length) >= | ||
| 33 | - (MagickOffsetType) blob_info->extent) | ||
| 34 | + MagickSizeType | ||
| 35 | + extent; | ||
| 36 | + | ||
| 37 | + extent=(MagickSizeType) (blob_info->offset+(MagickOffsetType) length); | ||
| 38 | + if (extent >= blob_info->extent) | ||
| 39 | { | ||
| 40 | if (blob_info->mapped != MagickFalse) | ||
| 41 | return(0); | ||
| 42 | - blob_info->extent+=length+blob_info->quantum; | ||
| 43 | + blob_info->extent=extent+blob_info->quantum+length; | ||
| 44 | blob_info->quantum<<=1; | ||
| 45 | blob_info->data=(unsigned char *) ResizeQuantumMemory( | ||
| 46 | blob_info->data,blob_info->extent+1,sizeof(*blob_info->data)); | ||
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb index 8f6e816060..6e101f061f 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb | |||
| @@ -24,6 +24,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt | |||
| 24 | file://0001-CVE-2025-55160.patch \ | 24 | file://0001-CVE-2025-55160.patch \ |
| 25 | file://0001-CVE-2025-55212.patch \ | 25 | file://0001-CVE-2025-55212.patch \ |
| 26 | file://0001-CVE-2025-57803.patch \ | 26 | file://0001-CVE-2025-57803.patch \ |
| 27 | file://0001-CVE-2025-57807.patch \ | ||
| 27 | " | 28 | " |
| 28 | SRCREV = "a2d96f40e707ba54b57e7d98c3277d3ea6611ace" | 29 | SRCREV = "a2d96f40e707ba54b57e7d98c3277d3ea6611ace" |
| 29 | 30 | ||
