]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: return error when trying to copy encrypted object without key 40672/head
authorIlsoo Byun <ilsoobyun@linecorp.com>
Fri, 11 Dec 2020 00:57:49 +0000 (09:57 +0900)
committerNathan Cutler <ncutler@suse.com>
Thu, 8 Apr 2021 12:47:11 +0000 (14:47 +0200)
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

index 20a8c84d153f709b18546a21b0d313fae6e9c8d6..fca7deb11896581c71483b1d84504a61706405bd 100644 (file)
@@ -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);