From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 3 Mar 2017 17:10:40 +0000 (-0500)
Subject: rgw: delete_system_obj() fails on empty object name
X-Git-Tag: v11.2.1~108^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5dcf60702cd1733dbe7f2d1d7dc68a096684bf77;p=ceph.git

rgw: delete_system_obj() fails on empty object name

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 67401193f871db95a6045915fa59dce8c5dd1012)
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 4f7af0f4785..60bac561168 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -8332,6 +8332,11 @@ int RGWRados::delete_obj(RGWObjectCtx& obj_ctx,
 
 int RGWRados::delete_system_obj(rgw_obj& obj, RGWObjVersionTracker *objv_tracker)
 {
+  if (obj.get_object().empty()) {
+    ldout(cct, 1) << "delete_system_obj got empty object name "
+        << obj << ", returning EINVAL" << dendl;
+    return -EINVAL;
+  }
   rgw_rados_ref ref;
   rgw_bucket bucket;
   int r = get_obj_ref(obj, &ref, &bucket);