From 6a22c379439731b5ff67258391e7da87dd35edcd Mon Sep 17 00:00:00 2001 From: wangzengliang Date: Mon, 10 Jan 2022 14:05:07 +0800 Subject: [PATCH] fix snappy 1.1.8 to 1.1.9 --- ...ct-made-the-follwing-change-in-snapp.patch | 29 +++++++++++++++++++ ceph.spec | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0008-the-snappy-project-made-the-follwing-change-in-snapp.patch diff --git a/0008-the-snappy-project-made-the-follwing-change-in-snapp.patch b/0008-the-snappy-project-made-the-follwing-change-in-snapp.patch new file mode 100644 index 0000000..4d168d8 --- /dev/null +++ b/0008-the-snappy-project-made-the-follwing-change-in-snapp.patch @@ -0,0 +1,29 @@ +From 780243774f5a9695945127dd639780c68d57e6e1 Mon Sep 17 00:00:00 2001 +From: wangzengliang +Date: Mon, 10 Jan 2022 11:43:31 +0800 +Subject: [PATCH] the snappy project made the follwing change in snappy.h + between verison 1.1.8 and 1.1.9 + Fixes: https://tracker.ceph.com/issues/50934 + copyed-off-by: https://github.com/ceph/ceph/pill/42542 + +--- + src/compressor/snappy/SnappyCompressor.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/compressor/snappy/SnappyCompressor.h b/src/compressor/snappy/SnappyCompressor.h +index 0291a923..bf7532e4 100644 +--- a/src/compressor/snappy/SnappyCompressor.h ++++ b/src/compressor/snappy/SnappyCompressor.h +@@ -96,8 +96,8 @@ class SnappyCompressor : public Compressor { + if (qat_enabled) + return qat_accel.decompress(p, compressed_len, dst); + #endif +- snappy::uint32 res_len = 0; + BufferlistSource source_1(p, compressed_len); ++ uint32_t res_len = 0; + if (!snappy::GetUncompressedLength(&source_1, &res_len)) { + return -1; + } +-- +2.30.0 + diff --git a/ceph.spec b/ceph.spec index 66c7bfe..a0c55e9 100644 --- a/ceph.spec +++ b/ceph.spec @@ -110,7 +110,7 @@ ################################################################################# Name: ceph Version: 14.2.15 -Release: 6%{?dist} +Release: 7%{?dist} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -137,6 +137,7 @@ Patch4: 0004-CVE-2020-27781-4.patch Patch5: 0005-CVE-2020-27781-5.patch Patch6: 0006-CVE-2021-3524-1.patch Patch7: 0007-fix-build-error-PTHREAD_STACK_MIN.patch +Patch8: 0008-the-snappy-project-made-the-follwing-change-in-snapp.patch %if 0%{?suse_version} # _insert_obs_source_lines_here @@ -2044,6 +2045,9 @@ exit 0 %changelog +* Mon 10 Jan 2022 wangzengliang - 1:14.2.15-7 +- fix snappy bug between verison 1.1.8 and 1.1.9 + * Fri Aug 13 2021 yanglongkang - 1:14.2.15-6 - fix build error PTHREAD_STACJK_MIN -- Gitee