sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-04-23 12:19:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added env and arg passing to execve

Browse Source
This commit is contained in:
Bahadir Balban
2008-11-25 12:52:28 +02:00
parent 159944b092
commit 783b1e025f
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tasks/mm0/include/exec.h
View File

@@ -16,4 +16,10 @@ struct exec_file_desc {
unsigned long bss_offset; /* File offset of bss section */ unsigned long bss_offset; /* File offset of bss section */
}; };
struct args_struct {
int argc;
char **argv;
int size; /* Size of strings + string pointers */
};
#endif /* __EXEC_H__ */ #endif /* __EXEC_H__ */

27
tasks/mm0/src/execve.c
View File

@@ -82,7 +82,8 @@ int task_setup_from_executable(struct vm_file *vmfile, struct tcb *task,
return elf_parse_executable(task, vmfile, efd); return elf_parse_executable(task, vmfile, efd);
} }
int do_execve(struct tcb *sender, char *filename) int do_execve(struct tcb *sender, char *filename, struct args_struct *args,
struct args_struct *env)
{ {
unsigned long vnum, length; unsigned long vnum, length;
struct vm_file *vmfile; struct vm_file *vmfile;
@@ -316,11 +317,6 @@ copy_user_ptrs(struct tcb *task, void *buf, char *user,
return copy_user_buf(task, buf, user, maxlength, sizeof(unsigned long)); return copy_user_buf(task, buf, user, maxlength, sizeof(unsigned long));
} }
struct args_struct {
int argc;
char **argv;
int size; /* Size of strings + string pointers */
};
int copy_user_args(struct tcb *task, struct args_struct *args, int copy_user_args(struct tcb *task, struct args_struct *args,
void *argv_user, int args_max) void *argv_user, int args_max)
@@ -377,26 +373,33 @@ out:
return count; return count;
} }
int sys_execve(struct tcb *sender, char *pathname, char *argv[], char *envp[]) int sys_execve(struct tcb *sender, char *pathname, char *argv[], char *envp[])
{ {
int ret; int ret;
char *path = kzalloc(PATH_MAX); char *path = kzalloc(PATH_MAX);
struct args_struct args; struct args_struct args;
struct args_struct env;
/* Copy the executable path string */ /* Copy the executable path string */
if ((ret = copy_user_string(sender, path, pathname, PATH_MAX)) < 0) if ((ret = copy_user_string(sender, path, pathname, PATH_MAX)) < 0)
return ret; return ret;
printf("%s: Copied pathname: %s\n", __FUNCTION__, path); printf("%s: Copied pathname: %s\n", __FUNCTION__, path);
/* Copy the env and args */ /* Copy the args */
if ((ret = copy_user_args(sender, &args, argv, ARGS_MAX)) < 0) if ((ret = copy_user_args(sender, &args, argv, ARGS_MAX)) < 0)
return ret; goto out1;
ret = do_execve(sender, path); /* Copy the env */
if ((ret = copy_user_args(sender, &env, envp, ARGS_MAX - args.size)))
goto out2;
ret = do_execve(sender, path, &args, &env);
kfree(env.argv);
out2:
kfree(args.argv);
out1:
kfree(path); kfree(path);
return ret; return ret;
} }