Skip to content
This repository was archived by the owner on Mar 7, 2021. It is now read-only.

Require KernelModule to be Sync #54

Merged
merged 3 commits into from
Jun 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ macro_rules! kernel_module {
};
}

pub trait KernelModule: Sized {
pub trait KernelModule: Sized + Sync {
fn init() -> KernelResult<Self>;
}

Expand Down
16 changes: 10 additions & 6 deletions src/sysctl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ use error;
use types;
use user_ptr::{UserSlicePtr, UserSlicePtrWriter};

pub struct Sysctl<T: SysctlStorage> {
inner: Box<T>,
table: Box<[bindings::ctl_table]>,
header: *mut bindings::ctl_table_header,
}

pub trait SysctlStorage: Sync {
fn store_value(&self, data: &[u8]) -> (usize, error::KernelResult<()>);
fn read_value(&self, data: &mut UserSlicePtrWriter) -> (usize, error::KernelResult<()>);
Expand Down Expand Up @@ -60,6 +54,16 @@ impl SysctlStorage for atomic::AtomicBool {
}
}

pub struct Sysctl<T: SysctlStorage> {
inner: Box<T>,
table: Box<[bindings::ctl_table]>,
header: *mut bindings::ctl_table_header,
}

// This is safe because the only public method we have is get(), which returns
// &T, and T: Sync. Any new methods must adhere to this requirement.
unsafe impl<T: SysctlStorage> Sync for Sysctl<T> {}

unsafe extern "C" fn proc_handler<T: SysctlStorage>(
ctl: *mut bindings::ctl_table,
write: c_types::c_int,
Expand Down