From: Nikhil Kshirsagar <nikhil.kshirsagar@canonical.com>
Date: Mon, 12 Sep 2022 06:33:59 +0000 (+0000)
Subject: mon: Bail from handle_command() if _generate_command_map() fails
X-Git-Tag: v18.1.0~895^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3d771aabc07f7517efb051bf70d2df1657172b4;p=ceph.git

mon: Bail from handle_command() if _generate_command_map() fails

Bail out of handle_command() if _generate_command_map() throws
an exception due to invalid json. This is an additional fix
for the one that went in through
1109e62f6a3c0a7e06a088c4b833c8ecec51f791

Fixes: https://tracker.ceph.com/issues/57859
Signed-off-by: Nikhil Kshirsagar <nikhil.kshirsagar@canonical.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 35c71b681588..c7425847bf68 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3442,9 +3442,9 @@ void Monitor::handle_command(MonOpRequestRef op)
   // Catch bad_cmd_get exception if _generate_command_map() throws it
   try {
     _generate_command_map(cmdmap, param_str_map);
-  }
-  catch(bad_cmd_get& e) {
+  } catch (const bad_cmd_get& e) {
     reply_command(op, -EINVAL, e.what(), 0);
+    return;
   }
 
   if (!_allowed_command(session, service, prefix, cmdmap,