-
Notifications
You must be signed in to change notification settings - Fork 300
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Lsm cgroup api #1135
base: main
Are you sure you want to change the base?
Lsm cgroup api #1135
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
use std::borrow::Cow; | ||
|
||
use proc_macro2::TokenStream; | ||
use quote::quote; | ||
use syn::{ItemFn, Result}; | ||
|
||
use crate::args::{err_on_unknown_args, pop_string_arg}; | ||
|
||
pub(crate) struct LsmCgroup { | ||
item: ItemFn, | ||
hook: Option<String>, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Aside: I just noticed that the LSM_CGROUP section name format is Kernel selftests indicate it's the same as |
||
} | ||
|
||
impl LsmCgroup { | ||
pub(crate) fn parse(attrs: TokenStream, item: TokenStream) -> Result<Self> { | ||
let item = syn::parse2(item)?; | ||
let mut args = syn::parse2(attrs)?; | ||
let hook = pop_string_arg(&mut args, "hook"); | ||
err_on_unknown_args(&args)?; | ||
|
||
Ok(Self { item, hook }) | ||
} | ||
|
||
pub(crate) fn expand(&self) -> TokenStream { | ||
let Self { item, hook } = self; | ||
let ItemFn { | ||
attrs: _, | ||
vis, | ||
sig, | ||
block: _, | ||
} = item; | ||
let section_prefix = "lsm_cgroup"; | ||
let section_name: Cow<'_, _> = if let Some(name) = hook { | ||
format!("{}/{}", section_prefix, name).into() | ||
} else { | ||
section_prefix.into() | ||
}; | ||
let fn_name = &sig.ident; | ||
// LSM probes need to return an integer corresponding to the correct | ||
// policy decision. Therefore we do not simply default to a return value | ||
// of 0 as in other program types. | ||
quote! { | ||
#[no_mangle] | ||
#[link_section = #section_name] | ||
#vis fn #fn_name(ctx: *mut ::core::ffi::c_void) -> i32 { | ||
return #fn_name(::aya_ebpf::programs::LsmContext::new(ctx)); | ||
|
||
#item | ||
} | ||
} | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use syn::parse_quote; | ||
|
||
use super::*; | ||
|
||
#[test] | ||
fn test_lsm_cgroup() { | ||
let prog = LsmCgroup::parse( | ||
parse_quote! { | ||
hook = "bprm_committed_creds", | ||
}, | ||
parse_quote! { | ||
fn bprm_committed_creds(ctx: &mut ::aya_ebpf::programs::LsmContext) -> i32 { | ||
0 | ||
} | ||
}, | ||
) | ||
.unwrap(); | ||
let expanded = prog.expand(); | ||
let expected = quote! { | ||
#[no_mangle] | ||
#[link_section = "lsm_cgroup/bprm_committed_creds"] | ||
fn bprm_committed_creds(ctx: *mut ::core::ffi::c_void) -> i32 { | ||
return bprm_committed_creds(::aya_ebpf::programs::LsmContext::new(ctx)); | ||
|
||
fn bprm_committed_creds(ctx: &mut ::aya_ebpf::programs::LsmContext) -> i32 { | ||
0 | ||
} | ||
} | ||
}; | ||
assert_eq!(expected.to_string(), expanded.to_string()); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,8 +30,9 @@ use crate::{ | |
programs::{ | ||
BtfTracePoint, CgroupDevice, CgroupSkb, CgroupSkbAttachType, CgroupSock, CgroupSockAddr, | ||
CgroupSockopt, CgroupSysctl, Extension, FEntry, FExit, Iter, KProbe, LircMode2, Lsm, | ||
PerfEvent, ProbeKind, Program, ProgramData, ProgramError, RawTracePoint, SchedClassifier, | ||
SkLookup, SkMsg, SkSkb, SkSkbKind, SockOps, SocketFilter, TracePoint, UProbe, Xdp, | ||
LsmCgroup, PerfEvent, ProbeKind, Program, ProgramData, ProgramError, RawTracePoint, | ||
SchedClassifier, SkLookup, SkMsg, SkSkb, SkSkbKind, SockOps, SocketFilter, TracePoint, | ||
UProbe, Xdp, | ||
}, | ||
sys::{ | ||
bpf_load_btf, is_bpf_cookie_supported, is_bpf_global_data_supported, | ||
|
@@ -412,6 +413,7 @@ impl<'a> EbpfLoader<'a> { | |
| ProgramSection::FEntry { sleepable: _ } | ||
| ProgramSection::FExit { sleepable: _ } | ||
| ProgramSection::Lsm { sleepable: _ } | ||
| ProgramSection::LsmCgroup | ||
| ProgramSection::BtfTracePoint | ||
| ProgramSection::Iter { sleepable: _ } => { | ||
return Err(EbpfError::BtfError(err)) | ||
|
@@ -649,14 +651,17 @@ impl<'a> EbpfLoader<'a> { | |
ProgramSection::RawTracePoint => Program::RawTracePoint(RawTracePoint { | ||
data: ProgramData::new(prog_name, obj, btf_fd, *verifier_log_level), | ||
}), | ||
ProgramSection::Lsm { sleepable } => { | ||
ProgramSection::Lsm { sleepable , .. } => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Undo this please. |
||
let mut data = | ||
ProgramData::new(prog_name, obj, btf_fd, *verifier_log_level); | ||
if *sleepable { | ||
data.flags = BPF_F_SLEEPABLE; | ||
} | ||
Program::Lsm(Lsm { data }) | ||
} | ||
ProgramSection::LsmCgroup => Program::LsmCgroup(LsmCgroup { | ||
data: ProgramData::new(prog_name, obj, btf_fd, *verifier_log_level) | ||
}), | ||
ProgramSection::BtfTracePoint => Program::BtfTracePoint(BtfTracePoint { | ||
data: ProgramData::new(prog_name, obj, btf_fd, *verifier_log_level), | ||
}), | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,6 @@ | ||
//! LSM probes. | ||
|
||
use crate::{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Restore. |
||
generated::{bpf_attach_type::BPF_LSM_MAC, bpf_prog_type::BPF_PROG_TYPE_LSM}, | ||
generated::{bpf_prog_type::BPF_PROG_TYPE_LSM, bpf_attach_type::BPF_LSM_MAC}, | ||
obj::btf::{Btf, BtfKind}, | ||
programs::{ | ||
define_link_wrapper, load_program, utils::attach_raw_tracepoint, FdLink, FdLinkId, | ||
|
@@ -24,7 +23,7 @@ use crate::{ | |
/// The minimum kernel version required to use this feature is 5.7. | ||
/// | ||
/// # Examples | ||
/// | ||
/// ## LSM with MAC attachment type | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please remove |
||
/// ```no_run | ||
/// # #[derive(thiserror::Error, Debug)] | ||
/// # enum LsmError { | ||
|
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,105 @@ | ||||||
//! LSM probes. | ||||||
|
||||||
use std::os::fd::AsFd; | ||||||
|
||||||
use crate::{ | ||||||
generated::{bpf_prog_type::BPF_PROG_TYPE_LSM, bpf_attach_type::BPF_LSM_CGROUP}, | ||||||
obj::btf::{Btf, BtfKind}, | ||||||
programs::{define_link_wrapper, load_program, FdLink, FdLinkId, ProgramData, ProgramError}, | ||||||
sys::{bpf_link_create, BpfLinkCreateArgs, LinkTarget, SyscallError}, | ||||||
}; | ||||||
|
||||||
/// A program that attaches to Linux LSM hooks with per-cgroup attachment type. Used to implement security policy and | ||||||
/// audit logging. | ||||||
/// | ||||||
/// LSM probes can be attached to the kernel's [security hooks][1] to implement mandatory | ||||||
/// access control policy and security auditing. | ||||||
/// | ||||||
/// LSM probes require a kernel compiled with `CONFIG_BPF_LSM=y` and `CONFIG_DEBUG_INFO_BTF=y`. | ||||||
/// In order for the probes to fire, you also need the BPF LSM to be enabled through your | ||||||
/// kernel's boot paramters (like `lsm=lockdown,yama,bpf`). | ||||||
/// | ||||||
/// # Minimum kernel version | ||||||
/// | ||||||
/// The minimum kernel version required to use this feature is 6.0. | ||||||
/// | ||||||
/// # Examples | ||||||
/// | ||||||
/// ```no_run | ||||||
/// # #[derive(thiserror::Error, Debug)] | ||||||
/// # enum LsmError { | ||||||
/// # #[error(transparent)] | ||||||
/// # BtfError(#[from] aya::BtfError), | ||||||
/// # #[error(transparent)] | ||||||
/// # Program(#[from] aya::programs::ProgramError), | ||||||
/// # #[error(transparent)] | ||||||
/// # Ebpf(#[from] aya::EbpfError), | ||||||
/// # } | ||||||
/// # let mut bpf = Ebpf::load_file("ebpf_programs.o")?; | ||||||
/// use aya::{Ebpf, programs::LsmCgroup, BtfError, Btf}; | ||||||
/// use std::fs::File; | ||||||
/// | ||||||
/// let btf = Btf::from_sys_fs()?; | ||||||
/// let file = File::open("/sys/fs/cgroup/unified")?; | ||||||
/// let program: &mut LsmCgroup = bpf.program_mut("lsm_prog").unwrap().try_into()?; | ||||||
/// program.load("security_bprm_exec", &btf)?; | ||||||
/// program.attach(file)?; | ||||||
/// # Ok::<(), LsmError>(()) | ||||||
/// ``` | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think you might need a newline after the end of the code block. |
||||||
/// | ||||||
/// [1]: https://elixir.bootlin.com/linux/latest/source/include/linux/lsm_hook_defs.h | ||||||
#[derive(Debug)] | ||||||
#[doc(alias = "BPF_PROG_TYPE_LSM")] | ||||||
pub struct LsmCgroup { | ||||||
pub(crate) data: ProgramData<LsmLink>, | ||||||
} | ||||||
|
||||||
impl LsmCgroup { | ||||||
/// Loads the program inside the kernel. | ||||||
/// | ||||||
/// # Arguments | ||||||
/// | ||||||
/// * `lsm_hook_name` - full name of the LSM hook that the program should | ||||||
/// be attached to | ||||||
pub fn load(&mut self, lsm_hook_name: &str, btf: &Btf) -> Result<(), ProgramError> { | ||||||
self.data.expected_attach_type = Some(BPF_LSM_CGROUP); | ||||||
let type_name = format!("bpf_lsm_{lsm_hook_name}"); | ||||||
self.data.attach_btf_id = | ||||||
Some(btf.id_by_type_name_kind(type_name.as_str(), BtfKind::Func)?); | ||||||
load_program(BPF_PROG_TYPE_LSM, &mut self.data) | ||||||
} | ||||||
|
||||||
/// Attaches the program. | ||||||
/// | ||||||
/// The returned value can be used to detach, see [LsmCgroup::detach]. | ||||||
pub fn attach<T: AsFd>(&mut self, cgroup: T) -> Result<LsmLinkId, ProgramError> { | ||||||
let prog_fd = self.fd()?; | ||||||
let prog_fd = prog_fd.as_fd(); | ||||||
let cgroup_fd = cgroup.as_fd(); | ||||||
let attach_type = self.data.expected_attach_type.unwrap(); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
let btf_id = self.data.attach_btf_id.ok_or(ProgramError::NotLoaded)?; | ||||||
let link_fd = bpf_link_create( | ||||||
prog_fd, | ||||||
LinkTarget::Fd(cgroup_fd), | ||||||
attach_type, | ||||||
0, | ||||||
Some(BpfLinkCreateArgs::TargetBtfId(btf_id)), | ||||||
) | ||||||
.map_err(|(_, io_error)| SyscallError { | ||||||
call: "bpf_link_create", | ||||||
io_error, | ||||||
})?; | ||||||
|
||||||
self.data.links.insert(LsmLink::new(FdLink::new(link_fd))) | ||||||
} | ||||||
} | ||||||
|
||||||
define_link_wrapper!( | ||||||
/// The link used by [LsmCgroup] programs. | ||||||
LsmLink, | ||||||
/// The type returned by [LsmCgroup::attach]. Can be passed to [LsmCgroup::detach]. | ||||||
LsmLinkId, | ||||||
FdLink, | ||||||
FdLinkId, | ||||||
LsmCgroup, | ||||||
); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also no need to move this line.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry but i didnt understand the problem on this one, can you elobarate on this ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just undo this change.