From: Sage Weil <sage@redhat.com>
Date: Tue, 19 Aug 2014 23:43:02 +0000 (-0700)
Subject: mon/OSDMonitor: fix double-free on old MOSDBoot
X-Git-Tag: v0.80.8~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c7cacf00b66a0e17272cf67fe0823ee863dfa7c;p=ceph.git

mon/OSDMonitor: fix double-free on old MOSDBoot

send_latest() does an m->put().

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 97f9b6df668315fba6a5924b79024c7a986f4110)
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 560c8ecd31423..5f54f94d6c179 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1211,7 +1211,7 @@ bool OSDMonitor::preprocess_boot(MOSDBoot *m)
       osdmap.get_info(from).up_from > m->version) {
     dout(7) << "prepare_boot msg from before last up_from, ignoring" << dendl;
     send_latest(m, m->sb.current_epoch+1);
-    goto ignore;
+    return true;
   }
 
   // noup?