Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-17 02:26:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add check for argc, arg_ptr and env_ptr in InitStackReader

Browse Source
This commit is contained in:
Marsman1996 2024-11-11 14:19:29 +08:00 committed by Tate, Hongliang Tian
parent 7fbe997bb3
commit 54e2ffbb71
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kernel/src/process/process_vm/init_stack/mod.rs
View File

@ -383,7 +383,12 @@ impl InitStackReader<'_> {
return_errno_with_message!(Errno::EACCES, "Page not accessible"); return_errno_with_message!(Errno::EACCES, "Page not accessible");
}; };
Ok(frame.read_val::<u64>(stack_base - page_base_addr)?) let argc = frame.read_val::<u64>(stack_base - page_base_addr)?;
if argc > MAX_ARGV_NUMBER as u64 {
return_errno_with_message!(Errno::EINVAL, "argc is corrupted");
}
Ok(argc)
} }
/// Reads argv from the process init stack /// Reads argv from the process init stack
@ -406,7 +411,14 @@ impl InitStackReader<'_> {
for _ in 0..argc { for _ in 0..argc {
let arg = { let arg = {
let arg_ptr = arg_ptr_reader.read_val::<Vaddr>()?; let arg_ptr = arg_ptr_reader.read_val::<Vaddr>()?;
let mut arg_reader = frame.reader().skip(arg_ptr - page_base_addr).to_fallible(); let arg_offset = arg_ptr
.checked_sub(page_base_addr)
.ok_or_else(|| Error::with_message(Errno::EINVAL, "arg_ptr is corrupted"))?;
let mut arg_reader = frame
.reader()
.skip(arg_offset)
.to_fallible()
.limit(MAX_ARG_LEN);
arg_reader.read_cstring()? arg_reader.read_cstring()?
}; };
argv.push(arg); argv.push(arg);
@ -446,7 +458,14 @@ impl InitStackReader<'_> {
break; break;
} }
let mut envp_reader = frame.reader().skip(envp_ptr - page_base_addr).to_fallible(); let envp_offset = envp_ptr
.checked_sub(page_base_addr)
.ok_or_else(|| Error::with_message(Errno::EINVAL, "envp is corrupted"))?;
let mut envp_reader = frame
.reader()
.skip(envp_offset)
.to_fallible()
.limit(MAX_ENV_LEN);
envp_reader.read_cstring()? envp_reader.read_cstring()?
}; };
envp.push(env); envp.push(env);