diff --git a/CVE-2023-5341.patch b/CVE-2023-5341.patch new file mode 100644 index 0000000000000000000000000000000000000000..b5d1cde58c6320e26ccd62bc5560563e0624a5b5 --- /dev/null +++ b/CVE-2023-5341.patch @@ -0,0 +1,27 @@ +From 27411f1d1d3a0b328cede4a808525ee237cb415b Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Sat, 7 Oct 2023 10:48:39 +0800 +Subject: [PATCH] check for BMP file size, poc provided by Hardik Shah of + Vehere (Dawn Treaders team) + +--- + coders/bmp.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/coders/bmp.c b/coders/bmp.c +index 6f9b57b..5e6dac3 100644 +--- a/coders/bmp.c ++++ b/coders/bmp.c +@@ -635,6 +635,9 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) + " BMP header size: %u",bmp_info.size); + if (bmp_info.size > 124) + ThrowReaderException(CorruptImageError,"ImproperImageHeader"); ++ if ((bmp_info.file_size != 0) && ++ ((MagickSizeType) bmp_info.file_size > GetBlobSize(image))) ++ ThrowReaderException(CorruptImageError,"ImproperImageHeader"); + if (bmp_info.offset_bits < bmp_info.size) + ThrowReaderException(CorruptImageError,"ImproperImageHeader"); + profile_data=0; +-- +2.27.0 + diff --git a/ImageMagick.spec b/ImageMagick.spec index a5ebfd93c870295b97782c7a35d232f72067b5da..b5799f7281dc9c244aafd9acba7ec1370025499f 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,7 +1,7 @@ Name: ImageMagick Epoch: 1 Version: 6.9.12.86 -Release: 4 +Release: 5 Summary: Create, edit, compose, or convert bitmap images License: ImageMagick and MIT Url: http://www.imagemagick.org/ @@ -9,6 +9,7 @@ Source0: https://www.imagemagick.org/download/ImageMagick-6.9.12-86.tar.x Patch0: CVE-2023-34151.patch Patch1: CVE-2023-3428.patch Patch2: CVE-2023-39978.patch +Patch3: CVE-2023-5341.patch BuildRequires: bzip2-devel freetype-devel libjpeg-devel libpng-devel perl-generators BuildRequires: libtiff-devel giflib-devel zlib-devel perl-devel >= 5.8.1 jbigkit-devel @@ -166,6 +167,9 @@ rm PerlMagick/demo/Generic.ttf %{_libdir}/pkgconfig/ImageMagick++* %changelog +* Sat Oct 7 2023 liningjie - 1:6.9.12.86-5 +- Fix CVE-2023-5341 + * Mon Aug 14 2023 wangkai <13474090681@163.com> - 1:6.9.12.86-4 - Fix CVE-2023-39978