From: Or Friedmann <ofriedma@redhat.com>
Date: Thu, 13 May 2021 12:39:02 +0000 (+0300)
Subject: rgw: crash on multipart upload to bucket with policy
X-Git-Tag: v16.2.5~56^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F41893%2Fhead;p=ceph.git

rgw: crash on multipart upload to bucket with policy

crash on multipart upload to bucket with policy Fixes: https://tracker.ceph.com/issues/50556

Signed-off-by: Or Friedmann <ofriedma@redhat.com>
(cherry picked from commit 413b23a5483d1feb5ea087ee96bd31b14bc0a285)

Conflicts:
  src/rgw/rgw_op.cc
- rgw::sal::RGWObject renamed to rgw::sal::Object
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index ab658154c174..352d54e89116 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -581,7 +581,10 @@ int rgw_build_bucket_policies(const DoutPrefixProvider *dpp, rgw::sal::RGWRadosS
       s->bucket_exists = false;
       return -ERR_NO_SUCH_BUCKET;
     }
-
+    if (!rgw::sal::RGWObject::empty(s->object.get())) {
+      s->object->set_bucket(s->bucket.get());
+    }
+    
     s->bucket_mtime = s->bucket->get_modification_time();
     s->bucket_attrs = s->bucket->get_attrs();
     ret = read_bucket_policy(dpp, store, s, s->bucket->get_info(),