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

imagemagick: patch CVE-2022-1115

Browse Source 
Details: https://nvd.nist.gov/vuln/detail/CVE-2022-1115

Pick the patch referenced in the NVD report.
Tested successfully against the PoC described in the related Github issue[1].

[1]: https://github.com/ImageMagick/ImageMagick/issues/4974

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
Gyorgy Sarvari
2025-12-24 20:34:30 +01:00
parent 4ac316bf47
commit 4eae56f5d0
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/imagemagick/files/CVE-2022-1115.patch
+25
View File
@@ -0,0 +1,25 @@
From 0d8ca198fd90d882e524a3bc2eed55aff5c737c1 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Tue, 22 Mar 2022 20:11:27 -0400
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/4974
CVE: CVE-2022-1115
Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick6/commit/1f860f52bd8d58737ad883072203391096b30b51]
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
coders/tiff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/coders/tiff.c b/coders/tiff.c
index d8e9a8953..c3767c8c3 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1993,7 +1993,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
number_pixels=(MagickSizeType) columns*rows;
if (HeapOverflowSanityCheck(rows,sizeof(*tile_pixels)) != MagickFalse)
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
- extent=TIFFTileSize(tiff);
+ extent=4*MagickMax(rows*TIFFTileRowSize(tiff),TIFFTileSize(tiff));
#if defined(TIFF_VERSION_BIG)
extent+=columns*sizeof(uint64);
#else
meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
+1
View File
@@ -45,6 +45,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt
file://0011-ImageMagick-Add-support-patch-2-to-fix-CVE-2023-3415.patch \
file://0011-ImageMagick-Add-support-patch-3-to-fix-CVE-2023-3415.patch \
file://0011-ImageMagick-Fix-CVE-2023-34151.patch \
file://CVE-2022-1115.patch \
"
SRCREV = "35b4991eb0939a327f3489988c366e21068b0178"