diff options
author | Cristian Cadar <c.cadar@imperial.ac.uk> | 2013-12-11 09:05:26 -0800 |
---|---|---|
committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2013-12-11 09:05:26 -0800 |
commit | a45df61f6641ed0f6b92919bf377ce2ef1f1d839 (patch) | |
tree | 0eaeba63fc853334f703a8807bae47ca5b8f3232 | |
parent | 02fa9e4d83a04f50cb1ad24b543a2fd5002fa2f3 (diff) | |
parent | 67bfeaa6f6cd9f46a1d5131ab0b831913922eb3d (diff) | |
download | klee-a45df61f6641ed0f6b92919bf377ce2ef1f1d839.tar.gz |
Merge pull request #31 from antiAgainst/chroot-replay
Chroot replay feature
-rw-r--r-- | autoconf/configure.ac | 9 | ||||
-rwxr-xr-x | configure | 109 | ||||
-rw-r--r-- | include/klee/Config/config.h.in | 3 | ||||
-rwxr-xr-x | scripts/klee-chroot-env | 87 | ||||
-rw-r--r-- | tools/klee-replay/Makefile | 2 | ||||
-rw-r--r-- | tools/klee-replay/klee-replay.c | 139 |
6 files changed, 312 insertions, 37 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 2fd162f2..4bd79557 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -467,6 +467,15 @@ AC_LANG_PUSH([C]) AC_CHECK_HEADERS([sys/acl.h]) +AC_CHECK_LIB([cap], [cap_get_proc], [have_cap=yes], [have_cap=no]) +if test "x${have_cap}" = xyes; then + AC_CHECK_HEADERS([sys/capability.h], [], [have_cap=no]) +fi +if test "x${have_cap}" = xno; then + AC_MSG_ERROR([Library cap and its header file sys/capability.h required for \ +klee-replay. Please install package libcap-dev/libcap-devel.]) +fi + AC_LANG_POP([C]) AC_CHECK_HEADERS([selinux/selinux.h], diff --git a/configure b/configure index 5d138b61..ab148c2c 100755 --- a/configure +++ b/configure @@ -1709,6 +1709,52 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_header_compile +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + # ac_fn_cxx_try_compile LINENO # ---------------------------- # Try to compile conftest.$ac_ext, and return whether this succeeded. @@ -4302,6 +4348,69 @@ fi done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_get_proc in -lcap" >&5 +$as_echo_n "checking for cap_get_proc in -lcap... " >&6; } +if ${ac_cv_lib_cap_cap_get_proc+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcap $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cap_get_proc (); +int +main () +{ +return cap_get_proc (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cap_cap_get_proc=yes +else + ac_cv_lib_cap_cap_get_proc=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_get_proc" >&5 +$as_echo "$ac_cv_lib_cap_cap_get_proc" >&6; } +if test "x$ac_cv_lib_cap_cap_get_proc" = xyes; then : + have_cap=yes +else + have_cap=no +fi + +if test "x${have_cap}" = xyes; then + for ac_header in sys/capability.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_capability_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_CAPABILITY_H 1 +_ACEOF + +else + have_cap=no +fi + +done + +fi +if test "x${have_cap}" = xno; then + as_fn_error $? "Library cap and its header file sys/capability.h required for \ +klee-replay. Please install package libcap-dev/libcap-devel." "$LINENO" 5 +fi + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/include/klee/Config/config.h.in b/include/klee/Config/config.h.in index a751bc07..0a94de8f 100644 --- a/include/klee/Config/config.h.in +++ b/include/klee/Config/config.h.in @@ -33,6 +33,9 @@ /* Define to 1 if you have the <sys/acl.h> header file. */ #undef HAVE_SYS_ACL_H +/* Define to 1 if you have the <sys/capability.h> header file. */ +#undef HAVE_SYS_CAPABILITY_H + /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H diff --git a/scripts/klee-chroot-env b/scripts/klee-chroot-env new file mode 100755 index 00000000..3b524d8e --- /dev/null +++ b/scripts/klee-chroot-env @@ -0,0 +1,87 @@ +#!/usr/bin/env python2 +#-*- coding: utf-8 -*- +# +# Buiding chroot environment for the program under test. +# +# This script uses `ldd' to get the shared libraries required by a program, +# and copies those libraries to the directory for chroot'ing, maintaining +# each library's relative path against root directory. +# +# Usage example: +# $ ./klee-chroot-env /tmp/sandbox `which rm` # build env for 'rm' +# $ cp `which rm` /tm/sandbox/rm # copy the binary into the jail +# $ sudo setcap SYS_CAP_CHROOT+ep `which klee-replay` +# # give klee-replay the capability to call 'chroot' system call +# $ klee-replay --chroot-to-dir=/tmp/sandbox /tmp/sandbox/rm /path/to/ktest +# # replay some ktest in chroot jail rooted at /tmp/sandbox + +import sys +import os +import shutil +import re + +from subprocess import Popen, PIPE + + +def get_shared_library_dependency(program): + """Calls `ldd' to get the shared library dependency of a `program'.""" + + cmd = "ldd %s" % program + prog = Popen(cmd.split(), stdout=PIPE, stderr=PIPE, shell=False) + out, err = prog.communicate(None) + prog.stdout.close() + prog.stderr.close() + + regexp = re.compile(r"\s*\(\S+\)\s*") + + dep = out.splitlines() + dep = [e.strip() for e in dep] + dep = [regexp.sub("", e) for e in dep] + dep = [e for e in dep if not e.startswith("linux-vdso.so")] + libs = [] + for e in dep: + if (" => " in e): + libs.append(e.split(" => ")) + else: + libs.append((os.path.basename(e), e)) + + # Outputs a list of (link-name, original-path) pairs. + return libs + + +def build_environment(root, libs): + """Copies all library dependencies to the specified `root' dir.""" + + if not os.path.exists(root): + os.makedirs(root) + os.chdir(root) + + for e in libs: + link_name = e[0] + original_path = e[1] + relative_dir = os.path.dirname(e[1]).lstrip("/") + chrooted_path = root + os.path.dirname(e[1]) + "/" + link_name + if not os.path.exists(relative_dir): + os.makedirs(relative_dir) + shutil.copyfile(original_path, chrooted_path) + shutil.copymode(original_path, chrooted_path) + + +def usage(): + print("Usage: %s /path/to/root/dir /path/to/program" % sys.argv[0]) + + +if __name__ == "__main__": + if (len(sys.argv) != 3): + usage() + exit(1) + + rootdir = sys.argv[1] + program = sys.argv[2] + + if not os.path.isfile(program) or not os.access(program, os.X_OK): + print("Error: executable not existing or not executable") + exit(1) + + libs = get_shared_library_dependency(program) + build_environment(rootdir, libs) diff --git a/tools/klee-replay/Makefile b/tools/klee-replay/Makefile index fcce0483..e97fc7ff 100644 --- a/tools/klee-replay/Makefile +++ b/tools/klee-replay/Makefile @@ -16,4 +16,4 @@ NO_PEDANTIC=1 include $(LEVEL)/Makefile.common -LIBS += -lutil +LIBS += -lutil -lcap diff --git a/tools/klee-replay/klee-replay.c b/tools/klee-replay/klee-replay.c index 8d0ba8cc..0ea88fb1 100644 --- a/tools/klee-replay/klee-replay.c +++ b/tools/klee-replay/klee-replay.c @@ -16,12 +16,14 @@ #include <stdlib.h> #include <string.h> #include <stdint.h> +#include <getopt.h> #include <errno.h> #include <time.h> #include <unistd.h> #include <sys/signal.h> #include <sys/wait.h> +#include <sys/capability.h> static void __emit_error(const char *msg); @@ -32,6 +34,14 @@ static const char *progname = 0; static unsigned monitored_pid = 0; static unsigned monitored_timeout; +static char *rootdir = NULL; +static struct option long_options[] = { + {"create-files-only", required_argument, 0, 'f'}, + {"chroot-to-dir", required_argument, 0, 'r'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0}, +}; + static void stop_monitored(int process) { fprintf(stderr, "TIMEOUT: ATTEMPTING GDB EXIT\n"); int pid = fork(); @@ -105,9 +115,7 @@ static void timeout_handler(int signal) { } } -void process_status(int status, - time_t elapsed, - const char *pfx) { +void process_status(int status, time_t elapsed, const char *pfx) { fprintf(stderr, "%s: ", progname); if (pfx) fprintf(stderr, "%s: ", pfx); @@ -132,6 +140,13 @@ void process_status(int status, } } +/* This function assumes that executable is a path pointing to some existing + * binary and rootdir is a path pointing to some directory. + */ +static inline char *strip_root_dir(char *executable, char *rootdir) { + return executable + strlen(rootdir); +} + static void run_monitored(char *executable, int argc, char **argv) { int pid; const char *t = getenv("KLEE_REPLAY_TIMEOUT"); @@ -162,8 +177,22 @@ static void run_monitored(char *executable, int argc, char **argv) { */ setpgrp(); - execv(executable, argv); - perror("execv"); + if (!rootdir) { + execv(executable, argv); + perror("execv"); + _exit(66); + } + + fprintf(stderr, "rootdir: %s\n", rootdir); + const char *msg; + if ((msg = "chdir", chdir(rootdir) == 0) && + (msg = "chroot", chroot(rootdir) == 0)) { + msg = "execv"; + executable = strip_root_dir(executable, rootdir); + argv[0] = strip_root_dir(argv[0], rootdir); + execv(executable, argv); + } + perror(msg); _exit(66); } else { /* Parent process which monitors the child. */ @@ -192,11 +221,31 @@ static void run_monitored(char *executable, int argc, char **argv) { } } +/* ensure this process has CAP_SYS_CHROOT capability. */ +void ensure_capsyschroot(const char *executable) { + cap_t caps = cap_get_proc(); // all current capabilities. + cap_flag_value_t chroot_permitted, chroot_effective; + + if (!caps) + perror("cap_get_proc"); + /* effective and permitted flags should be set for CAP_SYS_CHROOT. */ + cap_get_flag(caps, CAP_SYS_CHROOT, CAP_PERMITTED, &chroot_permitted); + cap_get_flag(caps, CAP_SYS_CHROOT, CAP_EFFECTIVE, &chroot_effective); + if (chroot_permitted != CAP_SET || chroot_effective != CAP_SET) { + fprintf(stderr, "Error: chroot: No CAP_SYS_CHROOT capability.\n"); + exit(1); + } + cap_free(caps); +} + static void usage(void) { - fprintf(stderr, "Usage: %s <executable> { <ktest-files> }\n", progname); + fprintf(stderr, "Usage: %s [option]... <executable> <ktest-file>...\n", progname); fprintf(stderr, " or: %s --create-files-only <ktest-file>\n", progname); fprintf(stderr, "\n"); - fprintf(stderr, "Set KLEE_REPLAY_TIMEOUT environment variable to set a timeout (in seconds).\n"); + fprintf(stderr, "-r, --chroot-to-dir=DIR use chroot jail, requires CAP_SYS_CHROOT\n"); + fprintf(stderr, "-h, --help display this help and exit\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "Use KLEE_REPLAY_TIMEOUT environment variable to set a timeout (in seconds).\n"); exit(1); } @@ -209,35 +258,53 @@ int main(int argc, char** argv) { if (argc < 3) usage(); - /* Special case hack for only creating files and not actually executing the - * program. - */ - if (strcmp(argv[1], "--create-files-only") == 0) { - if (argc != 3) - usage(); - - char* input_fname = argv[2]; - - input = kTest_fromFile(input_fname); - if (!input) { - fprintf(stderr, "%s: error: input file %s not valid.\n", progname, - input_fname); - exit(1); - } + int c, opt_index; + while ((c = getopt_long(argc, argv, "f:r:", long_options, &opt_index)) != -1) { + switch (c) { + case 'f': { + /* Special case hack for only creating files and not actually executing + * the program. + */ + if (argc != 3) + usage(); - prg_argc = input->numArgs; - prg_argv = input->args; - prg_argv[0] = argv[1]; - klee_init_env(&prg_argc, &prg_argv); + char* input_fname = optarg; - replay_create_files(&__exe_fs); - return 0; + input = kTest_fromFile(input_fname); + if (!input) { + fprintf(stderr, "%s: error: input file %s not valid.\n", progname, + input_fname); + exit(1); + } + + prg_argc = input->numArgs; + prg_argv = input->args; + prg_argv[0] = argv[1]; + klee_init_env(&prg_argc, &prg_argv); + + replay_create_files(&__exe_fs); + return 0; + } + case 'r': + rootdir = optarg; + break; + } } /* Normal execution path ... */ - char* executable = argv[1]; + char* executable = argv[optind]; + + /* make sure this process has the CAP_SYS_CHROOT capability. */ + if (rootdir) + ensure_capsyschroot(progname); + /* rootdir should be a prefix of executable's path. */ + if (rootdir && strstr(executable, rootdir) != executable) { + fprintf(stderr, "Error: chroot: root dir should be a parent dir of executable.\n"); + exit(1); + } + /* Verify the executable exists. */ FILE *f = fopen(executable, "r"); if (!f) { @@ -247,7 +314,7 @@ int main(int argc, char** argv) { fclose(f); int idx = 0; - for (idx = 2; idx != argc; ++idx) { + for (idx = optind + 1; idx != argc; ++idx) { char* input_fname = argv[idx]; unsigned i; @@ -261,7 +328,7 @@ int main(int argc, char** argv) { obj_index = 0; prg_argc = input->numArgs; prg_argv = input->args; - prg_argv[0] = argv[1]; + prg_argv[0] = argv[optind]; klee_init_env(&prg_argc, &prg_argv); if (idx > 2) @@ -361,9 +428,9 @@ void klee_make_symbolic(void *addr, size_t nbytes, const char *name) { *((int*) addr) = 0; } else { if (boo->numBytes != nbytes) { - fprintf(stderr, "make_symbolic mismatch, different sizes: " - "%d in input file, %lu in code\n", boo->numBytes, (unsigned long)nbytes); - exit(1); + fprintf(stderr, "make_symbolic mismatch, different sizes: " + "%d in input file, %lu in code\n", boo->numBytes, (unsigned long)nbytes); + exit(1); } else { memcpy(addr, boo->bytes, nbytes); obj_index++; @@ -388,7 +455,7 @@ int klee_range(int start, int end, const char* name) { if (r < start || r >= end) { fprintf(stderr, "klee_range(%d, %d, %s) returned invalid result: %d\n", - start, end, name, r); + start, end, name, r); exit(1); } @@ -397,7 +464,7 @@ int klee_range(int start, int end, const char* name) { } void klee_report_error(const char *file, int line, - const char *message, const char *suffix) { + const char *message, const char *suffix) { __emit_error(message); } |