diff --git a/zlib-CVE-2023-45853.patch b/zlib-CVE-2023-45853.patch new file mode 100644 index 0000000000000000000000000000000000000000..784c57766f20f03523fdc9aab3bb0b25a6d7c34f --- /dev/null +++ b/zlib-CVE-2023-45853.patch @@ -0,0 +1,36 @@ +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 3d3d4cadd..0446109b2 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) diff --git a/zlib.spec b/zlib.spec index ad0d451ea2e23f4b8d0b538f7a2c67adfac88aa7..62555cd0bb1be60cef1416745a79f3fb830ecb3b 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 Name: zlib Version: 1.2.13 Release: %{anolis_release}%{?dist} @@ -7,6 +7,8 @@ Summary: Compression and decompression library License: zlib and Boost URL: https://www.zlib.net/ Source0: https://zlib.net/zlib-%{version}.tar.xz +# https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c +Patch0: zlib-CVE-2023-45853.patch BuildRequires: make automake autoconf libtool %description @@ -115,6 +117,9 @@ make test %changelog +* Sat Oct 21 2023 Funda Wang - 1.2.13-2 +- Fix CVE-2023-45853 + * Tue Oct 18 2022 Funda Wang - 1.2.13-1 - New version 1.2.13