From: Yanhu Cao <gmayyyha@gmail.com>
Date: Mon, 17 Aug 2020 02:08:30 +0000 (+0800)
Subject: common: fix validate type CephBool cause 'invalid command json'
X-Git-Tag: v16.1.0~1364^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65267d55cd3714c436b188aaa8b2049ad2b21225;p=ceph.git

common: fix validate type CephBool cause 'invalid command json'

Fixes: https://tracker.ceph.com/issues/46985
Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
---

diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc
index 8a2256f44b5c..9f396542d77d 100644
--- a/src/common/admin_socket.cc
+++ b/src/common/admin_socket.cc
@@ -512,8 +512,7 @@ void AdminSocket::execute_command(
   }
 
   // make sure one of the registered commands with this prefix validates.
-  while (!validate_cmd(m_cct, p->second.desc, cmdmap, errss)) {
-    ++p;
+  if (!validate_cmd(m_cct, p->second.desc, cmdmap, errss)) {
     if (p->first != prefix) {
       delete f;
       return on_finish(-EINVAL, "invalid command json", empty);