Add --fail-path #4
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MikailBag
requested changes
Apr 11, 2020
|
|
||
| struct ChildInfo { | ||
| in_syscall: bool, | ||
| } | ||
|
|
||
| fn decode_syscall_args(regs: libc::user_regs_struct) -> RawSyscall { | ||
| fn decode_syscall_args(regs: &libc::user_regs_struct) -> RawSyscall { |
There was a problem hiding this comment.
needless reference here, because this struct implements Copy.
| @@ -21,3 +21,4 @@ anyhow = "1.0.14" | |||
| rstack = {version = "0.3.1", default-features = false, features = ["unwind"]} | |||
| rustc-demangle = "0.1.16" | |||
| cpp_demangle = "0.2.13" | |||
| rand = "" | |||
There was a problem hiding this comment.
Suggested change
| rand = "" | |
| rand = "0.7.3" |
| @@ -196,6 +199,10 @@ fn main() -> anyhow::Result<()> { | |||
| eprintln!("executable not provided"); | |||
| exit(1); | |||
| } | |||
| opt.fail_path = match opt.fail_path { | |||
| Some(path) => std::fs::canonicalize(path).ok(), | |||
| }; | ||
| children.insert(pid.as_raw() as u32, ci2); | ||
| let mut regs = regs; | ||
| regs.rax = 39 /*getpid*/; |
There was a problem hiding this comment.
add comments that describe what's happening here
| let mut out = RawSyscall { | ||
| syscall_id: 0, | ||
| args: [0; 6], | ||
| ret: 0, | ||
| }; | ||
| out.ret = regs.rax; | ||
| out.syscall_id = regs.orig_rax; | ||
| out.syscall_id = regs.orig_rax & 0xffffffu64; |
|
|
||
| fn return_eio(pid: Pid, regs: &mut libc::user_regs_struct, syscall: u64) -> Result<(), nix::Error> { | ||
| regs.orig_rax = syscall; | ||
| regs.rax = -(nix::errno::Errno::EIO as i32 as i64) as u64; |
| let def = magic.lookup_syscall_by_id(SyscallId(params.syscall_id as u32)); | ||
| let child_pid = Pid::from_raw(pid as i32); | ||
| let mut decoded_params = match def { | ||
| Some(def) => process_syscall(¶ms, child_pid, magic, def), | ||
| None => None, | ||
| }; | ||
| if started_syscall && decoded_params.is_some() && (params.syscall_id == 2 /*open*/ || params.syscall_id == 257 /*openat*/) { //TODO: x86_64 only |
There was a problem hiding this comment.
Add some comment that describes what this if does.
Also, you should skip this entire if if fail_path is disabled:
if let Some(fail_path) = &setting.fail_path {
// ...
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.