From 922f30563ea00f807edeb641366cb325a3a745f8 Mon Sep 17 00:00:00 2001
From: Ilsoo Byun <ilsoobyun@linecorp.com>
Date: Fri, 11 Dec 2020 09:57:49 +0900
Subject: [PATCH] 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)
---
 src/rgw/rgw_op.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
2.47.3