diff -Nru ceph-15.2.17/debian/changelog ceph-15.2.17/debian/changelog
--- ceph-15.2.17/debian/changelog	2022-10-31 05:45:04.000000000 +0000
+++ ceph-15.2.17/debian/changelog	2023-03-20 07:55:24.000000000 +0000
@@ -1,3 +1,9 @@
+ceph (15.2.17-0ubuntu0.20.04.3) focal; urgency=medium
+
+  * d/p/bug1969000.patch: bail from handle_command() if _generate_command_map() fails
+
+ -- Nikhil Kshirsagar <nikhil.kshirsagar@canonical.com>  Mon, 20 Mar 2023 07:55:24 +0000
+
 ceph (15.2.17-0ubuntu0.20.04.2) focal; urgency=high
 
   * d/p/bug1978913.patch: Cherry-pick upstream fix for on-line
diff -Nru ceph-15.2.17/debian/patches/bug1969000.patch ceph-15.2.17/debian/patches/bug1969000.patch
--- ceph-15.2.17/debian/patches/bug1969000.patch	1970-01-01 00:00:00.000000000 +0000
+++ ceph-15.2.17/debian/patches/bug1969000.patch	2023-03-20 07:55:13.000000000 +0000
@@ -0,0 +1,23 @@
+Description: bail from handle_command() if _generate_command_map() fails
+
+Author: Nikhil Kshirsagar <nikhil.kshirsagar@canonical.com>
+Origin: https://github.com/ceph/ceph/pull/48044
+Bug: https://tracker.ceph.com/issues/57859
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: ceph-15.2.17/src/mon/Monitor.cc
+===================================================================
+--- ceph-15.2.17.orig/src/mon/Monitor.cc
++++ ceph-15.2.17/src/mon/Monitor.cc
+@@ -3341,9 +3341,9 @@ void Monitor::handle_command(MonOpReques
+   // 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,
diff -Nru ceph-15.2.17/debian/patches/series ceph-15.2.17/debian/patches/series
--- ceph-15.2.17/debian/patches/series	2022-10-31 05:45:04.000000000 +0000
+++ ceph-15.2.17/debian/patches/series	2023-03-20 07:46:37.000000000 +0000
@@ -12,3 +12,4 @@
 # AARCH64 EC regression
 bug1917414.patch
 bug1978913.patch
+bug1969000.patch
diff -Nru ceph-15.2.17/src/test/debian-jessie/debian/changelog ceph-15.2.17/src/test/debian-jessie/debian/changelog
--- ceph-15.2.17/src/test/debian-jessie/debian/changelog	2022-10-31 05:45:04.000000000 +0000
+++ ceph-15.2.17/src/test/debian-jessie/debian/changelog	2023-03-20 07:55:24.000000000 +0000
@@ -1,3 +1,9 @@
+ceph (15.2.17-0ubuntu0.20.04.3) focal; urgency=medium
+
+  * d/p/bug1969000.patch: bail from handle_command() if _generate_command_map() fails
+
+ -- Nikhil Kshirsagar <nikhil.kshirsagar@canonical.com>  Mon, 20 Mar 2023 07:55:24 +0000
+
 ceph (15.2.17-0ubuntu0.20.04.2) focal; urgency=high
 
   * d/p/bug1978913.patch: Cherry-pick upstream fix for on-line
diff -Nru ceph-15.2.17/src/test/debian-jessie/debian/patches/bug1969000.patch ceph-15.2.17/src/test/debian-jessie/debian/patches/bug1969000.patch
--- ceph-15.2.17/src/test/debian-jessie/debian/patches/bug1969000.patch	1970-01-01 00:00:00.000000000 +0000
+++ ceph-15.2.17/src/test/debian-jessie/debian/patches/bug1969000.patch	2023-03-20 07:55:13.000000000 +0000
@@ -0,0 +1,23 @@
+Description: bail from handle_command() if _generate_command_map() fails
+
+Author: Nikhil Kshirsagar <nikhil.kshirsagar@canonical.com>
+Origin: https://github.com/ceph/ceph/pull/48044
+Bug: https://tracker.ceph.com/issues/57859
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: ceph-15.2.17/src/mon/Monitor.cc
+===================================================================
+--- ceph-15.2.17.orig/src/mon/Monitor.cc
++++ ceph-15.2.17/src/mon/Monitor.cc
+@@ -3341,9 +3341,9 @@ void Monitor::handle_command(MonOpReques
+   // 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,
diff -Nru ceph-15.2.17/src/test/debian-jessie/debian/patches/series ceph-15.2.17/src/test/debian-jessie/debian/patches/series
--- ceph-15.2.17/src/test/debian-jessie/debian/patches/series	2022-10-31 05:45:04.000000000 +0000
+++ ceph-15.2.17/src/test/debian-jessie/debian/patches/series	2023-03-20 07:46:37.000000000 +0000
@@ -12,3 +12,4 @@
 # AARCH64 EC regression
 bug1917414.patch
 bug1978913.patch
+bug1969000.patch
diff -Nru ceph-15.2.17/src/test/ubuntu-16.04/debian/changelog ceph-15.2.17/src/test/ubuntu-16.04/debian/changelog
--- ceph-15.2.17/src/test/ubuntu-16.04/debian/changelog	2022-10-31 05:45:04.000000000 +0000
+++ ceph-15.2.17/src/test/ubuntu-16.04/debian/changelog	2023-03-20 07:55:24.000000000 +0000
@@ -1,3 +1,9 @@
+ceph (15.2.17-0ubuntu0.20.04.3) focal; urgency=medium
+
+  * d/p/bug1969000.patch: bail from handle_command() if _generate_command_map() fails
+
+ -- Nikhil Kshirsagar <nikhil.kshirsagar@canonical.com>  Mon, 20 Mar 2023 07:55:24 +0000
+
 ceph (15.2.17-0ubuntu0.20.04.2) focal; urgency=high
 
   * d/p/bug1978913.patch: Cherry-pick upstream fix for on-line
diff -Nru ceph-15.2.17/src/test/ubuntu-16.04/debian/patches/bug1969000.patch ceph-15.2.17/src/test/ubuntu-16.04/debian/patches/bug1969000.patch
--- ceph-15.2.17/src/test/ubuntu-16.04/debian/patches/bug1969000.patch	1970-01-01 00:00:00.000000000 +0000
+++ ceph-15.2.17/src/test/ubuntu-16.04/debian/patches/bug1969000.patch	2023-03-20 07:55:13.000000000 +0000
@@ -0,0 +1,23 @@
+Description: bail from handle_command() if _generate_command_map() fails
+
+Author: Nikhil Kshirsagar <nikhil.kshirsagar@canonical.com>
+Origin: https://github.com/ceph/ceph/pull/48044
+Bug: https://tracker.ceph.com/issues/57859
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: ceph-15.2.17/src/mon/Monitor.cc
+===================================================================
+--- ceph-15.2.17.orig/src/mon/Monitor.cc
++++ ceph-15.2.17/src/mon/Monitor.cc
+@@ -3341,9 +3341,9 @@ void Monitor::handle_command(MonOpReques
+   // 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,
diff -Nru ceph-15.2.17/src/test/ubuntu-16.04/debian/patches/series ceph-15.2.17/src/test/ubuntu-16.04/debian/patches/series
--- ceph-15.2.17/src/test/ubuntu-16.04/debian/patches/series	2022-10-31 05:45:04.000000000 +0000
+++ ceph-15.2.17/src/test/ubuntu-16.04/debian/patches/series	2023-03-20 07:46:37.000000000 +0000
@@ -12,3 +12,4 @@
 # AARCH64 EC regression
 bug1917414.patch
 bug1978913.patch
+bug1969000.patch
diff -Nru ceph-15.2.17/src/test/ubuntu-18.04/debian/changelog ceph-15.2.17/src/test/ubuntu-18.04/debian/changelog
--- ceph-15.2.17/src/test/ubuntu-18.04/debian/changelog	2022-10-31 05:45:04.000000000 +0000
+++ ceph-15.2.17/src/test/ubuntu-18.04/debian/changelog	2023-03-20 07:55:24.000000000 +0000
@@ -1,3 +1,9 @@
+ceph (15.2.17-0ubuntu0.20.04.3) focal; urgency=medium
+
+  * d/p/bug1969000.patch: bail from handle_command() if _generate_command_map() fails
+
+ -- Nikhil Kshirsagar <nikhil.kshirsagar@canonical.com>  Mon, 20 Mar 2023 07:55:24 +0000
+
 ceph (15.2.17-0ubuntu0.20.04.2) focal; urgency=high
 
   * d/p/bug1978913.patch: Cherry-pick upstream fix for on-line
diff -Nru ceph-15.2.17/src/test/ubuntu-18.04/debian/patches/bug1969000.patch ceph-15.2.17/src/test/ubuntu-18.04/debian/patches/bug1969000.patch
--- ceph-15.2.17/src/test/ubuntu-18.04/debian/patches/bug1969000.patch	1970-01-01 00:00:00.000000000 +0000
+++ ceph-15.2.17/src/test/ubuntu-18.04/debian/patches/bug1969000.patch	2023-03-20 07:55:13.000000000 +0000
@@ -0,0 +1,23 @@
+Description: bail from handle_command() if _generate_command_map() fails
+
+Author: Nikhil Kshirsagar <nikhil.kshirsagar@canonical.com>
+Origin: https://github.com/ceph/ceph/pull/48044
+Bug: https://tracker.ceph.com/issues/57859
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: ceph-15.2.17/src/mon/Monitor.cc
+===================================================================
+--- ceph-15.2.17.orig/src/mon/Monitor.cc
++++ ceph-15.2.17/src/mon/Monitor.cc
+@@ -3341,9 +3341,9 @@ void Monitor::handle_command(MonOpReques
+   // 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,
diff -Nru ceph-15.2.17/src/test/ubuntu-18.04/debian/patches/series ceph-15.2.17/src/test/ubuntu-18.04/debian/patches/series
--- ceph-15.2.17/src/test/ubuntu-18.04/debian/patches/series	2022-10-31 05:45:04.000000000 +0000
+++ ceph-15.2.17/src/test/ubuntu-18.04/debian/patches/series	2023-03-20 07:46:37.000000000 +0000
@@ -12,3 +12,4 @@
 # AARCH64 EC regression
 bug1917414.patch
 bug1978913.patch
+bug1969000.patch