diff --git a/backport-CVE-2023-45853.patch b/backport-CVE-2023-45853.patch new file mode 100644 index 0000000000000000000000000000000000000000..f750e0f31f1006d16deb4114370ea09226072850 --- /dev/null +++ b/backport-CVE-2023-45853.patch @@ -0,0 +1,39 @@ +From 73331a6a0481067628f065ffe87bb1d8f787d10c Mon Sep 17 00:00:00 2001 +From: Hans Wennborg +Date: Fri, 18 Aug 2023 11:05:33 +0200 +Subject: [PATCH] Reject overflows of zip header fields in minizip. + +This checks the lengths of the file name, extra field, and comment +that would be put in the zip headers, and rejects them if they are +too long. They are each limited to 65535 bytes in length by the zip +format. This also avoids possible buffer overflows if the provided +fields are too long. +--- + contrib/minizip/zip.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c +index 3d3d4ca..0446109 100644 +--- a/contrib/minizip/zip.c ++++ b/contrib/minizip/zip.c +@@ -1043,6 +1043,17 @@ extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char* filename, c + return ZIP_PARAMERROR; + #endif + ++ // The filename and comment length must fit in 16 bits. ++ if ((filename!=NULL) && (strlen(filename)>0xffff)) ++ return ZIP_PARAMERROR; ++ if ((comment!=NULL) && (strlen(comment)>0xffff)) ++ return ZIP_PARAMERROR; ++ // The extra field length must fit in 16 bits. If the member also requires ++ // a Zip64 extra block, that will also need to fit within that 16-bit ++ // length, but that will be checked for later. ++ if ((size_extrafield_local>0xffff) || (size_extrafield_global>0xffff)) ++ return ZIP_PARAMERROR; ++ + zi = (zip64_internal*)file; + + if (zi->in_opened_file_inzip == 1) +-- +2.41.0.windows.3 + diff --git a/zlib.spec b/zlib.spec index e320f5a21785463915d69b271af4ffc99f14ea71..b6d846703258e5cd4fdefa5e78c87a158df1dee2 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,6 +1,6 @@ Name: zlib Version: 1.2.11 -Release: 23 +Release: 24 Summary: A lossless data-compression library License: zlib and Boost URL: http://www.zlib.net @@ -22,6 +22,7 @@ Patch6001: backport-0001-CVE-2018-25032.patch Patch6002: backport-0002-CVE-2018-25032.patch Patch6003: backport-0001-CVE-2022-37434.patch Patch6004: backport-0002-CVE-2022-37434.patch +Patch6005: backport-CVE-2023-45853.patch BuildRequires: automake, autoconf, libtool @@ -78,6 +79,7 @@ This package contains the development-related content related to minizip. %patch6002 -p1 %patch6003 -p1 %patch6004 -p1 +%patch6005 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -135,6 +137,9 @@ make test %{_libdir}/pkgconfig/minizip.pc %changelog +* Tue Oct 17 2023 liningjie - 1.2.11-24 +- DESC:Fix CVE-2023-45853 + * Mon Dec 26 2022 zhoupengcheng - 1.2.11-23 - DESC:remove unapplied patch