summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/imagemagick/files/CVE-2022-28463.patch26
-rw-r--r--meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb1
2 files changed, 27 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/imagemagick/files/CVE-2022-28463.patch b/meta-oe/recipes-support/imagemagick/files/CVE-2022-28463.patch
new file mode 100644
index 0000000000..36b0756adf
--- /dev/null
+++ b/meta-oe/recipes-support/imagemagick/files/CVE-2022-28463.patch
@@ -0,0 +1,26 @@
1From ca3654ebf7a439dc736f56f083c9aa98e4464b7f Mon Sep 17 00:00:00 2001
2From: Cristy <urban-warrior@imagemagick.org>
3Date: Sat, 26 Mar 2022 09:26:57 -0400
4Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/4988
5CVE: CVE-2022-28463
6Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/ca3654ebf7a439dc736f56f083c9aa98e4464b7f]
7Signed-off-by: Virendra Thakur <thakur.virendra1810@gmail.com>
8
9---
10 coders/cin.c | 2 ++
11 1 file changed, 2 insertions(+)
12
13diff --git a/coders/cin.c b/coders/cin.c
14index e266e7f3c56..23fc17e0890 100644
15--- a/coders/cin.c
16+++ b/coders/cin.c
17@@ -451,6 +451,8 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception)
18 image->endian=(magick[0] == 0x80) && (magick[1] == 0x2a) &&
19 (magick[2] == 0x5f) && (magick[3] == 0xd7) ? MSBEndian : LSBEndian;
20 cin.file.image_offset=ReadBlobLong(image);
21+ if (cin.file.image_offset < 712)
22+ ThrowReaderException(CorruptImageError,"ImproperImageHeader");
23 offset+=4;
24 cin.file.generic_length=ReadBlobLong(image);
25 offset+=4;
26
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 ce5489bb3e..fcbbd6fca2 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
@@ -23,6 +23,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt
23 file://CVE-2023-1289.patch \ 23 file://CVE-2023-1289.patch \
24 file://CVE-2023-34474.patch \ 24 file://CVE-2023-34474.patch \
25 file://CVE-2023-5341.patch \ 25 file://CVE-2023-5341.patch \
26 file://CVE-2022-28463.patch \
26" 27"
27 28
28SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" 29SRCREV = "35b4991eb0939a327f3489988c366e21068b0178"