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

Henry Kroll III committed 16 years ago

Commit be7e3391 parent a64a6f32 files · +41 −5Browse files

Unified · Split

2 files

configure +8 −1
tccrun.c +33 −4

@@ -130,6 +130,8 @@ for opt do · 129 unmodified lines
130	130	;;
131	131	--with-libgcc) use_libgcc="yes"
132	132	;;
	133	+ --with-selinux) have_selinux="yes"
	134	+ ;;
133	135	--help\|-h) show_help="yes"
134	136	;;
135	137	esac
@@ -229,7 +231,8 @@ echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]" · 93 unmodified lines
229	231	echo " --sysroot=PREFIX prepend PREFIX to library/include paths []"
230	232	echo " --cc=CC use C compiler CC [$cc]"
231	233	echo " --with-libgcc use /lib/libgcc_s.so.1 instead of libtcc1.a"
232		−echo ""
	234	+echo " --with-selinux use mmap instead of exec mem"
	235	+echo " [requires write access to /tmp]"echo ""
233	236	#echo "NOTE: The object files are build at the place where configure is launched"
234	237	exit 1
235	238	fi
@@ -357,6 +360,10 @@ if test "$use_libgcc" = "yes" ; then · 121 unmodified lines
357	360	echo "#define CONFIG_USE_LIBGCC" >> $TMPH
358	361	echo "CONFIG_USE_LIBGCC=yes" >> config.mak
359	362	fi
	363	+if test "$have_selinux" = "yes" ; then
	364	+ echo "#define HAVE_SELINUX" >> $TMPH
	365	+ echo "HAVE_SELINUX=yes" >> config.mak
	366	+fi
360	367	version=`head $source_path/VERSION`
361	368	echo "VERSION=$version" >>config.mak
362	369	echo "#define TCC_VERSION \"$version\"" >> $TMPH

tccrun.c+33−4

@@ -50,10 +50,34 @@ int tcc_relocate(TCCState *s1) · 49 unmodified lines
50	50	int tcc_run(TCCState s1, int argc, char *argv)
51	51	{
52	52	int (prog_main)(int, char *);
53		−
	53	+ int ret;
	54	+#ifdef HAVE_SELINUX
	55	+ int rret;
	56	+ void ptr,writep;
	57	+ char tmpfname[] = "/tmp/.tccrunXXXXXX";
	58	+ int fd = mkstemp (tmpfname);
	59	+ unlink (tmpfname);
	60	+ ftruncate (fd, 1000);
	61	+ if ((rret= tcc_relocate_ex(s1,NULL)) < 0)
	62	+ return -1;
	63	+ /* Use mmap instead of malloc for Selinux */
	64	+ writep = mmap (NULL, rret, PROT_READ\|PROT_WRITE,
	65	+ MAP_SHARED, fd, 0);
	66	+ if(writep == MAP_FAILED){
	67	+ error("/tmp not writeable");
	68	+ return -1;
	69	+ }
	70	+ ptr = mmap (NULL, rret, PROT_READ\|PROT_EXEC,
	71	+ MAP_SHARED, fd, 0);
	72	+ if(ptr == MAP_FAILED){
	73	+ error("/tmp not executable");
	74	+ return -1;
	75	+ }
	76	+ tcc_relocate_ex(s1, writep);
	77	+#else
54	78	if (tcc_relocate(s1) < 0)
55	79	return -1;
56		−
	80	+#endif
57	81	prog_main = tcc_get_symbol_err(s1, "main");
58	82
59	83	#ifdef CONFIG_TCC_BACKTRACE
@@ -65,7 +89,6 @@ int tcc_run(TCCState s1, int argc, char *argv) · 5 unmodified lines
65	89	if (s1->do_bounds_check) {
66	90	void (*bound_init)(void);
67	91	void (*bound_exit)(void);
68		− int ret;
69	92	/* set error function */
70	93	rt_bound_error_msg = tcc_get_symbol_err(s1, "__bound_error_msg");
71	94	rt_prog_main = prog_main;
@@ -85,7 +108,13 @@ int tcc_run(TCCState s1, int argc, char *argv) · 13 unmodified lines
85	108	if (p) *p = 0;
86	109	}
87	110	#endif
88		− return (*prog_main)(argc, argv);
	111	+ ret=(*prog_main)(argc, argv);
	112	+#ifdef HAVE_SELINUX
	113	+ munmap (writep, rret);
	114	+ munmap (ptr, rret);
	115	+
	116	+#endif
	117	+ return ret;
89	118	}
90	119
91	120

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code