msgr: return error and dethrottle if message decode fails

This was broken by the addition of the throttling stuff.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 2db35278cda6b35ef156cd2faffa0b63b98b3332..87b9bf00893f3618f520901c66a5cf287a12e22f 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -1790,6 +1790,11 @@ int SimpleMessenger::Pipe::read_message(Message **pm)
   dout(20) << "reader got " << front.length() << " + " << middle.length() << " + " << data.length()
           << " byte message" << dendl;
   message = decode_message(header, footer, front, middle, data);
+  if (!message) {
+    ret = -EINVAL;
+    goto out_dethrottle;
+  }
+
   message->set_throttler(policy.throttler);
 
   // store reservation size in message, so we don't get confused