From: Suyash Dongre <suyashd999@gmail.com>
Date: Wed, 26 Jun 2024 17:51:42 +0000 (+0530)
Subject: false use-after-move on store
X-Git-Tag: v20.0.0~920^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0d8f7d363a1956b8b697c25f1719cbe230072e6;p=ceph.git

false use-after-move on store

Fixes: https://tracker.ceph.com/issues/66709

Signed-off-by: Suyash Dongre <suyashd999@gmail.com>
---

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index c0bd5b33ad4e..52988843c832 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -375,8 +375,9 @@ int main(int argc, const char **argv)
 	    << " for osd." << whoami
 	    << " fsid " << g_conf().get_val<uuid_d>("fsid")
 	    << dendl;
+    forker.exit(0);
   }
-  if (mkfs || mkkey) {
+  if (mkkey) {
     forker.exit(0);
   }
   if (mkjournal) {
diff --git a/src/common/Preforker.h b/src/common/Preforker.h
index d34179b40204..d25d5dd5adae 100644
--- a/src/common/Preforker.h
+++ b/src/common/Preforker.h
@@ -126,7 +126,7 @@ public:
     }
     return r;
   }
-  void exit(int r) {
+  [[noreturn]] void exit(int r) {
     if (is_child())
         signal_exit(r);
     ::exit(r);