integration-test: replace macro with function

There's just no need for a macro here.
pull/796/head
Tamir Duberstein 1 year ago
parent 8cee3f8b01
commit ad460879ef
No known key found for this signature in database

@ -10,8 +10,17 @@ use aya_bpf::{
const RESULT_BUF_LEN: usize = 1024;
macro_rules! read_str_bytes {
($fun:ident, $ptr:expr, $len:expr $(,)?) => {
fn read_str_bytes(
fun: unsafe fn(*const u8, &mut [u8]) -> Result<&[u8], i64>,
iptr: Option<*const u8>,
ilen: Option<usize>,
) {
let Some(iptr) = iptr else {
return;
};
let Some(ilen) = ilen else {
return;
};
let Some(ptr) = RESULT.get_ptr_mut(0) else {
return;
};
@ -21,8 +30,8 @@ macro_rules! read_str_bytes {
};
*len = None;
// $len comes from ctx.arg(1) so it's dynamic and the verifier
// doesn't see any bounds. We do $len.min(RESULT_BUF_LEN) here to
// len comes from ctx.arg(1) so it's dynamic and the verifier
// doesn't see any bounds. We do len.min(RESULT_BUF_LEN) here to
// ensure that the verifier can see the upper bound, or you get:
//
// 18: (79) r7 = *(u64 *)(r7 +8) ; R7_w=scalar()
@ -31,12 +40,11 @@ macro_rules! read_str_bytes {
// R2_w=scalar(id=2,umax=9223372036854775807,var_off=(0x0; 0x7fffffffffffffff)) [snip]
// 28: (85) call bpf_probe_read_user_str#114
// R2 unbounded memory access, use 'var &= const' or 'if (var < const)'
let Some(buf) = buf.get_mut(..$len) else {
let Some(buf) = buf.get_mut(..ilen) else {
return;
};
*len = Some(unsafe { $fun($ptr, buf) }.map(<[_]>::len));
};
*len = Some(unsafe { fun(iptr, buf) }.map(<[_]>::len));
}
#[repr(C)]
@ -53,31 +61,22 @@ static KERNEL_BUFFER: Array<[u8; RESULT_BUF_LEN]> = Array::with_max_entries(1, 0
#[uprobe]
pub fn test_bpf_probe_read_user_str_bytes(ctx: ProbeContext) {
read_str_bytes!(
read_str_bytes(
bpf_probe_read_user_str_bytes,
match ctx.arg::<*const u8>(0) {
Some(p) => p,
_ => return,
},
match ctx.arg::<usize>(1) {
Some(p) => p,
_ => return,
},
ctx.arg::<*const u8>(0),
ctx.arg::<usize>(1),
);
}
#[uprobe]
pub fn test_bpf_probe_read_kernel_str_bytes(ctx: ProbeContext) {
read_str_bytes!(
read_str_bytes(
bpf_probe_read_kernel_str_bytes,
match KERNEL_BUFFER.get_ptr(0) {
Some(p) => p as *const u8,
_ => return,
},
match ctx.arg::<usize>(0) {
Some(p) => p,
_ => return,
},
KERNEL_BUFFER
.get_ptr(0)
.and_then(|ptr| unsafe { ptr.as_ref() })
.map(|buf| buf.as_ptr()),
ctx.arg::<usize>(0),
);
}

Loading…
Cancel
Save