yanguangshaonian
/
aya
mirror of https://github.com/aya-rs/aya
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

aya-obj: use generated constants

Browse Source
reviewable/pr1169/r1
Tamir Duberstein 3 weeks ago
parent e82253c915
commit 94c857261a
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File

38
aya-obj/src/obj.rs
Unescape Escape View File

@ -22,8 +22,8 @@ use crate::{
Array, Btf, BtfError, BtfExt, BtfFeatures, BtfType, DataSecEntry, FuncSecInfo, LineSecInfo, Array, Btf, BtfError, BtfExt, BtfFeatures, BtfType, DataSecEntry, FuncSecInfo, LineSecInfo,
}, },
generated::{ generated::{
bpf_insn, bpf_map_info, bpf_map_type::BPF_MAP_TYPE_ARRAY, BPF_CALL, BPF_F_RDONLY_PROG, bpf_func_id::*, bpf_insn, bpf_map_info, bpf_map_type::BPF_MAP_TYPE_ARRAY, BPF_CALL,
BPF_JMP, BPF_K, BPF_F_RDONLY_PROG, BPF_JMP, BPF_K,
}, },
maps::{bpf_map_def, BtfMap, BtfMapDef, LegacyMap, Map, PinningType, MINIMUM_MAP_SIZE}, maps::{bpf_map_def, BtfMap, BtfMapDef, LegacyMap, Map, PinningType, MINIMUM_MAP_SIZE},
programs::{ programs::{
@ -908,13 +908,6 @@ fn insn_is_helper_call(ins: &bpf_insn) -> bool {
klass == BPF_JMP && op == BPF_CALL && src == BPF_K && ins.src_reg() == 0 && ins.dst_reg() == 0 klass == BPF_JMP && op == BPF_CALL && src == BPF_K && ins.src_reg() == 0 && ins.dst_reg() == 0
} }
const BPF_FUNC_PROBE_READ: i32 = 4;
const BPF_FUNC_PROBE_READ_STR: i32 = 45;
const BPF_FUNC_PROBE_READ_USER: i32 = 112;
const BPF_FUNC_PROBE_READ_KERNEL: i32 = 113;
const BPF_FUNC_PROBE_READ_USER_STR: i32 = 114;
const BPF_FUNC_PROBE_READ_KERNEL_STR: i32 = 115;
impl Function { impl Function {
fn sanitize(&mut self, features: &Features) { fn sanitize(&mut self, features: &Features) {
for inst in &mut self.instructions { for inst in &mut self.instructions {
@ -922,18 +915,23 @@ impl Function {
continue; continue;
} }
match inst.imm { if !features.bpf_probe_read_kernel {
BPF_FUNC_PROBE_READ_USER | BPF_FUNC_PROBE_READ_KERNEL const BPF_FUNC_PROBE_READ_KERNEL: i32 = BPF_FUNC_probe_read_kernel as i32;
if !features.bpf_probe_read_kernel => const BPF_FUNC_PROBE_READ_USER: i32 = BPF_FUNC_probe_read_user as i32;
{ const BPF_FUNC_PROBE_READ: i32 = BPF_FUNC_probe_read as i32;
inst.imm = BPF_FUNC_PROBE_READ; const BPF_FUNC_PROBE_READ_KERNEL_STR: i32 = BPF_FUNC_probe_read_kernel_str as i32;
} const BPF_FUNC_PROBE_READ_USER_STR: i32 = BPF_FUNC_probe_read_user_str as i32;
BPF_FUNC_PROBE_READ_USER_STR | BPF_FUNC_PROBE_READ_KERNEL_STR const BPF_FUNC_PROBE_READ_STR: i32 = BPF_FUNC_probe_read_str as i32;
if !features.bpf_probe_read_kernel =>
{ match inst.imm {
inst.imm = BPF_FUNC_PROBE_READ_STR; BPF_FUNC_PROBE_READ_KERNEL | BPF_FUNC_PROBE_READ_USER => {
inst.imm = BPF_FUNC_PROBE_READ;
}
BPF_FUNC_PROBE_READ_KERNEL_STR | BPF_FUNC_PROBE_READ_USER_STR => {
inst.imm = BPF_FUNC_PROBE_READ_STR;
}
_ => {}
} }
_ => {}
} }
} }
} }

Write Preview
Loading…
Cancel
Save