From 09f8f82729894b0762486b1cd002f030bed9dc74 Mon Sep 17 00:00:00 2001 From: zhoupengcheng Date: Tue, 18 Jun 2024 19:49:25 +0800 Subject: [PATCH] delete redundant patch (cherry picked from commit 98d5f75b84cb94f50cb6a9b268d640cc720ad5a2) --- ...ndefined-buffer-detected-by-oss-fuzz.patch | 30 ------------------- zlib.spec | 6 ++-- 2 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 fix-undefined-buffer-detected-by-oss-fuzz.patch diff --git a/fix-undefined-buffer-detected-by-oss-fuzz.patch b/fix-undefined-buffer-detected-by-oss-fuzz.patch deleted file mode 100644 index 5a94ce0..0000000 --- a/fix-undefined-buffer-detected-by-oss-fuzz.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fbc28a919107bb6fbdceb2d3dfe610ddcbc5ac89 Mon Sep 17 00:00:00 2001 -From: fangyufa -Date: Tue, 3 Dec 2019 15:42:06 +0800 -Subject: [PATCH] zlib: fix undefined buffer detected by oss-fuzz - -this patch fixes a use of uninitialized value discovered by one of the -fuzzers of the oss-fuzz project: -https://github.com/google/oss-fuzz/blob/master/projects/zlib/example_dict_fuzzer.c -clear out s->prev buffer to avoid undefined behavior - -signed-off-by: fangyufa ---- - zlib-1.2.11/deflate.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/deflate.c b/deflate.c -index 4c42259..a03bef2 100644 ---- a/deflate.c -+++ b/deflate.c -@@ -329,6 +329,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - - s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); - s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); -+ memset(s->prev, 0, s->w_size*sizeof(Pos)); - s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); - - s->high_water = 0; /* nothing written to s->window yet */ --- -2.19.1 - diff --git a/zlib.spec b/zlib.spec index e7306aa..e48a6eb 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,6 +1,6 @@ Name: zlib Version: 1.2.11 -Release: 25 +Release: 26 Summary: A lossless data-compression library License: zlib and Boost URL: http://www.zlib.net @@ -8,7 +8,6 @@ Source0: http://www.zlib.net/zlib-%{version}.tar.xz # Patch0 get from fedora Patch6000: zlib-1.2.5-minizip-fixuncrypt.patch -Patch6001: fix-undefined-buffer-detected-by-oss-fuzz.patch Patch6002: backport-0001-CVE-2018-25032.patch Patch6003: backport-0002-CVE-2018-25032.patch Patch6004: backport-0001-CVE-2022-37434.patch @@ -146,6 +145,9 @@ make test %{_libdir}/pkgconfig/minizip.pc %changelog +* Tue Jun 18 2024 zhoupengcheng - 1.2.11-26 +- delete redundant patch + * Fri Apr 26 2024 zhoupengcheng - 1.2.11-25 - DESC:apply patches regardless of architecture in zlib.spec and backport patches from upstream -- Gitee