From: redickwang <redickwang@tencent.com>
Date: Fri, 19 May 2017 07:08:12 +0000 (+0800)
Subject: rgw: segment fault when shard id out of range
X-Git-Tag: v10.2.10~98^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2e278d821d1e5992f77e6ac1f0b3e1c7fcba7e12;p=ceph.git

rgw: segment fault when shard id out of range

Fixes: http://tracker.ceph.com/issues/19732

Signed-off-by: redickwang <redickwang@tencent.com>
(cherry picked from commit ff4c40fc2e3c092d17a218ae6132de4e6034c8ee)
---

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index 88695ad74953..1e8b2e0609ca 100644
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -1867,6 +1867,8 @@ int RGWDataChangesLog::list_entries(int shard, const real_time& start_time, cons
 				    const string& marker,
 				    string *out_marker,
 				    bool *truncated) {
+  if (shard >= num_shards)
+    return -EINVAL;
 
   list<cls_log_entry> log_entries;