3c38ebd2e1
Signed-off-by: wangzengliang <wangzengliang2@huawei.com> (cherry picked from commit 18f048121b48d30deab35eaabc6565c5bbd90dd4)
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
From 62010cd68bb68207d51c2e373ff9a4a18a2b005c Mon Sep 17 00:00:00 2001
|
|
From: wangzengliang <wangzengliang2@huawei.com>
|
|
Date: Wed, 18 Oct 2023 11:18:56 +0800
|
|
Subject: [PATCH] fix CVE-2023-43040
|
|
|
|
Fixes: https://tracker.ceph.com/issues/63004
|
|
copied-by: https://github.com/ceph/ceph/pull/53758
|
|
signed-off-by: Joshua Baergen <jbaergen@gigitalocean.com>
|
|
---
|
|
src/rgw/rgw_rest_s3.cc | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
|
|
index 3b07327f..4b039430 100644
|
|
--- a/src/rgw/rgw_rest_s3.cc
|
|
+++ b/src/rgw/rgw_rest_s3.cc
|
|
@@ -1547,10 +1547,6 @@ int RGWPostObj_ObjStore_S3::get_params()
|
|
return op_ret;
|
|
}
|
|
|
|
- ldout(s->cct, 20) << "adding bucket to policy env: " << s->bucket.name
|
|
- << dendl;
|
|
- env.add_var("bucket", s->bucket.name);
|
|
-
|
|
bool done;
|
|
do {
|
|
struct post_form_part part;
|
|
@@ -1601,6 +1597,10 @@ int RGWPostObj_ObjStore_S3::get_params()
|
|
env.add_var(part.name, part_str);
|
|
} while (!done);
|
|
|
|
+ ldout(s->cct, 20) << "adding bucket to policy env: " << s->bucket.name
|
|
+ << dendl;
|
|
+ env.add_var("bucket", s->bucket.name);
|
|
+
|
|
string object_str;
|
|
if (!part_str(parts, "key", &object_str)) {
|
|
err_msg = "Key not specified";
|
|
--
|
|
2.27.0
|
|
|