August 2014 - tor-commits - lists.torproject.org

[tor/master] Suppress coverity warning about overflowing in safe_mem_is_zero
by nickm＠torproject.org 21 Aug '14

21 Aug '14

commit 917e1042f75e9db2836def41210fa756c8ca3a85 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 21 10:44:13 2014 -0400 Suppress coverity warning about overflowing in safe_mem_is_zero The unsigned underflow here is defined and intentional. CID 202482 --- src/common/di_ops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/di_ops.c b/src/common/di_ops.c index f03b2b7..a8bfd02 100644 --- a/src/common/di_ops.c +++ b/src/common/di_ops.c @@ -218,6 +218,7 @@ safe_mem_is_zero(const void *mem, size_t sz) total |= *ptr++; } + /*coverity[overflow]*/ return 1 & ((total - 1) >> 8); }

1 0

[tor/master] remove meaningless checks for chunks==NULL in dirserv stuff
by nickm＠torproject.org 21 Aug '14

21 Aug '14

commit 059e33de59030b008193512b58a51be922fffea4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 21 11:01:44 2014 -0400 remove meaningless checks for chunks==NULL in dirserv stuff Also, make it clearer that chunks cannot be NULL [CID 1031750, 1031751] --- src/or/dirserv.c | 9 +++------ src/or/dirvote.c | 10 ++++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f33437f..52258e8 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1959,13 +1959,12 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, char published[ISO_TIME_LEN+1]; char identity64[BASE64_DIGEST_LEN+1]; char digest64[BASE64_DIGEST_LEN+1]; - smartlist_t *chunks = NULL; + smartlist_t *chunks = smartlist_new(); format_iso_time(published, rs->published_on); digest_to_base64(identity64, rs->identity_digest); digest_to_base64(digest64, rs->descriptor_digest); - chunks = smartlist_new(); smartlist_add_asprintf(chunks, "r %s %s %s%s%s %s %d %d\n", rs->nickname, @@ -2090,10 +2089,8 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, result = smartlist_join_strings(chunks, "", 0, NULL); err: - if (chunks) { - SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp)); - smartlist_free(chunks); - } + SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp)); + smartlist_free(chunks); return result; } diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 30f1321..6536b7f 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -64,7 +64,7 @@ STATIC char * format_networkstatus_vote(crypto_pk_t *private_signing_key, networkstatus_t *v3_ns) { - smartlist_t *chunks; + smartlist_t *chunks = smartlist_new(); const char *client_versions = NULL, *server_versions = NULL; char fingerprint[FINGERPRINT_LEN+1]; char digest[DIGEST_LEN]; @@ -98,7 +98,6 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, server_versions_line = tor_strdup(""); } - chunks = smartlist_new(); { char published[ISO_TIME_LEN+1]; char va[ISO_TIME_LEN+1]; @@ -230,10 +229,9 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, done: tor_free(client_versions_line); tor_free(server_versions_line); - if (chunks) { - SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp)); - smartlist_free(chunks); - } + + SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp)); + smartlist_free(chunks); return status; }

1 0

[tor/master] Check for duplicate arguments to tor-gencert
by nickm＠torproject.org 21 Aug '14

21 Aug '14

commit 446e481c90666235bc184cdad6a8578b79fa258e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 21 11:09:40 2014 -0400 Check for duplicate arguments to tor-gencert Found by coverity, which noticed that if you said tor-gencert -i identity1 -i identity2 we would leak "identity1". [CID 1198201, 1198202, 1198203] --- changes/check_dup_args_gencert | 3 +++ src/tools/tor-gencert.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/check_dup_args_gencert b/changes/check_dup_args_gencert new file mode 100644 index 0000000..d0925df --- /dev/null +++ b/changes/check_dup_args_gencert @@ -0,0 +1,3 @@ + o Minor features: + - In tor-gencert, report an error if the user provides the same + argument more than once. diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index e799df5..fae26ef 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -134,18 +134,30 @@ parse_commandline(int argc, char **argv) fprintf(stderr, "No argument to -i\n"); return 1; } + if (identity_key_file) { + fprintf(stderr, "Duplicate values for -i\n"); + return -1; + } identity_key_file = tor_strdup(argv[++i]); } else if (!strcmp(argv[i], "-s")) { if (i+1>=argc) { fprintf(stderr, "No argument to -s\n"); return 1; } + if (signing_key_file) { + fprintf(stderr, "Duplicate values for -s\n"); + return -1; + } signing_key_file = tor_strdup(argv[++i]); } else if (!strcmp(argv[i], "-c")) { if (i+1>=argc) { fprintf(stderr, "No argument to -c\n"); return 1; } + if (certificate_file) { + fprintf(stderr, "Duplicate values for -c\n"); + return -1; + } certificate_file = tor_strdup(argv[++i]); } else if (!strcmp(argv[i], "-m")) { if (i+1>=argc) {

1 0

[tor/master] fix memory leak on failure in sandbox.c:prot_strings()
by nickm＠torproject.org 21 Aug '14

21 Aug '14

commit 523587a5cf62119baa01822e2e783925726a790b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 21 11:40:48 2014 -0400 fix memory leak on failure in sandbox.c:prot_strings() [CID 1205014] --- src/common/sandbox.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 86dc56c..e735feb 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1084,7 +1084,7 @@ prot_strings(scmp_filter_ctx ctx, sandbox_cfg_t* cfg) SCMP_CMP(0, SCMP_CMP_EQ, (intptr_t) pr_mem_base)); if (ret) { log_err(LD_BUG,"(Sandbox) munmap protected memory filter fail!"); - return ret; + goto out; } /* @@ -1103,7 +1103,7 @@ prot_strings(scmp_filter_ctx ctx, sandbox_cfg_t* cfg) SCMP_CMP(2, SCMP_CMP_EQ, PROT_READ|PROT_WRITE)); if (ret) { log_err(LD_BUG,"(Sandbox) mprotect protected memory filter fail (LT)!"); - return ret; + goto out; } ret = seccomp_rule_add_3(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), @@ -1113,7 +1113,7 @@ prot_strings(scmp_filter_ctx ctx, sandbox_cfg_t* cfg) SCMP_CMP(2, SCMP_CMP_EQ, PROT_READ|PROT_WRITE)); if (ret) { log_err(LD_BUG,"(Sandbox) mprotect protected memory filter fail (GT)!"); - return ret; + goto out; } out:

1 0

[tor/master] Store sandbox params as char *, since that's what they are.
by nickm＠torproject.org 21 Aug '14

21 Aug '14

commit 35b2e11755627cdd9b746f150ccdbecbcc867f0d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 21 11:20:29 2014 -0400 Store sandbox params as char *, since that's what they are. This allows coverity to infer that we aren't leaking them. [Fixes a lot of CIDs] --- src/common/sandbox.c | 38 +++++++++++++++++++------------------- src/common/sandbox.h | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 05b91be..86dc56c 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -98,6 +98,8 @@ static sandbox_cfg_t *filter_dynamic = NULL; #undef SCMP_CMP #define SCMP_CMP(a,b,c) ((struct scmp_arg_cmp){(a),(b),(c),0}) +#define SCMP_CMP_STR(a,b,c) \ + ((struct scmp_arg_cmp){(a),(b),(intptr_t)(void*)(c),0}) #define SCMP_CMP4(a,b,c,d) ((struct scmp_arg_cmp){(a),(b),(c),(d)}) /* We use a wrapper here because these masked comparisons seem to be pretty * verbose. Also, it's important to cast to scmp_datum_t before negating the @@ -252,7 +254,7 @@ sb_execve(scmp_filter_ctx ctx, sandbox_cfg_t *filter) if (param != NULL && param->prot == 1 && param->syscall == SCMP_SYS(execve)) { rc = seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(execve), - SCMP_CMP(0, SCMP_CMP_EQ, param->value)); + SCMP_CMP_STR(0, SCMP_CMP_EQ, param->value)); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add execve syscall, received " "libseccomp error %d", rc); @@ -389,7 +391,7 @@ sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter) if (param != NULL && param->prot == 1 && param->syscall == SCMP_SYS(open)) { rc = seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), - SCMP_CMP(0, SCMP_CMP_EQ, param->value)); + SCMP_CMP_STR(0, SCMP_CMP_EQ, param->value)); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add open syscall, received " "libseccomp error %d", rc); @@ -444,8 +446,8 @@ sb_rename(scmp_filter_ctx ctx, sandbox_cfg_t *filter) param->syscall == SCMP_SYS(rename)) { rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rename), - SCMP_CMP(0, SCMP_CMP_EQ, param->value), - SCMP_CMP(1, SCMP_CMP_EQ, param->value2)); + SCMP_CMP_STR(0, SCMP_CMP_EQ, param->value), + SCMP_CMP_STR(1, SCMP_CMP_EQ, param->value2)); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add rename syscall, received " "libseccomp error %d", rc); @@ -475,7 +477,7 @@ sb_openat(scmp_filter_ctx ctx, sandbox_cfg_t *filter) == SCMP_SYS(openat)) { rc = seccomp_rule_add_3(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), SCMP_CMP(0, SCMP_CMP_EQ, AT_FDCWD), - SCMP_CMP(1, SCMP_CMP_EQ, param->value), + SCMP_CMP_STR(1, SCMP_CMP_EQ, param->value), SCMP_CMP(2, SCMP_CMP_EQ, O_RDONLY|O_NONBLOCK|O_LARGEFILE|O_DIRECTORY| O_CLOEXEC)); if (rc != 0) { @@ -884,7 +886,7 @@ sb_stat64(scmp_filter_ctx ctx, sandbox_cfg_t *filter) if (param != NULL && param->prot == 1 && (param->syscall == SCMP_SYS(open) || param->syscall == SCMP_SYS(stat64))) { rc = seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat64), - SCMP_CMP(0, SCMP_CMP_EQ, param->value)); + SCMP_CMP_STR(0, SCMP_CMP_EQ, param->value)); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add open syscall, received " "libseccomp error %d", rc); @@ -967,7 +969,7 @@ static int prot_strings_helper(strmap_t *locations, char **pr_mem_next_p, size_t *pr_mem_left_p, - intptr_t *value_p) + char **value_p) { char *param_val; size_t param_size; @@ -983,7 +985,7 @@ prot_strings_helper(strmap_t *locations, if (location) { // We already interned this string. tor_free(param_val); - *value_p = (intptr_t) location; + *value_p = location; return 0; } else if (*pr_mem_left_p >= param_size) { // copy to protected @@ -992,7 +994,7 @@ prot_strings_helper(strmap_t *locations, // re-point el parameter to protected tor_free(param_val); - *value_p = (intptr_t) location; + *value_p = location; strmap_set(locations, location, location); /* good real estate advice */ @@ -1126,7 +1128,7 @@ prot_strings(scmp_filter_ctx ctx, sandbox_cfg_t* cfg) * point. */ static sandbox_cfg_t* -new_element2(int syscall, intptr_t value, intptr_t value2) +new_element2(int syscall, char *value, char *value2) { smp_param_t *param = NULL; @@ -1142,9 +1144,9 @@ new_element2(int syscall, intptr_t value, intptr_t value2) } static sandbox_cfg_t* -new_element(int syscall, intptr_t value) +new_element(int syscall, char *value) { - return new_element2(syscall, value, 0); + return new_element2(syscall, value, NULL); } #ifdef __NR_stat64 @@ -1158,7 +1160,7 @@ sandbox_cfg_allow_stat_filename(sandbox_cfg_t **cfg, char *file) { sandbox_cfg_t *elem = NULL; - elem = new_element(SCMP_stat, (intptr_t)(void*) file); + elem = new_element(SCMP_stat, file); if (!elem) { log_err(LD_BUG,"(Sandbox) failed to register parameter!"); return -1; @@ -1197,7 +1199,7 @@ sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file) { sandbox_cfg_t *elem = NULL; - elem = new_element(SCMP_SYS(open), (intptr_t)(void *) file); + elem = new_element(SCMP_SYS(open), file); if (!elem) { log_err(LD_BUG,"(Sandbox) failed to register parameter!"); return -1; @@ -1214,9 +1216,7 @@ sandbox_cfg_allow_rename(sandbox_cfg_t **cfg, char *file1, char *file2) { sandbox_cfg_t *elem = NULL; - elem = new_element2(SCMP_SYS(rename), - (intptr_t)(void *) file1, - (intptr_t)(void *) file2); + elem = new_element2(SCMP_SYS(rename), file1, file2); if (!elem) { log_err(LD_BUG,"(Sandbox) failed to register parameter!"); @@ -1256,7 +1256,7 @@ sandbox_cfg_allow_openat_filename(sandbox_cfg_t **cfg, char *file) { sandbox_cfg_t *elem = NULL; - elem = new_element(SCMP_SYS(openat), (intptr_t)(void *) file); + elem = new_element(SCMP_SYS(openat), file); if (!elem) { log_err(LD_BUG,"(Sandbox) failed to register parameter!"); return -1; @@ -1296,7 +1296,7 @@ sandbox_cfg_allow_execve(sandbox_cfg_t **cfg, const char *com) { sandbox_cfg_t *elem = NULL; - elem = new_element(SCMP_SYS(execve), (intptr_t)(void *) com); + elem = new_element(SCMP_SYS(execve), com); if (!elem) { log_err(LD_BUG,"(Sandbox) failed to register parameter!"); return -1; diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 20d5d50..b4bb294 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -66,9 +66,9 @@ typedef struct smp_param { int syscall; /** parameter value. */ - intptr_t value; + char *value; /** parameter value, second argument. */ - intptr_t value2; + char *value2; /** parameter flag (0 = not protected, 1 = protected). */ int prot;

1 0

[tor/master] Merge branch 'coverity_20140821'
by nickm＠torproject.org 21 Aug '14

21 Aug '14

commit a8cc41a2303b9f6c8cffa6b69cd759760d91226e Merge: 916fba2 523587a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 21 12:14:00 2014 -0400 Merge branch 'coverity_20140821' changes/check_dup_args_gencert | 3 +++ src/common/container.c | 8 ++++++++ src/common/di_ops.c | 2 ++ src/common/sandbox.c | 44 ++++++++++++++++++++-------------------- src/common/sandbox.h | 4 ++-- src/common/tortls.c | 12 +++++++---- src/common/util.c | 7 +++++-- src/or/circuitstats.c | 4 +++- src/or/control.c | 8 ++++---- src/or/dirserv.c | 9 +++----- src/or/dirvote.c | 17 ++++++++-------- src/or/rendservice.c | 8 ++------ src/or/routerlist.c | 2 +- src/test/test_entrynodes.c | 2 ++ src/tools/tor-gencert.c | 12 +++++++++++ 15 files changed, 86 insertions(+), 56 deletions(-)

1 0

[orbot/master] don't call handle intents twice!
by n8fr8＠torproject.org 21 Aug '14

21 Aug '14

commit eaccf771160a452bac5ac96cffcdd50c7d34105f Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 21 10:10:14 2014 -0400 don't call handle intents twice! --- src/org/torproject/android/Orbot.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 0de689d..d603d89 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -1193,11 +1193,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic torStatus = mService.getStatus(); initUpdates(); - if (autoStartFromIntent) - { - startTor(); - } - handleIntents(); updateStatus("");

1 0

[orbot/master] update to 14.0.7.1
by n8fr8＠torproject.org 21 Aug '14

21 Aug '14

commit c2672cc95f0b781869061465a7df1e36940513a9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 21 12:01:58 2014 -0400 update to 14.0.7.1 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fcbdfab..2146b4a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.0.7" - android:versionCode="119" + android:versionName="14.0.7.1" + android:versionCode="120" android:installLocation="auto" >

1 0

[chutney/master] Don't override built-in name 'dir'
by nickm＠torproject.org 21 Aug '14

21 Aug '14

commit 31af7760de8f9a582c2631ef818a7346620cfc39 Author: Daniel Martí <mvdan(a)mvdan.cc> Date: Thu Aug 21 17:38:15 2014 +0200 Don't override built-in name 'dir' --- lib/chutney/TorNet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 35deb41..d343688 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -441,12 +441,12 @@ class LocalNodeController(NodeController): pid = self.getPid() running = self.isRunning(pid) nick = self._env['nick'] - dir = self._env['dir'] + datadir = self._env['dir'] if running: if listRunning: print "%s is running with PID %s" % (nick, pid) return True - elif os.path.exists(os.path.join(dir, "core.%s" % pid)): + elif os.path.exists(os.path.join(datadir, "core.%s" % pid)): if listNonRunning: print "%s seems to have crashed, and left core file core.%s" % ( nick, pid)

1 0

[chutney/master] Keep static analyzers like pyflakes happy about globals
by nickm＠torproject.org 21 Aug '14

21 Aug '14

commit 60b2d18d81904e6a71a352dfa8b5cb73f4e04003 Author: Daniel Martí <mvdan(a)mvdan.cc> Date: Thu Aug 21 17:42:26 2014 +0200 Keep static analyzers like pyflakes happy about globals _BASE_ENVIRON and _THE_NETWORK are set programmatically in main(), so static analyzers think that they may not always be declared. So declare them as global variables at the beginning and we're good. --- lib/chutney/TorNet.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 872ff8d..6a1fc8b 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -24,6 +24,9 @@ import time import chutney.Templating import chutney.Traffic +_BASE_ENVIRON = None +_THE_NETWORK = None + def mkdir_p(d, mode=0777): """Create directory 'd' and all of its parents as needed. Unlike

1 0