Log::reopen_log_file: take m_flush_mutex

Otherwise, _flush() might continue to write to m_fd after it's closed. This might cause log data to go to a data object if the filestore then reuses the fd during that time. Fixes: ceph#12465 Backport: firefly, hammer Signed-off-by: Samuel Just <[email protected]>
lebauce · Jul 24, 2015 · 8778ab3 · 8778ab3
1 parent 2746f59
commit 8778ab3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/log/Log.cc b/src/log/Log.cc
@@ -120,13 +120,17 @@ void Log::set_log_file(string fn)
 
 void Log::reopen_log_file()
 {
+  pthread_mutex_lock(&m_flush_mutex);
+  m_flush_mutex_holder = pthread_self();
   if (m_fd >= 0)
     VOID_TEMP_FAILURE_RETRY(::close(m_fd));
   if (m_log_file.length()) {
     m_fd = ::open(m_log_file.c_str(), O_CREAT|O_WRONLY|O_APPEND, 0644);
   } else {
     m_fd = -1;
   }
+  m_flush_mutex_holder = 0;
+  pthread_mutex_unlock(&m_flush_mutex);
 }
 
 void Log::set_syslog_level(int log, int crash)