]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: fix double-free on old MOSDBoot
authorSage Weil <sage@redhat.com>
Tue, 19 Aug 2014 23:43:02 +0000 (16:43 -0700)
committerSage Weil <sage@redhat.com>
Fri, 9 Jan 2015 23:53:31 +0000 (15:53 -0800)
send_latest() does an m->put().

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

src/mon/OSDMonitor.cc

index 560c8ecd314237581a93704f759f3c297e8b4fd3..5f54f94d6c17976febaf2ebf142484474c928d15 100644 (file)
@@ -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?