tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use a RwLock for DB_PATH"

Browse source
This commit is contained in:
Seth Moore 2021-05-11 22:14:49 +00:00 committed by Gerrit Code Review
commit 8a9352625f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
keystore2/src/globals.rs
View file

@ -39,7 +39,7 @@ use anyhow::{Context, Result};
use binder::FromIBinder;
use keystore2_vintf::get_aidl_instances;
use lazy_static::lazy_static;
use std::sync::{Arc, Mutex};
use std::sync::{Arc, Mutex, RwLock};
use std::{cell::RefCell, sync::Once};
use std::{collections::HashMap, path::Path, path::PathBuf};
@ -55,7 +55,7 @@ static DB_INIT: Once = Once::new();
/// database connection is created for the garbage collector worker.
pub fn create_thread_local_db() -> KeystoreDB {
let mut db = KeystoreDB::new(
&DB_PATH.lock().expect("Could not get the database directory."),
&DB_PATH.read().expect("Could not get the database directory."),
Some(GC.clone()),
)
.expect("Failed to open database.");
@ -139,7 +139,7 @@ impl RemotelyProvisionedDevicesMap {
lazy_static! {
/// The path where keystore stores all its keys.
pub static ref DB_PATH: Mutex<PathBuf> = Mutex::new(
pub static ref DB_PATH: RwLock<PathBuf> = RwLock::new(
Path::new("/data/misc/keystore").to_path_buf());
/// Runtime database of unwrapped super keys.
pub static ref SUPER_KEY: Arc<SuperKeyManager> = Default::default();
@ -157,7 +157,7 @@ lazy_static! {
/// LegacyBlobLoader is initialized and exists globally.
/// The same directory used by the database is used by the LegacyBlobLoader as well.
pub static ref LEGACY_BLOB_LOADER: Arc<LegacyBlobLoader> = Arc::new(LegacyBlobLoader::new(
&DB_PATH.lock().expect("Could not get the database path for legacy blob loader.")));
&DB_PATH.read().expect("Could not get the database path for legacy blob loader.")));
/// Legacy migrator. Atomically migrates legacy blobs to the database.
pub static ref LEGACY_MIGRATOR: Arc<LegacyMigrator> =
Arc::new(LegacyMigrator::new(Arc::new(Default::default())));
@ -173,7 +173,7 @@ lazy_static! {
map_km_error(km_dev.deleteKey(&*blob))
.context("In invalidate key closure: Trying to invalidate key blob.")
}),
KeystoreDB::new(&DB_PATH.lock().expect("Could not get the database directory."), None)
KeystoreDB::new(&DB_PATH.read().expect("Could not get the database directory."), None)
.expect("Failed to open database."),
SUPER_KEY.clone(),
)

4
keystore2/src/keystore2_main.rs
View file

@ -56,7 +56,7 @@ fn main() {
// For the ground truth check the service startup rule for init (typically in keystore2.rc).
let id_rotation_state = if let Some(dir) = args.next() {
let db_path = Path::new(&dir);
*keystore2::globals::DB_PATH.lock().expect("Could not lock DB_PATH.") =
*keystore2::globals::DB_PATH.write().expect("Could not lock DB_PATH.") =
db_path.to_path_buf();
IdRotationState::new(&db_path)
} else {
@ -121,7 +121,7 @@ fn main() {
}
let vpnprofilestore = VpnProfileStore::new_native_binder(
&keystore2::globals::DB_PATH.lock().expect("Could not get DB_PATH."),
&keystore2::globals::DB_PATH.read().expect("Could not get DB_PATH."),
);
binder::add_service(VPNPROFILESTORE_SERVICE_NAME, vpnprofilestore.as_binder()).unwrap_or_else(
|e| {