Use zalloc for processor/message-queue/coordinator

An additional layer which protects us against edge cases with Zeroizing (objects which don't support it or don't miss it).
serai-dex · Jan 1, 2024 · 8bd2a0f · 8bd2a0f
1 parent 7d2c47f
commit 8bd2a0f
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/coordinator/Cargo.toml b/coordinator/Cargo.toml
@@ -32,6 +32,7 @@ frost-schnorrkel = { path = "../crypto/schnorrkel" }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["std", "derive"] }
 
+zalloc = { path = "../common/zalloc" }
 serai-db = { path = "../common/db" }
 serai-env = { path = "../common/env" }
 

diff --git a/coordinator/src/main.rs b/coordinator/src/main.rs
@@ -63,6 +63,10 @@ use cosign_evaluator::CosignEvaluator;
 #[cfg(test)]
 pub mod tests;
 
+#[global_allocator]
+static ALLOCATOR: zalloc::ZeroizingAlloc<std::alloc::System> =
+ zalloc::ZeroizingAlloc(std::alloc::System);
+
 #[derive(Clone)]
 pub struct ActiveTributary<D: Db, P: P2p> {
  pub spec: TributarySpec,

diff --git a/message-queue/Cargo.toml b/message-queue/Cargo.toml
@@ -40,6 +40,7 @@ env_logger = { version = "0.10", default-features = false, features = ["humantim
 # Uses a single threaded runtime since this shouldn't ever be CPU-bound
 tokio = { version = "1", default-features = false, features = ["rt", "time", "io-util", "net", "macros"] }
 
+zalloc = { path = "../common/zalloc" }
 serai-db = { path = "../common/db", optional = true }
 
 serai-env = { path = "../common/env" }

diff --git a/message-queue/src/main.rs b/message-queue/src/main.rs
@@ -1,6 +1,3 @@
-mod messages;
-mod queue;
-
 pub(crate) use std::{
  sync::{Arc, RwLock},
  collections::HashMap,
@@ -38,6 +35,13 @@ mod clippy {
 }
 pub(crate) use self::clippy::*;
 
+mod messages;
+mod queue;
+
+#[global_allocator]
+static ALLOCATOR: zalloc::ZeroizingAlloc<std::alloc::System> =
+ zalloc::ZeroizingAlloc(std::alloc::System);
+
 // queue RPC method
 /*
  Queues a message to be delivered from a processor to a coordinator, or vice versa.

diff --git a/processor/Cargo.toml b/processor/Cargo.toml
@@ -54,6 +54,7 @@ log = { version = "0.4", default-features = false, features = ["std"] }
 env_logger = { version = "0.10", default-features = false, features = ["humantime"], optional = true }
 tokio = { version = "1", default-features = false, features = ["rt-multi-thread", "sync", "time", "macros"] }
 
+zalloc = { path = "../common/zalloc" }
 serai-db = { path = "../common/db", optional = true }
 serai-env = { path = "../common/env", optional = true }
 # TODO: Replace with direct usage of primitives

diff --git a/processor/src/main.rs b/processor/src/main.rs
@@ -61,6 +61,10 @@ use multisigs::{MultisigEvent, MultisigManager};
 #[cfg(test)]
 mod tests;
 
+#[global_allocator]
+static ALLOCATOR: zalloc::ZeroizingAlloc<std::alloc::System> =
+ zalloc::ZeroizingAlloc(std::alloc::System);
+
 // Items which are mutably borrowed by Tributary.
 // Any exceptions to this have to be carefully monitored in order to ensure consistency isn't
 // violated.