[Fix #3831] Apply per-DB instance attach locking (#3862)

Teddy Reed · web-flow · commit 979cd4e5d101 · 2017-10-21T11:19:57.000-07:00
diff --git a/osquery/devtools/shell.cpp b/osquery/devtools/shell.cpp
@@ -790,6 +790,8 @@ static int shell_exec(
   }
 
   while (zSql[0] && (SQLITE_OK == rc)) {
+    auto lock(dbc->attachLock());
+
     /* A lock for attaching virtual tables, but also the SQL object states. */
     rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zLeftover);
     if (SQLITE_OK != rc) {
diff --git a/osquery/sql/sqlite_util.cpp b/osquery/sql/sqlite_util.cpp
@@ -203,7 +203,7 @@ void SQLiteSQLPlugin::detach(const std::string& name) {
   if (!dbc->isPrimary()) {
     return;
   }
-  detachTableInternal(name, dbc->db());
+  detachTableInternal(name, dbc);
 }
 
 SQLiteDBInstance::SQLiteDBInstance(sqlite3*& db, Mutex& mtx)
@@ -251,6 +251,10 @@ bool SQLiteDBInstance::useCache() const {
   return use_cache_;
 }
 
+WriteLock SQLiteDBInstance::attachLock() const {
+  return WriteLock(attach_mutex_);
+}
+
 void SQLiteDBInstance::addAffectedTable(VirtualTableContent* table) {
   // An xFilter/scan was requested for this virtual table.
   affected_tables_.insert(std::make_pair(table->name, table));
diff --git a/osquery/sql/sqlite_util.h b/osquery/sql/sqlite_util.h
@@ -77,6 +77,9 @@ class SQLiteDBInstance : private boost::noncopyable {
   /// Check if the query requested use of the warm query cache.
   bool useCache() const;
 
+  /// Lock the database for attaching virtual tables.
+  WriteLock attachLock() const;
+
  private:
   /// Handle the primary/forwarding requests for table attribute accesses.
   TableAttributes getAttributes() const;
@@ -102,6 +105,9 @@ class SQLiteDBInstance : private boost::noncopyable {
   /// An attempted unique lock on the manager's primary database access mutex.
   WriteLock lock_;
 
+  /// Attaching can occur async from the registry APIs.
+  mutable Mutex attach_mutex_;
+
   /// Vector of tables that need their constraints cleared after execution.
   std::map<std::string, VirtualTableContent*> affected_tables_;
 
diff --git a/osquery/sql/virtual_table.cpp b/osquery/sql/virtual_table.cpp
@@ -624,7 +624,7 @@ Status attachTableInternal(const std::string& name,
 
   // Note, if the clientData API is used then this will save a registry call
   // within xCreate.
-  RecursiveLock lock(kAttachMutex);
+  auto lock(instance->attachLock());
   int rc = sqlite3_create_module(
       instance->db(), name.c_str(), &module, (void*)&(*instance));
   if (rc == SQLITE_OK || rc == SQLITE_MISUSE) {
@@ -637,10 +637,11 @@ Status attachTableInternal(const std::string& name,
   return Status(rc, getStringForSQLiteReturnCode(rc));
 }
 
-Status detachTableInternal(const std::string& name, sqlite3* db) {
-  RecursiveLock lock(kAttachMutex);
+Status detachTableInternal(const std::string& name,
+                           const SQLiteDBInstanceRef& instance) {
+  auto lock(instance->attachLock());
   auto format = "DROP TABLE IF EXISTS temp." + name;
-  int rc = sqlite3_exec(db, format.c_str(), nullptr, nullptr, 0);
+  int rc = sqlite3_exec(instance->db(), format.c_str(), nullptr, nullptr, 0);
   if (rc != SQLITE_OK) {
     LOG(ERROR) << "Error detaching table: " << name << " (" << rc << ")";
   }
@@ -655,7 +656,7 @@ Status attachFunctionInternal(
   // Hold the manager connection instance again in callbacks.
   auto dbc = SQLiteDBManager::get();
   // Add some shell-specific functions to the instance.
-  RecursiveLock lock(kAttachMutex);
+  auto lock(dbc->attachLock());
   int rc = sqlite3_create_function(
       dbc->db(),
       name.c_str(),
diff --git a/osquery/sql/virtual_table.h b/osquery/sql/virtual_table.h
@@ -84,7 +84,8 @@ Status attachTableInternal(const std::string& name,
                            const SQLiteDBInstanceRef& instance);
 
 /// Detach (drop) a table.
-Status detachTableInternal(const std::string& name, sqlite3* db);
+Status detachTableInternal(const std::string& name,
+                           const SQLiteDBInstanceRef& instance);
 
 Status attachFunctionInternal(
     const std::string& name,

Original file line number	Diff line number	Diff line change
`@@ -790,6 +790,8 @@ static int shell_exec(`
`790`	`790`	`}`
`791`	`791`
`792`	`792`	`while (zSql[0] && (SQLITE_OK == rc)) {`
	`793`	`+ auto lock(dbc->attachLock());`
	`794`	`+`
`793`	`795`	`/* A lock for attaching virtual tables, but also the SQL object states. */`
`794`	`796`	`rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zLeftover);`
`795`	`797`	`if (SQLITE_OK != rc) {`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ void SQLiteSQLPlugin::detach(const std::string& name) {`
`203`	`203`	`if (!dbc->isPrimary()) {`
`204`	`204`	`return;`
`205`	`205`	`}`
`206`		`- detachTableInternal(name, dbc->db());`
	`206`	`+ detachTableInternal(name, dbc);`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`SQLiteDBInstance::SQLiteDBInstance(sqlite3*& db, Mutex& mtx)`
`@@ -251,6 +251,10 @@ bool SQLiteDBInstance::useCache() const {`
`251`	`251`	`return use_cache_;`
`252`	`252`	`}`
`253`	`253`
	`254`	`+WriteLock SQLiteDBInstance::attachLock() const {`
	`255`	`+ return WriteLock(attach_mutex_);`
	`256`	`+}`
	`257`	`+`
`254`	`258`	`void SQLiteDBInstance::addAffectedTable(VirtualTableContent* table) {`
`255`	`259`	`// An xFilter/scan was requested for this virtual table.`
`256`	`260`	`affected_tables_.insert(std::make_pair(table->name, table));`