nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed paramfilter type to intptr_t

Browse Source
This commit is contained in:
Cristian Toader 2013-07-23 10:14:25 +03:00
parent 8dfa5772e7
commit 7cf1dbfd51
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/sandbox.c
View File

@ -34,8 +34,8 @@
static ParFilter param_filter[] = { static ParFilter param_filter[] = {
// Example entries // Example entries
{SCMP_SYS(execve), "/usr/local/bin/tor", 0}, {SCMP_SYS(execve), (intptr_t)("/usr/local/bin/tor"), 0},
{SCMP_SYS(execve), "/usr/local/bin/tor", 0} {SCMP_SYS(execve), (intptr_t)("/usr/local/bin/tor"), 0}
}; };
/** Variable used for storing all syscall numbers that will be allowed with the /** Variable used for storing all syscall numbers that will be allowed with the
@ -165,9 +165,9 @@ get_prot_param(char *param)
} }
for (i = 0; i < filter_size; i++) { for (i = 0; i < filter_size; i++) {
if (param_filter[i].prot && !strncmp(param, param_filter[i].param, if (param_filter[i].prot && !strncmp(param, (char*) param_filter[i].param,
MAX_PARAM_LEN)) { MAX_PARAM_LEN)) {
return param_filter[i].param; return (char*)(param_filter[i].param);
} }
} }
@ -190,7 +190,7 @@ add_param_filter(scmp_filter_ctx ctx)
for (i = 0; i < filter_size; i++) { for (i = 0; i < filter_size; i++) {
if (!param_filter[i].prot) { if (!param_filter[i].prot) {
// allocating protected memory region for parameter // allocating protected memory region for parameter
param_size = 1 + strnlen(param_filter[i].param, MAX_PARAM_LEN); param_size = 1 + strnlen((char*) param_filter[i].param, MAX_PARAM_LEN);
if (param_size == MAX_PARAM_LEN) { if (param_size == MAX_PARAM_LEN) {
log_warn(LD_BUG, "(Sandbox) Parameter %i length too large!", i); log_warn(LD_BUG, "(Sandbox) Parameter %i length too large!", i);
} }
@ -203,18 +203,18 @@ add_param_filter(scmp_filter_ctx ctx)
} }
// copying from non protected to protected + pointer reassign // copying from non protected to protected + pointer reassign
memcpy(map, param_filter[i].param, param_size); memcpy(map, (char*) param_filter[i].param, param_size);
param_filter[i].param = map; param_filter[i].param = (intptr_t) map;
// protecting from writes // protecting from writes
if (mprotect(param_filter[i].param, param_size, PROT_READ)) { if (mprotect((char*) param_filter[i].param, param_size, PROT_READ)) {
log_err(LD_BUG,"(Sandbox) failed to protect memory!"); log_err(LD_BUG,"(Sandbox) failed to protect memory!");
return -1; return -1;
} }
} // if not protected } // if not protected
rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, param_filter[i].syscall, 1, rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, param_filter[i].syscall, 1,
SCMP_A0(SCMP_CMP_EQ, (intptr_t) param_filter[i].param)); SCMP_A0(SCMP_CMP_EQ, param_filter[i].param));
if (rc != 0) { if (rc != 0) {
log_err(LD_BUG,"(Sandbox) failed to add syscall index %d, " log_err(LD_BUG,"(Sandbox) failed to add syscall index %d, "
"received libseccomp error %d", i, rc); "received libseccomp error %d", i, rc);

4
src/common/sandbox.h
View File

@ -22,6 +22,8 @@
#endif #endif
#include "torint.h"
/** /**
* Linux definitions * Linux definitions
*/ */
@ -34,7 +36,7 @@
typedef struct { typedef struct {
int syscall; int syscall;
char *param; intptr_t param; // TODO: make this intptr_t to support multiple types
char prot; char prot;
} ParFilter; } ParFilter;