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

binfmt_mcexec: support post-K specification

Browse Source
This commit is contained in:
Tomoki Shirasawa
2016-06-08 09:53:39 +09:00
parent d0ee60f9e3
commit 6d9a88e9f4
1 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
executer/kernel/mcctrl/binfmt_mcexec.c
View File

@@ -45,7 +45,6 @@ static int load_elf(struct linux_binprm *bprm
#endif #endif
) )
{ {
char mcexec[BINPRM_BUF_SIZE];
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
const const
#endif #endif
@@ -60,12 +59,8 @@ static int load_elf(struct linux_binprm *bprm
int l; int l;
} envdata; } envdata;
envdata env[] = { envdata env[] = {
{.name = "MCEXEC"},
#define env_mcexec (env[0].val)
{.name = "MCEXEC_WL"}, {.name = "MCEXEC_WL"},
#define env_mcexec_wl (env[1].val) #define env_mcexec_wl (env[0].val)
{.name = "MCEXEC_BL"},
#define env_mcexec_bl (env[2].val)
{.name = NULL} {.name = NULL}
}; };
envdata *ep; envdata *ep;
@@ -196,23 +191,10 @@ static int load_elf(struct linux_binprm *bprm
} }
} }
if(!env_mcexec || !strcmp(env_mcexec, "0") || !strcmp(env_mcexec, "off")) if(env_mcexec_wl)
rc = 1;
else{
rc = 0;
if(strchr(env_mcexec, '/') && strlen(env_mcexec) < BINPRM_BUF_SIZE)
strcpy(mcexec, env_mcexec);
else
strcpy(mcexec, MCEXEC_PATH);
}
if(rc);
else if(env_mcexec_wl)
rc = !pathcheck(path, env_mcexec_wl); rc = !pathcheck(path, env_mcexec_wl);
else if(env_mcexec_bl)
rc = pathcheck(path, env_mcexec_bl);
else else
rc = pathcheck(path, "/usr:/bin:/sbin:/opt"); rc = 1;
for(ep = env; ep->name; ep++) for(ep = env; ep->name; ep++)
if(ep->val) if(ep->val)
@@ -220,7 +202,7 @@ static int load_elf(struct linux_binprm *bprm
if(rc) if(rc)
return -ENOEXEC; return -ENOEXEC;
file = open_exec(mcexec); file = open_exec(MCEXEC_PATH);
if (IS_ERR(file)) if (IS_ERR(file))
return -ENOEXEC; return -ENOEXEC;
@@ -235,29 +217,18 @@ static int load_elf(struct linux_binprm *bprm
return rc; return rc;
} }
bprm->argc++; bprm->argc++;
wp = mcexec; wp = MCEXEC_PATH;
rc = copy_strings_kernel(1, &wp, bprm); rc = copy_strings_kernel(1, &wp, bprm);
if (rc){ if (rc){
fput(file); fput(file);
return rc; return rc;
} }
bprm->argc++; bprm->argc++;
#if 1 rc = bprm_change_interp(MCEXEC_PATH, bprm);
rc = bprm_change_interp(mcexec, bprm);
if (rc < 0){ if (rc < 0){
fput(file); fput(file);
return rc; return rc;
} }
#else
if(brpm->interp != bprm->filename)
kfree(brpm->interp);
kfree(brpm->filename);
bprm->filename = bprm->interp = kstrdup(mcexec, GFP_KERNEL);
if(!bprm->interp){
fput(file);
return -ENOMEM;
}
#endif
allow_write_access(bprm->file); allow_write_access(bprm->file);
fput(bprm->file); fput(bprm->file);