From 0e879feb9d29534d51a9313df17309bd32fdd7bf Mon Sep 17 00:00:00 2001 From: lizhipeng Date: Mon, 22 Apr 2024 23:16:55 +0800 Subject: [PATCH] fix CVE-2023-46159 Signed-off-by: lizhipeng --- 0028-fix-CVE-2023-46159.patch | 51 +++++++++++++++++++++++++++++++++++ ceph.spec | 6 ++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 0028-fix-CVE-2023-46159.patch diff --git a/0028-fix-CVE-2023-46159.patch b/0028-fix-CVE-2023-46159.patch new file mode 100644 index 0000000..31cbe95 --- /dev/null +++ b/0028-fix-CVE-2023-46159.patch @@ -0,0 +1,51 @@ +From 64803e1ced57d64b758927c3977bb4a4d1769180 Mon Sep 17 00:00:00 2001 +From: Joshua Baergen +Date: Tue, 12 Sep 2023 14:05:01 -0400 +Subject: [PATCH] rgw: Add missing empty checks to the split string in + is_string_in_set(). + +In certain cases, where a user misconfigures a CORS rule, the entirety +of the string can be token characters (or, at least, the string before +and after a given token is all token characters), but != "*". If the +misconfigured string includes "*" we'll try to split the string and we +assume that we can pop the list of string elements when "*" isn't +first/last, but get_str_list() won't return anything for token-only +substrings and thus 'ssplit' will have fewer elements than would be +expected for a correct rule. In the case of an empty list, front() has +undefined behaviour; in our experience, it often results in a huge +allocation attempt because the code tries to copy the string into a +local variable 'sl'. + +An example of this misconfiguration (and thus a reproduction case) is +configuring an origin of " *". + +Signed-off-by: Matt Benjamin +--- + src/rgw/rgw_cors.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/rgw/rgw_cors.cc b/src/rgw/rgw_cors.cc +index e41abf8ccb..bb80e2b58d 100644 +--- a/src/rgw/rgw_cors.cc ++++ b/src/rgw/rgw_cors.cc +@@ -94,6 +94,8 @@ static bool is_string_in_set(set& s, string h) { + + get_str_list((*it), "* \t", ssplit); + if (off != 0) { ++ if (ssplit.empty()) ++ continue; + string sl = ssplit.front(); + flen = sl.length(); + dout(10) << "Finding " << sl << ", in " << h << ", at offset 0" << dendl; +@@ -102,6 +104,8 @@ static bool is_string_in_set(set& s, string h) { + ssplit.pop_front(); + } + if (off != ((*it).length() - 1)) { ++ if (ssplit.empty()) ++ continue; + string sl = ssplit.front(); + dout(10) << "Finding " << sl << ", in " << h + << ", at offset not less than " << flen << dendl; +-- +2.15.0 + diff --git a/ceph.spec b/ceph.spec index cf4df41..79cb685 100644 --- a/ceph.spec +++ b/ceph.spec @@ -68,7 +68,7 @@ ################################################################################# Name: ceph Version: 12.2.8 -Release: 24 +Release: 25 Epoch: 2 # define _epoch_prefix macro which will expand to the empty string if epoch is @@ -111,6 +111,7 @@ Patch24: 0024-CVE-2021-3979.patch Patch25: 0025-fix-rgw-ldap-safe_read_file-can-return-0.patch Patch26: 0026-CVE-2021-20288.patch Patch27: 0027-fix-CVE-2023-43040.patch +Patch28: 0028-fix-CVE-2023-46159.patch Requires: glibc >= 2.28-66 @@ -1859,6 +1860,9 @@ exit 0 %changelog +* Fri Mar 22 2024 lizhipeng - 2:12.2.8-25 +- fix CVE-2023-46159 + * Sat Nov 25 2023 wangzengliang - 2:12.2.8-24 - fix * recognition error when install