Merge pull request ceph#47620 from lxbsz/wip-56249

client: stop the remount_finisher thread in the Client::unmount() Reviewed-by: Rishabh Dave <[email protected]> Reviewed-by: Venky Shankar <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]> Reviewed-by: Kotresh HR <[email protected]> Reviewed-by: Milind Changire <[email protected]>
selroc · Sep 2, 2022 · 831344e · 831344e
2 parents bc264a9 + 90f9713
commit 831344e
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/client/Client.cc b/src/client/Client.cc
@@ -6673,6 +6673,17 @@ void Client::_unmount(bool abort)
 
   mref_writer.update_state(CLIENT_UNMOUNTED);
 
+  /*
+   * Stop the remount_queue before clearing the mountpoint memory
+   * to avoid possible use-after-free bug.
+   */
+  if (remount_cb) {
+    ldout(cct, 10) << "unmount stopping remount finisher" << dendl;
+    remount_finisher.wait_for_empty();
+    remount_finisher.stop();
+    remount_cb = nullptr;
+  }
+
   ldout(cct, 2) << "unmounted." << dendl;
 }