Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change when proc->cmdline is set in exec

Browse Source
This commit is contained in:
Kevin Lange 2017-01-08 19:42:54 +09:00
parent e98a4a3785
commit 77e5c5c943
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/misc/elf.c
View File

@ -27,11 +27,6 @@ int exec_elf(char * path, fs_node_t * file, int argc, char ** argv, char ** env,
return -1;
}
if (!interp) {
current_process->name = strdup(path);
current_process->cmdline = argv;
}
if (file->mask & 0x800) {
debug_print(WARNING, "setuid binary executed [%s, uid:%d]", file->name, file->uid);
current_process->user = file->uid;
@ -277,6 +272,8 @@ int exec(
debug_print(WARNING, "First four bytes: %c%c%c%c", head[0], head[1], head[2], head[3]);
current_process->name = strdup(path);
for (unsigned int i = 0; i < sizeof(fmts) / sizeof(exec_def_t); ++i) {
if (matches(fmts[i].bytes, head, fmts[i].match)) {
debug_print(WARNING, "Matched executor: %s", fmts[i].name);
@ -305,6 +302,9 @@ system(
set_process_environment((process_t*)current_process, clone_directory(current_directory));
current_directory = current_process->thread.page_directory;
switch_page_directory(current_directory);
current_process->cmdline = argv_;
exec(path,argc,argv_,env);
debug_print(ERROR, "Failed to execute process!");
kexit(-1);

2
kernel/sys/syscall.c
View File

@ -248,6 +248,8 @@ static int sys_execve(const char * filename, char *const argv[], char *const env
debug_print(INFO,"Releasing all shmem regions...");
shm_release_all((process_t *)current_process);
current_process->cmdline = argv_;
debug_print(INFO,"Executing...");
/* Discard envp */
exec((char *)filename, argc, (char **)argv_, (char **)envp_);