kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

main: logger: capture local timezone before seccomp

Browse Source 
Local-time log fields called `jiff::Zoned::now()`, which resolves the
system timezone on every record by reading
`/etc/localtime`/`/etc/timezone` if it doesn't hit the cached version.
This cache miss could then cause a seccomp violation depending on the
thread it was run from.

Avoid this by capturing the value in `Logger`. This avoids opening the
seccomp filter for the whole process.

Signed-off-by: Dylan Reid <dgreid@fb.com>
This commit is contained in:
Dylan Reid
2026-06-03 09:36:11 -07:00
committed by Rob Bradford
parent 56e891a405
commit b88d5de85e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cloud-hypervisor/src/logger.rs
View File

@@ -8,6 +8,7 @@ use std::str::FromStr;
use std::sync::Mutex;
use std::time::Instant;
use jiff::tz::TimeZone;
use thiserror::Error;
#[derive(Debug, Error)]
@@ -185,6 +186,9 @@ pub struct Logger {
start: Instant,
pid: u32,
tokens: Vec<Token>,
// Saving the timezone when Logger is constructed avoids potential seccomp violations when the
// internal libc timezone cache expires as the affected thread is unpredictable.
local_tz: TimeZone,
}
impl Logger {
@@ -194,6 +198,7 @@ impl Logger {
start: Instant::now(),
pid: std::process::id(),
tokens: parse_format(format)?,
local_tz: TimeZone::try_system().unwrap_or(TimeZone::UTC),
})
}
}
@@ -232,7 +237,9 @@ impl log::Log for Logger {
write!(&mut *out, "{}", zoned.strftime("%m%d %H:%M:%S%.6f"))
}
Token::LocalGlog => {
let zoned = zoned_local.get_or_insert_with(jiff::Zoned::now);
let zoned = zoned_local.get_or_insert_with(|| {
jiff::Timestamp::now().to_zoned(self.local_tz.clone())
});
write!(&mut *out, "{}", zoned.strftime("%m%d %H:%M:%S%.6f"))
}
Token::Pid => write!(&mut *out, "{}", self.pid),
@@ -255,7 +262,9 @@ impl log::Log for Logger {
Zone::Utc => zoned_utc.get_or_insert_with(|| {
jiff::Timestamp::now().to_zoned(jiff::tz::TimeZone::UTC)
}),
Zone::Local => zoned_local.get_or_insert_with(jiff::Zoned::now),
Zone::Local => zoned_local.get_or_insert_with(|| {
jiff::Timestamp::now().to_zoned(self.local_tz.clone())
}),
};
write_time_field(&mut *out, *field, zoned)
}