OSO/TinyCC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use mmap instead of exec mem for Selinux machines. Fixes crash on Fedora.

Browse Source
This commit is contained in:
Henry Kroll III
2010-04-20 23:40:33 -07:00
committed by Henry Kroll
parent a64a6f36a0
commit be7e339d8a
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tccrun.c
View File

@ -50,10 +50,34 @@ int tcc_relocate(TCCState *s1)
int tcc_run(TCCState *s1, int argc, char **argv)
{
int (*prog_main)(int, char **);
int ret;
#ifdef HAVE_SELINUX
int rret;
void *ptr,*writep;
char tmpfname[] = "/tmp/.tccrunXXXXXX";
int fd = mkstemp (tmpfname);
unlink (tmpfname);
ftruncate (fd, 1000);
if ((rret= tcc_relocate_ex(s1,NULL)) < 0)
return -1;
/* Use mmap instead of malloc for Selinux */
writep = mmap (NULL, rret, PROT_READ|PROT_WRITE,
MAP_SHARED, fd, 0);
if(writep == MAP_FAILED){
error("/tmp not writeable");
return -1;
}
ptr = mmap (NULL, rret, PROT_READ|PROT_EXEC,
MAP_SHARED, fd, 0);
if(ptr == MAP_FAILED){
error("/tmp not executable");
return -1;
}
tcc_relocate_ex(s1, writep);
#else
if (tcc_relocate(s1) < 0)
return -1;
#endif
prog_main = tcc_get_symbol_err(s1, "main");
#ifdef CONFIG_TCC_BACKTRACE
@ -65,7 +89,6 @@ int tcc_run(TCCState *s1, int argc, char **argv)
if (s1->do_bounds_check) {
void (*bound_init)(void);
void (*bound_exit)(void);
int ret;
/* set error function */
rt_bound_error_msg = tcc_get_symbol_err(s1, "__bound_error_msg");
rt_prog_main = prog_main;
@ -85,7 +108,13 @@ int tcc_run(TCCState *s1, int argc, char **argv)
if (p) *p = 0;
}
#endif
return (*prog_main)(argc, argv);
ret=(*prog_main)(argc, argv);
#ifdef HAVE_SELINUX
munmap (writep, rret);
munmap (ptr, rret);
#endif
return ret;
}