gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When envp is NULL, execve is delayed.

Browse Source
This commit is contained in:
Tomoki Shirasawa
2015-08-28 13:00:45 +09:00
parent 9ae5bcf46e
commit afeee5432f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
executer/kernel/binfmt_mcexec.c
View File

@ -81,6 +81,8 @@ static int load_elf(struct linux_binprm *bprm
int l; int l;
int pass; int pass;
if(bprm->envc == 0)
return -ENOEXEC;
if(memcmp(elf_ex->e_ident, ELFMAG, SELFMAG) != 0) if(memcmp(elf_ex->e_ident, ELFMAG, SELFMAG) != 0)
return -ENOEXEC; return -ENOEXEC;
if(elf_ex->e_type != ET_EXEC && elf_ex->e_type != ET_DYN) if(elf_ex->e_type != ET_EXEC && elf_ex->e_type != ET_DYN)
@ -100,7 +102,7 @@ static int load_elf(struct linux_binprm *bprm
cnt[1] = bprm->envc; cnt[1] = bprm->envc;
for(pass = 0; pass < 2; pass++){ for(pass = 0; pass < 2; pass++){
p = bprm->p; p = bprm->p;
mode = cnt[0] == 0? (cnt[1] == 0? 2: 1): 0; mode = cnt[0] == 0? 1: 0;
if(pass == 1){ if(pass == 1){
for(ep = env; ep->name; ep++){ for(ep = env; ep->name; ep++){
if(ep->l) if(ep->l)