From: Ilsoo Byun <ilsoobyun@linecorp.com>
Date: Fri, 11 Dec 2020 00:57:49 +0000 (+0900)
Subject: rgw: return error when trying to copy encrypted object without key
X-Git-Tag: v15.2.13~11^2~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40672%2Fhead;p=ceph.git

rgw: return error when trying to copy encrypted object without key

Fixes: https://tracker.ceph.com/issues/48554

Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
(cherry picked from commit dde1303c92b39daa2d760a110f48dc9655e7765f)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 20a8c84d153..fca7deb1189 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -3779,7 +3779,7 @@ int RGWPutObj::get_data(const off_t fst, const off_t lst, bufferlist& bl)
     filter = decrypt.get();
   }
   if (op_ret < 0) {
-    return ret;
+    return op_ret;
   }
 
   ret = read_op.range_to_ofs(obj_size, new_ofs, new_end);