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

[tor/master] Bump version to 0.2.5.4-alpha.
by nickm＠torproject.org 25 Apr '14

25 Apr '14

commit b54669bc007adcbe826ec6a531c1719979c06f0b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 25 02:07:53 2014 -0400 Bump version to 0.2.5.4-alpha. Probably releasing within ~22 hours, pending testing --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 4831b4e..30feda6 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.5.3-alpha-dev]) +AC_INIT([tor],[0.2.5.4-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index d14ff79..1d9274a 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.5.3-alpha-dev" +!define VERSION "0.2.5.4-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ba59e3b..c865d56 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.5.3-alpha-dev" +#define VERSION "0.2.5.4-alpha"

1 0

[tor/master] format_changelog.py now formats the first section, in-place.
by nickm＠torproject.org 25 Apr '14

25 Apr '14

commit 8727eb9e75b20bbdafc06ef6755f7fdd864ad726 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 25 02:43:19 2014 -0400 format_changelog.py now formats the first section, in-place. --- ChangeLog | 1 - contrib/format_changelog.py | 22 +++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01fd1b7..fc99575 100644 --- a/ChangeLog +++ b/ChangeLog @@ -267,7 +267,6 @@ Changes in version 0.2.5.4-alpha - 2014-04-?? Resolves ticket 11070. - Changes in version 0.2.5.3-alpha - 2014-03-22 Tor 0.2.5.3-alpha includes all the fixes from 0.2.4.21. It contains two new anti-DoS features for Tor relays, resolves a bug that kept diff --git a/contrib/format_changelog.py b/contrib/format_changelog.py index 6e3b804..1230053 100755 --- a/contrib/format_changelog.py +++ b/contrib/format_changelog.py @@ -9,6 +9,7 @@ # To run it, pipe a section of the changelog (starting with "Changes # in Tor 0.x.y.z-alpha" through the script.) +import os import re import sys import textwrap @@ -19,6 +20,7 @@ TP_BLANK = 2 TP_SECHEAD = 3 TP_ITEMFIRST = 4 TP_ITEMBODY = 5 +TP_END = 6 def head_parser(line): if re.match(r'^[A-Z]', line): @@ -39,6 +41,8 @@ def body_parser(line): return TP_ITEMBODY elif re.match(r'^\s*$', line): return TP_BLANK + elif re.match(r'^Changes in', line): + return TP_END else: print "Weird line %r"%line @@ -129,13 +133,29 @@ class ChangeLog(object): CL = ChangeLog() parser = head_parser +sys.stdin = open('ChangeLog', 'r') + for line in sys.stdin: line = line.rstrip() tp = parser(line) - CL.addLine(tp,line) if tp == TP_SECHEAD: parser = body_parser + elif tp == TP_END: + nextline = line + break + + CL.addLine(tp,line) CL.lint() + +sys.stdout = open('ChangeLog.new', 'w') + CL.dump() + +print nextline + +for line in sys.stdin: + sys.stdout.write(line) + +os.rename('ChangeLog.new', 'ChangeLog')

1 0

[tor/master] fix memory leak in dump_exit_policy_to_string tests
by nickm＠torproject.org 25 Apr '14

25 Apr '14

commit 167536a112fdcc4737bf9643639b162c3e79bc68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 25 01:59:20 2014 -0400 fix memory leak in dump_exit_policy_to_string tests --- src/test/test_policy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 491c9a2..e3e7b36 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -404,6 +404,7 @@ test_dump_exit_policy_to_string(void *arg) test_streq("accept *:*\nreject *:25\nreject 8.8.8.8:*\n" "reject6 [fc00::]/7:*",ep); + tor_free(ep); policy_entry = router_parse_addr_policy_item_from_string("accept6 [c000::]/3:*",-1);

1 0

[tor/master] Merge branch 'scanbuild_fixes'
by nickm＠torproject.org 25 Apr '14

25 Apr '14

1 0

[tor/master] Include the scan-build.sh script I used for 8793
by nickm＠torproject.org 25 Apr '14

25 Apr '14

commit 63426f79cb152e2e4cb7fc355412cc82faf29d6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 25 01:29:36 2014 -0400 Include the scan-build.sh script I used for 8793 Otherwise we'll never remember what to re-run before each release, or whether we tried a given checker. --- contrib/scan-build.sh | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/contrib/scan-build.sh b/contrib/scan-build.sh new file mode 100644 index 0000000..623b227 --- /dev/null +++ b/contrib/scan-build.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# Copyright 2014 The Tor Project, Inc +# See LICENSE for licensing information +# +# This script is used for running a bunch of clang scan-build checkers +# on Tor. +# +# It has hardwired paths for Nick's desktop at the moment. + +CHECKERS="\ + --use-analyzer=/opt/clang-3.4/bin/clang \ + -disable-checker deadcode.DeadStores \ + -enable-checker alpha.core.CastSize \ + -enable-checker alpha.core.CastToStruct \ + -enable-checker alpha.core.IdenticalExpr \ + -enable-checker alpha.core.SizeofPtr \ + -enable-checker alpha.security.ArrayBoundV2 \ + -enable-checker alpha.security.MallocOverflow \ + -enable-checker alpha.security.ReturnPtrRange \ + -enable-checker alpha.unix.SimpleStream + -enable-checker alpha.unix.cstring.BufferOverlap \ + -enable-checker alpha.unix.cstring.NotNullTerminated \ + -enable-checker alpha.unix.cstring.OutOfBounds \ + -enable-checker alpha.core.FixedAddr \ + -enable-checker security.insecureAPI.strcpy +" + +/opt/clang-3.4/bin/scan-build/scan-build \ + $CHECKERS \ + --use-analyzer=/opt/clang-3.4/bin/clang \ + ./configure + +/opt/clang-3.4/bin/scan-build/scan-build \ + $CHECKERS \ + --use-analyzer=/opt/clang-3.4/bin/clang \ + make -j2 + + +# Haven't tried this yet. +# -enable-checker alpha.unix.PthreadLock + +# This one gives a false positive on every strcmp. +# -enable-checker alpha.core.PointerSub + +# This one hates it when we stick a nonzero const in a pointer. +# -enable-checker alpha.core.FixedAddr + +# This one crashes sometimes for me. +# -enable-checker alpha.deadcode.IdempotentOperations

1 0

[tor/master] scan-build: circuit_cpath_support_ntor had a dead initialization
by nickm＠torproject.org 25 Apr '14

25 Apr '14

commit d1be2f5cf8afc7d94f4c69081897d7ea3da71298 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 18 20:29:51 2014 -0400 scan-build: circuit_cpath_support_ntor had a dead initialization We were initializing cpath twice, which doesn't make sense. --- src/or/circuitbuild.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 98fef4c..6bdbead 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -277,9 +277,9 @@ circuit_rep_hist_note_result(origin_circuit_t *circ) static int circuit_cpath_supports_ntor(const origin_circuit_t *circ) { - crypt_path_t *head = circ->cpath, *cpath = circ->cpath; + crypt_path_t *head, *cpath; - cpath = head; + cpath = head = circ->cpath; do { if (cpath->extend_info && !tor_mem_is_zero(

1 0

[tor/master] scan-build: Avoid crashing on BUG in circuit_get_by_rend_token_and_purpose
by nickm＠torproject.org 25 Apr '14

25 Apr '14

commit 0fd0f5f7a9309fb90a6a4d8bad7d6399a45c7cc1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 18 20:30:46 2014 -0400 scan-build: Avoid crashing on BUG in circuit_get_by_rend_token_and_purpose If we fail in circuit_get_by_rend_token_and_purpose because the circuit has no rend_info, don't try to reference fiends from its rend_info when logging an error. Bugfix on 8b9a2cb68, which is going into Tor 0.2.5.4-alpha. --- src/or/circuitlist.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index b71dc3c..24cb9fc 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1261,8 +1261,16 @@ circuit_get_by_rend_token_and_purpose(uint8_t purpose, int is_rend_circ, circ->base_.marked_for_close) return NULL; - if (!circ->rendinfo || - ! bool_eq(circ->rendinfo->is_rend_circ, is_rend_circ) || + if (!circ->rendinfo) { + char *t = tor_strdup(hex_str(token, REND_TOKEN_LEN)); + log_warn(LD_BUG, "Wanted a circuit with %s:%d, but lookup returned a " + "circuit with no rendinfo set.", + safe_str(t), is_rend_circ); + tor_free(t); + return NULL; + } + + if (! bool_eq(circ->rendinfo->is_rend_circ, is_rend_circ) || tor_memneq(circ->rendinfo->rend_token, token, REND_TOKEN_LEN)) { char *t = tor_strdup(hex_str(token, REND_TOKEN_LEN)); log_warn(LD_BUG, "Wanted a circuit with %s:%d, but lookup returned %s:%d",

1 0

[tor/master] scan-build: Add a check for result from getaddrinfo
by nickm＠torproject.org 25 Apr '14

25 Apr '14

commit 08325b58bef83bfed181c493f269ef57477152c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 18 20:26:47 2014 -0400 scan-build: Add a check for result from getaddrinfo As documented, getaddrinfo always sets its result when it returns no error. But scan-build doesn't know that, and thinks we might be def --- src/common/address.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/address.c b/src/common/address.c index e5930de..2825b12 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -236,7 +236,9 @@ tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr) hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; err = sandbox_getaddrinfo(name, NULL, &hints, &res); - if (!err) { + /* The check for 'res' here shouldn't be necessary, but it makes static + * analysis tools happy. */ + if (!err && res) { best = NULL; for (res_p = res; res_p; res_p = res_p->ai_next) { if (family == AF_UNSPEC) {

1 0

[tor/master] scan-build: fix a crash-on-fail possibility in test_policy.c
by nickm＠torproject.org 25 Apr '14

25 Apr '14

commit 69ea4450caee65be56912fd2618c2b95413a0763 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 18 20:33:21 2014 -0400 scan-build: fix a crash-on-fail possibility in test_policy.c --- src/test/test_policy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/test_policy.c b/src/test/test_policy.c index d2ba161..491c9a2 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -417,8 +417,10 @@ test_dump_exit_policy_to_string(void *arg) done: - SMARTLIST_FOREACH(ri->exit_policy, addr_policy_t *, - entry, addr_policy_free(entry)); + if (ri->exit_policy) { + SMARTLIST_FOREACH(ri->exit_policy, addr_policy_t *, + entry, addr_policy_free(entry)); + } tor_free(ri); tor_free(ep); }

1 0

[tor/master] scan-build: check impossible null-pointer case in buffers.c
by nickm＠torproject.org 25 Apr '14

25 Apr '14

commit 41a8930fa1202b882687c0c3a328307b480934b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 18 20:28:46 2014 -0400 scan-build: check impossible null-pointer case in buffers.c When maintaining buffer freelists, we don't skip more than there are, so (*chp) can't be null to begin with. scan-build has no way to know that. --- src/or/buffers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 012ced6..fb18608 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -322,7 +322,7 @@ buf_shrink_freelists(int free_all) chunk_t **chp = &freelists[i].head; chunk_t *chunk; while (n_to_skip) { - if (! (*chp)->next) { + if (!(*chp) || ! (*chp)->next) { log_warn(LD_BUG, "I wanted to skip %d chunks in the freelist for " "%d-byte chunks, but only found %d. (Length %d)", orig_n_to_skip, (int)freelists[i].alloc_size,

1 0