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

uti: Clear user space PTEs after first fork in create_tracer()

Browse Source 
Change-Id: I60755f0cb5e84c3a5a5cd91515411a30f0995822
This commit is contained in:
Masamichi Takagi
2018-09-04 09:57:02 +09:00
parent 5c8c1986b5
commit 63703589e5
6 changed files with 92 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
executer/user/mcexec.c
View File

@@ -1962,14 +1962,14 @@ struct uti_desc {
int exit; /* Used to tell the tracer to exit */
};
static int create_tracer();
static int create_tracer(unsigned long user_start, unsigned long user_end);
int uti_pfd[2];
struct uti_desc *uti_desc = (void*)-1;
static struct program_load_desc *desc;
int main(int argc, char **argv)
{
int ret = 0;
struct program_load_desc *desc;
int envs_len;
char *envs;
char *args;
@@ -2144,9 +2144,9 @@ int main(int argc, char **argv)
if (opendev() == -1)
exit(EXIT_FAILURE);
#if 1
/* Create tracer before anonymous inode is mapped */
if ((error = create_tracer())) {
#if 0
/* TODO: Remove this after memory corruption bug is fixed */
if ((error = create_tracer(0, 0))) {
fprintf(stderr, "%s: create tracer returned %d\n", __FUNCTION__, error);
return error;
}
@@ -2875,7 +2875,7 @@ debug_sig(int s)
#endif
static int
create_tracer()
create_tracer(unsigned long user_start, unsigned long user_end)
{
int tpid;
int rc;
@@ -2888,6 +2888,10 @@ create_tracer()
int exited = 0;
int mode = 0;
unsigned long buf;
struct release_user_space_desc release_desc = {
.user_start = desc->user_start,
.user_end = desc->user_end
};
/* Perform mmap() before fork() in create_tracer() */
uti_desc = mmap(NULL, sizeof(struct uti_desc), PROT_READ | PROT_WRITE,
@@ -2942,6 +2946,12 @@ create_tracer()
return 0;
}
close(uti_pfd[0]);
#if 1 /* debug */
if (ioctl(fd, MCEXEC_UP_RELEASE_USER_SPACE, &release_desc) != 0) {
fprintf(stderr, "%s: ERROR: MCEXEC_UP_RELEASE_USER_SPACE returned %d\n", __FUNCTION__, errno);
exit(1);
}
#endif
tpid = fork();
if (tpid) {
if (tpid == -1) {
@@ -2966,9 +2976,14 @@ create_tracer()
}
#endif
#if 0
if (ioctl(fd, MCEXEC_UP_RELEASE_USER_SPACE, &release_desc) != 0) {
fprintf(stderr, "%s: ERROR: MCEXEC_UP_RELEASE_USER_SPACE returned %d\n", __FUNCTION__, errno);
exit(1);
}
#endif
sem_wait(&uti_desc->arg);
if (uti_desc->exit) { /* When uti is not used */
fprintf(stderr, "%s: exiting tid=%d\n", __FUNCTION__, gettid());
exit(0);
}
@@ -3047,7 +3062,7 @@ create_tracer()
return_syscall()
*/
if (exited == 1 || exited == 2) {
fprintf(stderr, "%s: calling MCEXEC_UP_TERMINATE_THREAD,exited=%d,code=%lx\n", __FUNCTION__, exited, code);
__dprintf("calling MCEXEC_UP_TERMINATE_THREAD,exited=%d,code=%lx\n", exited, code);
if (ioctl(fd, MCEXEC_UP_TERMINATE_THREAD, term_param) != 0) {
fprintf(stderr, "%s: INFO: MCEXEC_UP_TERMINATE_THREAD returned %d\n", __FUNCTION__, errno);
}
@@ -3191,11 +3206,12 @@ util_thread(struct thread_data_s *my_thread, unsigned long uctx_pa, int remote_t
void *param[6];
int rc = 0;
unsigned long buf;
#if 0
if ((error = create_tracer())) {
fprintf(stderr, "%s: create_tracer returned %d\n", __FUNCTION__, error);
rc = error; goto out;
#if 1
/* Create tracer */
if ((rc = create_tracer(desc->user_start, desc->user_end))) {
fprintf(stderr, "%s: create_tracer returned %d\n", __FUNCTION__, rc);
goto out;
}
#endif
#ifdef POSTK_DEBUG_ARCH_DEP_35
@@ -3774,12 +3790,14 @@ gettid_out:
goto fork_child_sync_pipe;
}
/* Create tracer before anonymous inode is mapped */
if ((ret = create_tracer())) {
#if 1
/* Create tracer */
if ((ret = create_tracer(desc->user_start, desc->user_end))) {
fs->status = ret;
fprintf(stderr, "%s: create tracer returned %d\n", __FUNCTION__, ret);
goto fork_child_sync_pipe;
}
#endif
if (ioctl(fd, MCEXEC_UP_CREATE_PPD) != 0) {
fs->status = -errno;