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

execve(): fix looking up relative path and checking executable permission

Browse Source
This commit is contained in:
Balazs Gerofi bgerofi@riken.jp
2014-07-29 15:48:14 +09:00
parent f1e39f5fb2
commit 27bfe37b80
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
executer/user/mcexec.c
View File

@@ -342,6 +342,12 @@ int load_elf_desc(char *filename, struct program_load_desc **desc_p)
FILE *interp = NULL; FILE *interp = NULL;
char *interp_path; char *interp_path;
struct program_load_desc *desc; struct program_load_desc *desc;
int ret = 0;
if ((ret = access(filename, X_OK)) != 0) {
fprintf(stderr, "Error: %s is not an executable?\n", filename);
return ret;
}
fp = fopen(filename, "rb"); fp = fopen(filename, "rb");
if (!fp) { if (!fp) {
@@ -1218,22 +1224,24 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
/* Execve phase */ /* Execve phase */
switch (w.sr.args[0]) { switch (w.sr.args[0]) {
int ret = -1;
struct program_load_desc *desc; struct program_load_desc *desc;
struct remote_transfer trans; struct remote_transfer trans;
int error; int error;
int found = 0; int found;
char path[2048]; char path[2048];
char *filename; char *filename;
int ret;
/* Load descriptor phase */ /* Load descriptor phase */
case 1: case 1:
ret = -1;
found = 0;
filename = (char *)w.sr.args[1]; filename = (char *)w.sr.args[1];
/* Is filename without path? */ /* Is filename a single component without path? */
if (strncmp(filename, "/", 1) if (strncmp(filename, "/", 1)
&& strncmp(filename, ".", 1)) { && !strchr(filename, '/')) {
char *token, *string, *tofree; char *token, *string, *tofree;
char *PATH = getenv("COKERNEL_PATH"); char *PATH = getenv("COKERNEL_PATH");
@@ -1260,7 +1268,7 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
} }
error = access(path, X_OK); error = access(path, X_OK);
if (!error) { if (error == 0) {
found = 1; found = 1;
break; break;
} }
@@ -1280,13 +1288,13 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
if (!found) { if (!found) {
fprintf(stderr, fprintf(stderr,
"execve(): error finding file %s\n", path); "execve(): error finding file %s\n", filename);
goto return_execve1; goto return_execve1;
} }
__dprintf("execve(): path to binary: %s\n", path); __dprintf("execve(): path to binary: %s\n", path);
if (load_elf_desc(path, &desc) != 0) { if ((ret = load_elf_desc(path, &desc)) != 0) {
fprintf(stderr, fprintf(stderr,
"execve(): error loading ELF for file %s\n", path); "execve(): error loading ELF for file %s\n", path);
goto return_execve1; goto return_execve1;
@@ -1325,6 +1333,7 @@ return_execve1:
/* Copy program image phase */ /* Copy program image phase */
case 2: case 2:
ret = -1;
/* Alloc descriptor */ /* Alloc descriptor */
desc = malloc(w.sr.args[2]); desc = malloc(w.sr.args[2]);
if (!desc) { if (!desc) {