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

Merge "Fix keystore2 crash counting" am: 1600dc1a47 am: 91a058df4e am: 639911cd0e

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2610327

Change-Id: Id5c2adf15ca30794fc5b9e5e80863c6a6af6c987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-06-05 18:38:00 +00:00 committed by Automerger Merge Worker
commit bef0ff4f5a
1 changed files with 30 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
keystore2/src/metrics_store.rs
View file

@ -43,9 +43,8 @@ use android_security_metrics::aidl::android::security::metrics::{
RkpError::RkpError as MetricsRkpError, RkpErrorStats::RkpErrorStats, RkpError::RkpError as MetricsRkpError, RkpErrorStats::RkpErrorStats,
SecurityLevel::SecurityLevel as MetricsSecurityLevel, Storage::Storage as MetricsStorage, SecurityLevel::SecurityLevel as MetricsSecurityLevel, Storage::Storage as MetricsStorage,
}; };
use anyhow::{Context, Result}; use anyhow::{anyhow, Context, Result};
use lazy_static::lazy_static; use lazy_static::lazy_static;
use rustutils::system_properties::PropertyWatcherError;
use std::collections::HashMap; use std::collections::HashMap;
use std::sync::Mutex; use std::sync::Mutex;
@ -93,12 +92,15 @@ impl MetricsStore {
// Process keystore crash stats. // Process keystore crash stats.
if AtomID::CRASH_STATS == atom_id { if AtomID::CRASH_STATS == atom_id {
return Ok(vec![KeystoreAtom { return match read_keystore_crash_count()? {
payload: KeystoreAtomPayload::CrashStats(CrashStats { Some(count) => Ok(vec![KeystoreAtom {
count_of_crash_events: read_keystore_crash_count()?, payload: KeystoreAtomPayload::CrashStats(CrashStats {
}), count_of_crash_events: count,
..Default::default() }),
}]); ..Default::default()
}]),
None => Err(anyhow!("Crash count property is not set")),
};
} }
// It is safe to call unwrap here since the lock can not be poisoned based on its usage // It is safe to call unwrap here since the lock can not be poisoned based on its usage
@ -564,27 +566,21 @@ pub fn log_rkp_error_stats(rkp_error: MetricsRkpError, sec_level: &SecurityLevel
/// If the property is absent, it sets the property with value 0. If the property is present, it /// If the property is absent, it sets the property with value 0. If the property is present, it
/// increments the value. This helps tracking keystore crashes internally. /// increments the value. This helps tracking keystore crashes internally.
pub fn update_keystore_crash_sysprop() { pub fn update_keystore_crash_sysprop() {
let crash_count = read_keystore_crash_count(); let new_count = match read_keystore_crash_count() {
let new_count = match crash_count { Ok(Some(count)) => count + 1,
Ok(count) => count + 1, // If the property is absent, then this is the first start up during the boot.
// Proceed to write the system property with value 0.
Ok(None) => 0,
Err(error) => { Err(error) => {
// If the property is absent, this is the first start up during the boot. log::warn!(
// Proceed to write the system property with value 0. Otherwise, log and return. concat!(
if !matches!( "In update_keystore_crash_sysprop: ",
error.root_cause().downcast_ref::<PropertyWatcherError>(), "Failed to read the existing system property due to: {:?}.",
Some(PropertyWatcherError::SystemPropertyAbsent) "Therefore, keystore crashes will not be logged."
) { ),
log::warn!( error
concat!( );
"In update_keystore_crash_sysprop: ", return;
"Failed to read the existing system property due to: {:?}.",
"Therefore, keystore crashes will not be logged."
),
error
);
return;
}
0
} }
}; };
@ -602,12 +598,12 @@ pub fn update_keystore_crash_sysprop() {
} }
/// Read the system property: keystore.crash_count. /// Read the system property: keystore.crash_count.
pub fn read_keystore_crash_count() -> Result<i32> { pub fn read_keystore_crash_count() -> Result<Option<i32>> {
rustutils::system_properties::read("keystore.crash_count") match rustutils::system_properties::read("keystore.crash_count") {
.context(ks_err!("Failed read property."))? Ok(Some(count)) => count.parse::<i32>().map(Some).map_err(std::convert::Into::into),
.context(ks_err!("Property not set."))? Ok(None) => Ok(None),
.parse::<i32>() Err(e) => Err(e).context(ks_err!("Failed to read crash count property.")),
.map_err(std::convert::Into::into) }
} }
/// Enum defining the bit position for each padding mode. Since padding mode can be repeatable, it /// Enum defining the bit position for each padding mode. Since padding mode can be repeatable, it