auth/cephx/CephxServiceHandler: handle decode errors

Decode errors should trigger EPERM, not throw exceptions that trigger
timeouts/retries in the messenger.

Fixes: https://tracker.ceph.com/issues/42369
Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/auth/cephx/CephxServiceHandler.cc b/src/auth/cephx/CephxServiceHandler.cc
index a34f0b4ee3091922c1bca9762ae4cfd45364000e..27c3e9f8f441c3035540e9a4da4d227c19f28b51 100644 (file)
--- a/src/auth/cephx/CephxServiceHandler.cc
+++ b/src/auth/cephx/CephxServiceHandler.cc
@@ -61,7 +61,13 @@ int CephxServiceHandler::handle_request(
   int ret = 0;
 
   struct CephXRequestHeader cephx_header;
-  decode(cephx_header, indata);
+  try {
+    decode(cephx_header, indata);
+  } catch (buffer::error& e) {
+    ldout(cct, 0) << __func__ << " failed to decode CephXRequestHeader: "
+                 << e.what() << dendl;
+    return -EPERM;
+  }
 
   switch (cephx_header.request_type) {
   case CEPHX_GET_AUTH_SESSION_KEY:
@@ -70,7 +76,14 @@ int CephxServiceHandler::handle_request(
                     << entity_name << dendl;
 
       CephXAuthenticate req;
-      decode(req, indata);
+      try {
+       decode(req, indata);
+      } catch (buffer::error& e) {
+       ldout(cct, 0) << __func__ << " failed to decode CephXAuthenticate: "
+                     << e.what() << dendl;
+       ret = -EPERM;
+       break;
+      }
 
       CryptoKey secret;
       if (!key_server->get_secret(entity_name, secret)) {
@@ -234,7 +247,15 @@ int CephxServiceHandler::handle_request(
       }
 
       CephXServiceTicketRequest ticket_req;
-      decode(ticket_req, indata);
+      try {
+       decode(ticket_req, indata);
+      } catch (buffer::error& e) {
+       ldout(cct, 0) << __func__
+                     << " failed to decode CephXServiceTicketRequest: "
+                     << e.what() << dendl;
+       ret = -EPERM;
+       break;
+      }
       ldout(cct, 10) << " ticket_req.keys = " << ticket_req.keys << dendl;
 
       ret = 0;