tor-commits September 2013

tor-commits@lists.torproject.org

17 participants
1101 discussions

[tor/master] documentation update for _array functions
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit f93ba9a2ef182faf1d9faacf26012135eb999ccf Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Thu Aug 29 15:44:01 2013 +0300 documentation update for _array functions --- src/common/sandbox.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 2c0eb30..51449ca 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -119,11 +119,10 @@ int sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file, /** Function used to add a series of open allowed filenames to a supplied * configuration. * @param cfg sandbox configuration. - * @param num number of files. * @param ... all future parameters are specified as pairs of <(char*), 1 / 0> * the char* specifies the path to the allowed file, 1 tells the function * that the char* needs to be free-ed, 0 means the pointer does not need to - * be free-ed. + * be free-ed; the final parameter needs to be <NULL, 0>. */ int sandbox_cfg_allow_open_filename_array(sandbox_cfg_t **cfg, ...); @@ -139,11 +138,10 @@ int sandbox_cfg_allow_openat_filename(sandbox_cfg_t **cfg, char *file, /** Function used to add a series of openat allowed filenames to a supplied * configuration. * @param cfg sandbox configuration. - * @param num number of files. * @param ... all future parameters are specified as pairs of <(char*), 1 / 0> * the char* specifies the path to the allowed file, 1 tells the function * that the char* needs to be free-ed, 0 means the pointer does not need to - * be free-ed. + * be free-ed; the final parameter needs to be <NULL, 0>. */ int sandbox_cfg_allow_openat_filename_array(sandbox_cfg_t **cfg, ...); @@ -158,11 +156,10 @@ int sandbox_cfg_allow_execve(sandbox_cfg_t **cfg, char *com); /** Function used to add a series of execve allowed filenames to a supplied * configuration. * @param cfg sandbox configuration. - * @param num number of files. * @param ... all future parameters are specified as pairs of <(char*), 1 / 0> * the char* specifies the path to the allowed file, 1 tells the function * that the char* needs to be free-ed, 0 means the pointer does not need to - * be free-ed. + * be free-ed; the final parameter needs to be <NULL, 0>. */ int sandbox_cfg_allow_execve_array(sandbox_cfg_t **cfg, ...); @@ -178,11 +175,10 @@ int sandbox_cfg_allow_stat64_filename(sandbox_cfg_t **cfg, char *file, /** Function used to add a series of stat64 allowed filenames to a supplied * configuration. * @param cfg sandbox configuration. - * @param num number of files. * @param ... all future parameters are specified as pairs of <(char*), 1 / 0> * the char* specifies the path to the allowed file, 1 tells the function * that the char* needs to be free-ed, 0 means the pointer does not need to - * be free-ed. + * be free-ed; the final parameter needs to be <NULL, 0>. */ int sandbox_cfg_allow_stat64_filename_array(sandbox_cfg_t **cfg, ...);

1 0

[tor/master] changed how sb getaddrinfo works such that it supports storing multiple results
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 1ef0b2e1a37878ebbc29b03fefb214b7501656a6 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Mon Sep 2 11:44:04 2013 +0300 changed how sb getaddrinfo works such that it supports storing multiple results --- src/common/sandbox.c | 62 ++++++++++++++++++++++++++------------------------ src/common/sandbox.h | 18 +++++++++++++++ src/or/main.c | 11 +++++++++ 3 files changed, 61 insertions(+), 30 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 748141c..41c3b44 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -54,8 +54,7 @@ #include <poll.h> static sandbox_cfg_t *filter_dynamic = NULL; - -static struct addrinfo *sb_addr_info= NULL; +static sb_addr_info_t *sb_addr_info = NULL; /** Variable used for storing all syscall numbers that will be allowed with the * stage 1 general Tor sandbox. @@ -914,54 +913,57 @@ sandbox_cfg_allow_execve_array(sandbox_cfg_t **cfg, ...) int sandbox_getaddrinfo(const char *name, struct addrinfo **res) { - char hname[256]; + sb_addr_info_t *el; - if (!res) { - return -2; - } *res = NULL; - *res = (struct addrinfo *)malloc(sizeof(struct addrinfo)); - if (*res == NULL) { - return -2; - } - if (gethostname(hname, sizeof(hname)) < 0) { - return -1; - } + for (el = sb_addr_info; el; el = el->next) { + if(!strcmp(el->name, name)) { + *res = (struct addrinfo *)malloc(sizeof(struct addrinfo)); + if (!res) { + return -2; + } - if (strcmp(name, hname) || sb_addr_info == NULL) { - log_err(LD_BUG,"(Sandbox) failed for hname %s!", name); - return -1; + memcpy(*res, el->info, sizeof(struct addrinfo)); + + return 0; + } } - memcpy(*res, sb_addr_info, sizeof(struct addrinfo)); - return 0; + return -1; } -static int -init_addrinfo(void) +int +sandbox_add_addrinfo(const char* name) { int ret; struct addrinfo hints; - char hname[256]; + sb_addr_info_t *el = NULL; - sb_addr_info = NULL; - - if (gethostname(hname, sizeof(hname)) < 0) { - return -1; + el = (sb_addr_info_t*) malloc(sizeof(sb_addr_info_t)); + if(!el) { + log_err(LD_BUG,"(Sandbox) failed to allocate addr info!"); + ret = -2; + goto out; } memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_INET; hints.ai_socktype = SOCK_STREAM; - ret = getaddrinfo(hname, NULL, &hints, &sb_addr_info); + ret = getaddrinfo(name, NULL, &hints, &(el->info)); if (ret) { - sb_addr_info = NULL; - return -2; + log_err(LD_BUG,"(Sandbox) failed to getaddrinfo"); + ret = -2; + goto out; } - return 0; + el->name = strdup(name); + el->next = sb_addr_info; + sb_addr_info = el; + + out: + return ret; } static int @@ -1151,7 +1153,7 @@ initialise_libseccomp_sandbox(sandbox_cfg_t* cfg) if (install_sigsys_debugging()) return -1; - if (init_addrinfo() || prot_strings(cfg)) { + if (prot_strings(cfg)) { return -4; } diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 51449ca..9a61749 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -62,6 +62,21 @@ struct pfd_elem { /** Typedef to structure used to manage a sandbox configuration. */ typedef struct pfd_elem sandbox_cfg_t; +/** + * Structure used for keeping a linked list of getaddrinfo pre-recorded + * results. + */ +struct sb_addr_info_el { + /** Name of the address info result. */ + char *name; + /** Pre-recorded getaddrinfo result. */ + struct addrinfo *info; + /** Next element in the list. */ + struct sb_addr_info_el *next; +}; +/** Typedef to structure used to manage an addrinfo list. */ +typedef struct sb_addr_info_el sb_addr_info_t; + /** Function pointer defining the prototype of a filter function.*/ typedef int (*sandbox_filter_func_t)(scmp_filter_ctx ctx, sandbox_cfg_t *filter); @@ -93,6 +108,9 @@ typedef struct { #endif // __linux__ +/** Pre-calls getaddrinfo in order to pre-record result. */ +int sandbox_add_addrinfo(const char *addr); + /** Replacement for getaddrinfo(), using pre-recorded results. */ int sandbox_getaddrinfo(const char *name, struct addrinfo **res); diff --git a/src/or/main.c b/src/or/main.c index 861f586..af05f0b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2639,6 +2639,15 @@ find_flashcard_path(PWCHAR path, size_t size) } #endif +static void +init_addrinfo(void) { + char hname[256]; + + // host name to sandbox + gethostname(hname, sizeof(hname)); + sandbox_add_addrinfo(hname); +} + static sandbox_cfg_t* sandbox_init_filter() { @@ -2713,6 +2722,8 @@ sandbox_init_filter() sandbox_cfg_allow_execve(&cfg, "/usr/local/bin/tor"); + init_addrinfo(); + return cfg; }

1 0

[tor/master] make check-spaces fix
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit c584537a038cdeede4d52b52a73dcbb3035112a4 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Mon Sep 2 11:45:09 2013 +0300 make check-spaces fix --- src/common/sandbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 41c3b44..a491912 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -918,7 +918,7 @@ sandbox_getaddrinfo(const char *name, struct addrinfo **res) *res = NULL; for (el = sb_addr_info; el; el = el->next) { - if(!strcmp(el->name, name)) { + if (!strcmp(el->name, name)) { *res = (struct addrinfo *)malloc(sizeof(struct addrinfo)); if (!res) { return -2; @@ -941,7 +941,7 @@ sandbox_add_addrinfo(const char* name) sb_addr_info_t *el = NULL; el = (sb_addr_info_t*) malloc(sizeof(sb_addr_info_t)); - if(!el) { + if (!el) { log_err(LD_BUG,"(Sandbox) failed to allocate addr info!"); ret = -2; goto out;

1 0

[tor/master] switched from multiple mmap to one
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 1118bd99108d3ab3404fadfa7eb8e01616836d71 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Thu Aug 29 16:51:05 2013 +0300 switched from multiple mmap to one --- src/common/sandbox.c | 89 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 30 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 49c057c..4fd95f0 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -678,36 +678,65 @@ sandbox_intern_string(const char *param) return param; } -static char* -prot_strdup(char* str) -{ - int param_size = 0; - char *res = NULL; +static int +prot_strings(sandbox_cfg_t* cfg) { + int ret = 0; + int pr_mem_size = 0, pr_mem_left = 0; + char *pr_mem_next = NULL, *pr_mem_base; + sandbox_cfg_t *el = NULL; + + // get total number of bytes required to mmap + for(el = cfg; el != NULL; el = el->next) { + pr_mem_size += strlen((char*) el->param) + 1; + } - if (str == NULL) - goto out; - - // allocating protected memory region for parameter - param_size = 1 + strlen(str); - - res = (char*) mmap(NULL, param_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | - MAP_ANON, -1, 0); - if (!res) { - log_err(LD_BUG,"(Sandbox) failed allocate protected memory!"); + // allocate protected memory + pr_mem_base = (char*) mmap(NULL, pr_mem_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON, -1, 0); + if (pr_mem_base == MAP_FAILED) { + log_err(LD_BUG,"(Sandbox) failed allocate protected memory! mmap: %s", + strerror(errno)); + ret = -1; goto out; } - // copying from non protected to protected + pointer reassign - memcpy(res, str, param_size); + pr_mem_next = pr_mem_base; + pr_mem_left = pr_mem_size; + + // change el value pointer to protected + for (el = cfg; el != NULL; el = el->next) { + char *param_val = (char*) el->param; + int param_size = strlen(param_val) + 1; + + if (pr_mem_left - param_size >= 0) { + // copy to protected + memcpy(pr_mem_next, param_val, param_size); + + // re-point el parameter to protected + free((char*) el->param); + el->param = (intptr_t) pr_mem_next; + el->prot = 1; + + // move next available protected memory + pr_mem_next += param_size; + pr_mem_left -= param_size; + } else { + log_err(LD_BUG,"(Sandbox) insufficient protected memory!"); + ret = -2; + goto out; + } + } // protecting from writes - if (mprotect(res, param_size, PROT_READ)) { - log_err(LD_BUG,"(Sandbox) failed to protect memory!"); - return NULL; + if (mprotect(pr_mem_base, pr_mem_size, PROT_READ)) { + log_err(LD_BUG,"(Sandbox) failed to protect memory! mprotect: %s", + strerror(errno)); + ret = -3; + goto out; } out: - return res; + return ret; } #ifdef __NR_stat64 @@ -719,8 +748,8 @@ sandbox_cfg_allow_stat64_filename(sandbox_cfg_t **cfg, char *file, int fr) elem = (sandbox_cfg_t*) malloc(sizeof(sandbox_cfg_t)); elem->syscall = SCMP_SYS(stat64); elem->pindex = 0; - elem->param = (intptr_t) prot_strdup((char*) file); - elem->prot = 1; + elem->param = (intptr_t) strdup(file); + elem->prot = 0; elem->next = *cfg; *cfg = elem; @@ -763,8 +792,8 @@ sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file, int fr) elem = (sandbox_cfg_t*) malloc(sizeof(sandbox_cfg_t)); elem->syscall = SCMP_SYS(open); elem->pindex = 0; - elem->param = (intptr_t) prot_strdup((char*) file); - elem->prot = 1; + elem->param = (intptr_t) strdup(file); + elem->prot = 0; elem->next = *cfg; *cfg = elem; @@ -806,8 +835,8 @@ sandbox_cfg_allow_openat_filename(sandbox_cfg_t **cfg, char *file, int fr) elem = (sandbox_cfg_t*) malloc(sizeof(sandbox_cfg_t)); elem->syscall = SCMP_SYS(openat); elem->pindex = 1; - elem->param = (intptr_t) prot_strdup((char*) file);; - elem->prot = 1; + elem->param = (intptr_t) strdup(file); + elem->prot = 0; elem->next = *cfg; *cfg = elem; @@ -849,8 +878,8 @@ sandbox_cfg_allow_execve(sandbox_cfg_t **cfg, char *com) elem = (sandbox_cfg_t*) malloc(sizeof(sandbox_cfg_t)); elem->syscall = SCMP_SYS(openat); elem->pindex = 1; - elem->param = (intptr_t) prot_strdup((char*) com);; - elem->prot = 1; + elem->param = (intptr_t) strdup(com); + elem->prot = 0; elem->next = *cfg; *cfg = elem; @@ -1121,7 +1150,7 @@ initialise_libseccomp_sandbox(sandbox_cfg_t* cfg) if (install_sigsys_debugging()) return -1; - if (init_addrinfo()) { + if (init_addrinfo() || prot_strings(cfg)) { return -4; }

1 0

[tor/master] replaced malloc/free with tor_malloc/tor_free
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 2a6c34750d1723382e0342333ef9a15785adaf66 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Fri Sep 6 12:29:15 2013 +0300 replaced malloc/free with tor_malloc/tor_free --- src/common/sandbox.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index b4189b5..0c2145f 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -728,7 +728,7 @@ prot_strings(sandbox_cfg_t* cfg) memcpy(pr_mem_next, param_val, param_size); // re-point el parameter to protected - free((char*) ((smp_param_t*)el->param)->value); + tor_free((char*) ((smp_param_t*)el->param)->value); ((smp_param_t*)el->param)->value = (intptr_t) pr_mem_next; ((smp_param_t*)el->param)->prot = 1; @@ -759,13 +759,13 @@ new_element(int syscall, int index, intptr_t value) { smp_param_t *param = NULL; - sandbox_cfg_t *elem = (sandbox_cfg_t*) malloc(sizeof(sandbox_cfg_t)); + sandbox_cfg_t *elem = (sandbox_cfg_t*) tor_malloc(sizeof(sandbox_cfg_t)); if (!elem) return NULL; - elem->param = (smp_param_t*) malloc(sizeof(smp_param_t)); + elem->param = (smp_param_t*) tor_malloc(sizeof(smp_param_t)); if (!elem->param) { - free(elem); + tor_free(elem); return NULL; } @@ -793,7 +793,7 @@ sandbox_cfg_allow_stat64_filename(sandbox_cfg_t **cfg, char *file, int fr) elem->next = *cfg; *cfg = elem; - if (fr) tor_free_(file); + if (fr) tor_free(file); return 0; } @@ -836,7 +836,7 @@ sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file, int fr) elem->next = *cfg; *cfg = elem; - if (fr) tor_free_(file); + if (fr) tor_free(file); return 0; } @@ -879,7 +879,7 @@ sandbox_cfg_allow_openat_filename(sandbox_cfg_t **cfg, char *file, int fr) elem->next = *cfg; *cfg = elem; - if (fr) tor_free_(file); + if (fr) tor_free(file); return 0; } @@ -958,7 +958,7 @@ sandbox_getaddrinfo(const char *name, struct addrinfo hints, for (el = sb_addr_info; el; el = el->next) { if (!strcmp(el->name, name)) { - *res = (struct addrinfo *) malloc(sizeof(struct addrinfo)); + *res = (struct addrinfo *) tor_malloc(sizeof(struct addrinfo)); if (!res) { return -2; } @@ -980,7 +980,7 @@ sandbox_getaddrinfo(const char *name, struct addrinfo hints, // getting here means something went wrong log_err(LD_BUG,"(Sandbox) failed to get address %s!", name); if (*res) { - free(*res); + tor_free(*res); res = NULL; } return -1; @@ -993,7 +993,7 @@ sandbox_add_addrinfo(const char* name) struct addrinfo hints; sb_addr_info_t *el = NULL; - el = (sb_addr_info_t*) malloc(sizeof(sb_addr_info_t)); + el = (sb_addr_info_t*) tor_malloc(sizeof(sb_addr_info_t)); if (!el) { log_err(LD_BUG,"(Sandbox) failed to allocate addr info!"); ret = -2;

1 0

[tor/master] fixed bug where sandbox_getaddrinfo() would fail when -Sandbox is 0
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 55d8b8e578e17d8654f33f62fdc4a4419a6b92a7 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Tue Sep 3 16:37:12 2013 +0300 fixed bug where sandbox_getaddrinfo() would fail when -Sandbox is 0 --- src/common/address.c | 2 +- src/common/sandbox.c | 30 ++++++++++++++++++++++++++---- src/common/sandbox.h | 3 ++- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 5c8603e..a46aeb0 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -235,7 +235,7 @@ tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr) memset(&hints, 0, sizeof(hints)); hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; - err = sandbox_getaddrinfo(name, &res); + err = sandbox_getaddrinfo(name, hints, &res); if (!err) { best = NULL; for (res_p = res; res_p; res_p = res_p->ai_next) { diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 1f0584c..19c2898 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -54,6 +54,7 @@ #include <time.h> #include <poll.h> +static int sandbox_active = 0; static sandbox_cfg_t *filter_dynamic = NULL; static sb_addr_info_t *sb_addr_info = NULL; @@ -948,7 +949,8 @@ sandbox_cfg_allow_execve_array(sandbox_cfg_t **cfg, ...) } int -sandbox_getaddrinfo(const char *name, struct addrinfo **res) +sandbox_getaddrinfo(const char *name, struct addrinfo hints, + struct addrinfo **res) { sb_addr_info_t *el; @@ -956,18 +958,31 @@ sandbox_getaddrinfo(const char *name, struct addrinfo **res) for (el = sb_addr_info; el; el = el->next) { if (!strcmp(el->name, name)) { - *res = (struct addrinfo *)malloc(sizeof(struct addrinfo)); + *res = (struct addrinfo *) malloc(sizeof(struct addrinfo)); if (!res) { return -2; } memcpy(*res, el->info, sizeof(struct addrinfo)); - return 0; } } + if (!sandbox_active) { + if (getaddrinfo(name, NULL, &hints, res)) { + log_err(LD_BUG,"(Sandbox) getaddrinfo failed!"); + return -1; + } + + return 0; + } + + // getting here means something went wrong log_err(LD_BUG,"(Sandbox) failed to get address %s!", name); + if (*res) { + free(*res); + res = NULL; + } return -1; } @@ -1069,7 +1084,14 @@ install_syscall_filter(sandbox_cfg_t* cfg) goto end; } - rc = seccomp_load(ctx); + // loading the seccomp2 filter + if((rc = seccomp_load(ctx))) { + log_err(LD_BUG, "(Sandbox) failed to load!"); + goto end; + } + + // marking the sandbox as active + sandbox_active = 1; end: seccomp_release(ctx); diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 59474c4..503bb70 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -133,7 +133,8 @@ typedef struct { int sandbox_add_addrinfo(const char *addr); /** Replacement for getaddrinfo(), using pre-recorded results. */ -int sandbox_getaddrinfo(const char *name, struct addrinfo **res); +int sandbox_getaddrinfo(const char *name, struct addrinfo hints, + struct addrinfo **res); /** Use <b>fd</b> to log non-survivable sandbox violations. */ void sandbox_set_debugging_fd(int fd);

1 0

[tor/master] switched string lengths from int to size_t in prot_strings()
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 42f5737c810622bd1e83caffd27c25908e862597 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Fri Sep 6 12:26:50 2013 +0300 switched string lengths from int to size_t in prot_strings() --- src/common/sandbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 19c2898..b4189b5 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -696,7 +696,7 @@ static int prot_strings(sandbox_cfg_t* cfg) { int ret = 0; - int pr_mem_size = 0, pr_mem_left = 0; + size_t pr_mem_size = 0, pr_mem_left = 0; char *pr_mem_next = NULL, *pr_mem_base; sandbox_cfg_t *el = NULL; @@ -721,7 +721,7 @@ prot_strings(sandbox_cfg_t* cfg) // change el value pointer to protected for (el = cfg; el != NULL; el = el->next) { char *param_val = (char*)((smp_param_t *)el->param)->value; - int param_size = strlen(param_val) + 1; + size_t param_size = strlen(param_val) + 1; if (pr_mem_left - param_size >= 0) { // copy to protected

1 0

[tor/master] added missing documentation for sandbox functions
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 340cca524f23195c00c46874b19980bbe7138ead Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Fri Sep 6 21:41:45 2013 +0300 added missing documentation for sandbox functions --- src/common/sandbox.c | 157 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 121 insertions(+), 36 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index e936b62..1fa4d61 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -54,8 +54,11 @@ #include <time.h> #include <poll.h> +/**Determines if at least one sandbox is active.*/ static int sandbox_active = 0; +/** Holds the parameter list configuration for the sandbox.*/ static sandbox_cfg_t *filter_dynamic = NULL; +/** Holds a list of pre-recorded results from getaddrinfo().*/ static sb_addr_info_t *sb_addr_info = NULL; /** Variable used for storing all syscall numbers that will be allowed with the @@ -130,6 +133,10 @@ static int filter_nopar_gen[] = { SCMP_SYS(unlink) }; +/** + * Function responsible for setting up the rt_sigaction syscall for + * the seccomp filter sandbox. + */ static int sb_rt_sigaction(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -150,6 +157,10 @@ sb_rt_sigaction(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return rc; } +/** + * Function responsible for setting up the execve syscall for + * the seccomp filter sandbox. + */ static int sb_execve(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -175,6 +186,10 @@ sb_execve(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } +/** + * Function responsible for setting up the time syscall for + * the seccomp filter sandbox. + */ static int sb_time(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -182,6 +197,10 @@ sb_time(scmp_filter_ctx ctx, sandbox_cfg_t *filter) SCMP_CMP(0, SCMP_CMP_EQ, 0)); } +/** + * Function responsible for setting up the accept4 syscall for + * the seccomp filter sandbox. + */ static int sb_accept4(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -205,6 +224,10 @@ sb_accept4(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } #ifdef __NR_mmap2 +/** + * Function responsible for setting up the mmap2 syscall for + * the seccomp filter sandbox. + */ static int sb_mmap2(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -263,6 +286,10 @@ sb_mmap2(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } #endif +/** + * Function responsible for setting up the open syscall for + * the seccomp filter sandbox. + */ static int sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -285,7 +312,6 @@ sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } } - // problem: required by getaddrinfo rc = seccomp_rule_add(ctx, SCMP_ACT_ERRNO(-1), SCMP_SYS(open), 1, SCMP_CMP(1, SCMP_CMP_EQ, O_RDONLY|O_CLOEXEC)); if (rc != 0) { @@ -297,6 +323,10 @@ sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } +/** + * Function responsible for setting up the openat syscall for + * the seccomp filter sandbox. + */ static int sb_openat(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -325,6 +355,10 @@ sb_openat(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } +/** + * Function responsible for setting up the socket syscall for + * the seccomp filter sandbox. + */ static int sb_socket(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -367,6 +401,10 @@ sb_socket(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } +/** + * Function responsible for setting up the socketpair syscall for + * the seccomp filter sandbox. + */ static int sb_socketpair(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -387,6 +425,10 @@ sb_socketpair(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } +/** + * Function responsible for setting up the setsockopt syscall for + * the seccomp filter sandbox. + */ static int sb_setsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -407,6 +449,10 @@ sb_setsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } +/** + * Function responsible for setting up the getsockopt syscall for + * the seccomp filter sandbox. + */ static int sb_getsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -428,6 +474,10 @@ sb_getsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } #ifdef __NR_fcntl64 +/** + * Function responsible for setting up the fcntl64 syscall for + * the seccomp filter sandbox. + */ static int sb_fcntl64(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -459,7 +509,12 @@ sb_fcntl64(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } #endif -// allows everything but will keep for now.. +/** + * Function responsible for setting up the epoll_ctl syscall for + * the seccomp filter sandbox. + * + * Note: basically allows everything but will keep for now.. + */ static int sb_epoll_ctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -484,8 +539,11 @@ sb_epoll_ctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } /** - * If multiple filters need to be added, seccomp needs to be whitelisted in - * this list. + * Function responsible for setting up the fcntl64 syscall for + * the seccomp filter sandbox. + * + * NOTE: if multiple filters need to be added, the PR_SECCOMP parameter needs + * to be whitelisted in this function. */ static int sb_prctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter) @@ -501,7 +559,11 @@ sb_prctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } /** - * does not NEED tobe here.. only occurs before filter + * Function responsible for setting up the fcntl64 syscall for + * the seccomp filter sandbox. + * + * NOTE: does not NEED to be here.. currently only occurs before filter; will + * keep just in case for the future. */ static int sb_mprotect(scmp_filter_ctx ctx, sandbox_cfg_t *filter) @@ -526,6 +588,10 @@ sb_mprotect(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } +/** + * Function responsible for setting up the rt_sigprocmask syscall for + * the seccomp filter sandbox. + */ static int sb_rt_sigprocmask(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -545,7 +611,10 @@ sb_rt_sigprocmask(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } /** - * does not NEED tobe here.. only occurs before filter + * Function responsible for setting up the flock syscall for + * the seccomp filter sandbox. + * + * NOTE: does not need to be here, occurs before filter is applied. */ static int sb_flock(scmp_filter_ctx ctx, sandbox_cfg_t *filter) @@ -565,6 +634,10 @@ sb_flock(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } +/** + * Function responsible for setting up the futex syscall for + * the seccomp filter sandbox. + */ static int sb_futex(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -591,7 +664,10 @@ sb_futex(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } /** - * does not NEED tobe here.. only occurs before filter + * Function responsible for setting up the mremap syscall for + * the seccomp filter sandbox. + * + * NOTE: so far only occurs before filter is applied. */ static int sb_mremap(scmp_filter_ctx ctx, sandbox_cfg_t *filter) @@ -606,6 +682,10 @@ sb_mremap(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } +/** + * Function responsible for setting up the poll syscall for + * the seccomp filter sandbox. + */ static int sb_poll(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -621,6 +701,10 @@ sb_poll(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } #ifdef __NR_stat64 +/** + * Function responsible for setting up the stat64 syscall for + * the seccomp filter sandbox. + */ static int sb_stat64(scmp_filter_ctx ctx, sandbox_cfg_t *filter) { @@ -647,6 +731,10 @@ sb_stat64(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } #endif +/** + * Array of function pointers responsible for filtering different syscalls at + * a parameter level. + */ static sandbox_filter_func_t filter_func[] = { sb_rt_sigaction, sb_rt_sigprocmask, @@ -692,6 +780,12 @@ sandbox_intern_string(const char *str) return str; } +/** + * Protects all the strings in the sandbox's parameter list configuration. It + * works by calculating the total amount of memory required by the parameter + * list, allocating the memory using mmap, and protecting it from writes with + * mprotect(). + */ static int prot_strings(sandbox_cfg_t* cfg) { @@ -754,6 +848,12 @@ prot_strings(sandbox_cfg_t* cfg) return ret; } +/** + * Auxiliary function used in order to allocate a sandbox_cfg_t element and set + * it's values according the the parameter list. All elements are initialised + * with the 'prot' field set to false, as the pointer is not protected at this + * point. + */ static sandbox_cfg_t* new_element(int syscall, int index, intptr_t value) { @@ -1019,6 +1119,10 @@ sandbox_add_addrinfo(const char* name) return ret; } +/** + * Function responsible for going through the parameter syscall filters and + * call each function pointer in the list. + */ static int add_param_filter(scmp_filter_ctx ctx, sandbox_cfg_t* cfg) { @@ -1036,6 +1140,10 @@ add_param_filter(scmp_filter_ctx ctx, sandbox_cfg_t* cfg) return 0; } +/** + * Function responsible of loading the libseccomp syscall filters which do not + * have parameter filtering. + */ static int add_noparam_filter(scmp_filter_ctx ctx) { @@ -1085,7 +1193,7 @@ install_syscall_filter(sandbox_cfg_t* cfg) } // loading the seccomp2 filter - if((rc = seccomp_load(ctx))) { + if ((rc = seccomp_load(ctx))) { log_err(LD_BUG, "(Sandbox) failed to load!"); goto end; } @@ -1183,6 +1291,11 @@ install_sigsys_debugging(void) return 0; } +/** + * Function responsible of registering the sandbox_cfg_t list of parameter + * syscall filters to the existing parameter list. This is used for incipient + * multiple-sandbox support. + */ static int register_cfg(sandbox_cfg_t* cfg) { @@ -1256,34 +1369,6 @@ sandbox_init(sandbox_cfg_t* cfg) #endif } -/** - * Enables the stage 1 general sandbox. It applies a syscall filter which does - * not restrict any Tor features. The filter is representative for the whole - * application. - */ -int -tor_global_sandbox(void) -{ - -#if defined(USE_LIBSECCOMP) - return initialise_libseccomp_sandbox(NULL); - -#elif defined(_WIN32) - log_warn(LD_BUG,"Windows sandboxing is not implemented. The feature is " - "currently disabled."); - return 0; - -#elif defined(TARGET_OS_MAC) - log_warn(LD_BUG,"Mac OSX sandboxing is not implemented. The feature is " - "currently disabled"); - return 0; -#else - log_warn(LD_BUG,"Sandboxing is not implemented for your platform. The " - "feature is currently disabled"); - return 0; -#endif -} - void sandbox_set_debugging_fd(int fd) {

1 0

[tor/master] replaced strdup with tor_strdup
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 839ff0063d3fca10a64abf69ab27d1fd88456889 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Fri Sep 6 12:30:01 2013 +0300 replaced strdup with tor_strdup --- src/common/sandbox.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 0c2145f..7e77ea1 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -784,7 +784,7 @@ sandbox_cfg_allow_stat64_filename(sandbox_cfg_t **cfg, char *file, int fr) { sandbox_cfg_t *elem = NULL; - elem = new_element(SCMP_SYS(stat64), 0, (intptr_t) strdup(file)); + elem = new_element(SCMP_SYS(stat64), 0, (intptr_t) tor_strdup(file)); if (!elem) { log_err(LD_BUG,"(Sandbox) failed to register parameter!"); return -1; @@ -827,7 +827,7 @@ sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file, int fr) { sandbox_cfg_t *elem = NULL; - elem = new_element(SCMP_SYS(open), 0, (intptr_t) strdup(file)); + elem = new_element(SCMP_SYS(open), 0, (intptr_t) tor_strdup(file)); if (!elem) { log_err(LD_BUG,"(Sandbox) failed to register parameter!"); return -1; @@ -870,7 +870,7 @@ sandbox_cfg_allow_openat_filename(sandbox_cfg_t **cfg, char *file, int fr) { sandbox_cfg_t *elem = NULL; - elem = new_element(SCMP_SYS(openat), 1, (intptr_t) strdup(file)); + elem = new_element(SCMP_SYS(openat), 1, (intptr_t) tor_strdup(file)); if (!elem) { log_err(LD_BUG,"(Sandbox) failed to register parameter!"); return -1; @@ -913,7 +913,7 @@ sandbox_cfg_allow_execve(sandbox_cfg_t **cfg, char *com) { sandbox_cfg_t *elem = NULL; - elem = new_element(SCMP_SYS(execve), 1, (intptr_t) strdup(com)); + elem = new_element(SCMP_SYS(execve), 1, (intptr_t) tor_strdup(com)); if (!elem) { log_err(LD_BUG,"(Sandbox) failed to register parameter!"); return -1;

1 0

[tor/master] added contingency message to test for sandbox_getaddrinfo
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit fe6e2733ab1e75e0b56741fa06094b257b3695b8 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Mon Sep 2 12:16:02 2013 +0300 added contingency message to test for sandbox_getaddrinfo --- src/common/sandbox.c | 3 ++- src/or/main.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index a491912..84d2183 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -930,6 +930,7 @@ sandbox_getaddrinfo(const char *name, struct addrinfo **res) } } + log_err(LD_BUG,"(Sandbox) failed to get address %s!", name); return -1; } @@ -958,7 +959,7 @@ sandbox_add_addrinfo(const char* name) goto out; } - el->name = strdup(name); + el->name = tor_strdup(name); el->next = sb_addr_info; sb_addr_info = el; diff --git a/src/or/main.c b/src/or/main.c index af05f0b..5ab4936 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2640,7 +2640,8 @@ find_flashcard_path(PWCHAR path, size_t size) #endif static void -init_addrinfo(void) { +init_addrinfo(void) +{ char hname[256]; // host name to sandbox

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2013