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

[tor/master] Quench gcc's complaints about discarding constness in TO_ORIGIN_CIRCUIT.
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit 88679aa53f81ed3b537f214094faa96f4e9a395d Author: dana koch <dsk(a)google.com> Date: Tue Apr 29 11:02:59 2014 +1000 Quench gcc's complaints about discarding constness in TO_ORIGIN_CIRCUIT. This was previously satisfied by using a temporary variable, but there are three other instances in circuitlist.c that gcc is now bothered by, so now introduce a CONST_TO_ORIGIN_CIRCUIT that takes a const circuit_t instead. --- src/or/circuitlist.c | 19 +++++++------------ src/or/or.h | 13 +++++++++++++ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index c54a954..90fc93f 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1821,7 +1821,7 @@ circuit_max_queued_cell_age(const circuit_t *c, uint32_t now) age = now - cell->inserted_time; if (! CIRCUIT_IS_ORIGIN(c)) { - const or_circuit_t *orcirc = TO_OR_CIRCUIT((circuit_t*)c); + const or_circuit_t *orcirc = CONST_TO_OR_CIRCUIT(c); if (NULL != (cell = TOR_SIMPLEQ_FIRST(&orcirc->p_chan_cells.head))) { uint32_t age2 = now - cell->inserted_time; if (age2 > age) @@ -1863,10 +1863,10 @@ circuit_max_queued_data_age(const circuit_t *c, uint32_t now) { if (CIRCUIT_IS_ORIGIN(c)) { return circuit_get_streams_max_data_age( - TO_ORIGIN_CIRCUIT((circuit_t*)c)->p_streams, now); + CONST_TO_ORIGIN_CIRCUIT(c)->p_streams, now); } else { return circuit_get_streams_max_data_age( - TO_OR_CIRCUIT((circuit_t*)c)->n_streams, now); + CONST_TO_OR_CIRCUIT(c)->n_streams, now); } } @@ -2057,15 +2057,10 @@ assert_circuit_ok(const circuit_t *c) tor_assert(c->purpose >= CIRCUIT_PURPOSE_MIN_ && c->purpose <= CIRCUIT_PURPOSE_MAX_); - { - /* Having a separate variable for this pleases GCC 4.2 in ways I hope I - * never understand. -NM. */ - circuit_t *nonconst_circ = (circuit_t*) c; - if (CIRCUIT_IS_ORIGIN(c)) - origin_circ = TO_ORIGIN_CIRCUIT(nonconst_circ); - else - or_circ = TO_OR_CIRCUIT(nonconst_circ); - } + if (CIRCUIT_IS_ORIGIN(c)) + origin_circ = CONST_TO_ORIGIN_CIRCUIT(c); + else + or_circ = CONST_TO_OR_CIRCUIT(c); if (c->n_chan) { tor_assert(!c->n_hop); diff --git a/src/or/or.h b/src/or/or.h index 701877c..aeaeb8e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3231,20 +3231,33 @@ typedef struct or_circuit_rendinfo_s { /** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Assert * if the cast is impossible. */ static or_circuit_t *TO_OR_CIRCUIT(circuit_t *); +static const or_circuit_t *CONST_TO_OR_CIRCUIT(const circuit_t *); /** Convert a circuit_t* to a pointer to the enclosing origin_circuit_t. * Assert if the cast is impossible. */ static origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *); +static const origin_circuit_t *CONST_TO_ORIGIN_CIRCUIT(const circuit_t *); static INLINE or_circuit_t *TO_OR_CIRCUIT(circuit_t *x) { tor_assert(x->magic == OR_CIRCUIT_MAGIC); return DOWNCAST(or_circuit_t, x); } +static INLINE const or_circuit_t *CONST_TO_OR_CIRCUIT(const circuit_t *x) +{ + tor_assert(x->magic == OR_CIRCUIT_MAGIC); + return DOWNCAST(or_circuit_t, x); +} static INLINE origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *x) { tor_assert(x->magic == ORIGIN_CIRCUIT_MAGIC); return DOWNCAST(origin_circuit_t, x); } +static INLINE const origin_circuit_t *CONST_TO_ORIGIN_CIRCUIT( + const circuit_t *x) +{ + tor_assert(x->magic == ORIGIN_CIRCUIT_MAGIC); + return DOWNCAST(origin_circuit_t, x); +} /** Bitfield type: things that we're willing to use invalid routers for. */ typedef enum invalid_router_usage_t {

1 0

[tor/master] changes file for last patch
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit acc7623420139d13377ac441e8d5c5f468cf95c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 29 13:23:54 2014 -0400 changes file for last patch --- changes/bug11633_part1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug11633_part1 b/changes/bug11633_part1 new file mode 100644 index 0000000..fb281bd --- /dev/null +++ b/changes/bug11633_part1 @@ -0,0 +1,4 @@ + o Minor bugfixes (build): + - Resolve GCC complaints on OpenBSD about discarding constness in + TO_{ORIGIN,OR}_CIRCUIT functions. Fixes part of bug 11633; bugfix on + 0.1.1.23. Patch from Dana Koch.

1 0

[tor/master] Put tor.service in the right place, and autoconfify it
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit cae638805385ae0ef717eb21e1592aeb1d85182c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 29 12:15:40 2014 -0400 Put tor.service in the right place, and autoconfify it This closes 8368. --- changes/ticket8368 | 5 +++++ configure.ac | 1 + contrib/dist/tor.service.in | 21 +++++++++++++++++++++ contrib/include.am | 1 + contrib/tor.service | 21 --------------------- 5 files changed, 28 insertions(+), 21 deletions(-) diff --git a/changes/ticket8368 b/changes/ticket8368 new file mode 100644 index 0000000..206a766 --- /dev/null +++ b/changes/ticket8368 @@ -0,0 +1,5 @@ + o Distribution: + - Include a tor.service file in contrib.dist for use with + systemd. Some distributions will be able to use this file unmodified; + others will need to tweak it, or write their own. Patch from + Jamie Nguyen; resolves ticket 8368. diff --git a/configure.ac b/configure.ac index ca7c9c0..c0c8187 100644 --- a/configure.ac +++ b/configure.ac @@ -1561,6 +1561,7 @@ AC_CONFIG_FILES([ contrib/operator-tools/tor.logrotate contrib/dist/tor.sh contrib/dist/torctl + contrib/dist/tor.service src/config/torrc.sample ]) diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in new file mode 100644 index 0000000..5d76702 --- /dev/null +++ b/contrib/dist/tor.service.in @@ -0,0 +1,21 @@ +[Unit] +Description = Anonymizing overlay network for TCP +After = syslog.target network.target nss-lookup.target + +[Service] +Type = simple +ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc +ExecReload = /bin/kill -HUP ${MAINPID} +KillSignal = SIGINT +TimeoutSec = 30 +Restart = on-failure +LimitNOFILE = 32768 + +# Hardening +PrivateTmp = yes +DeviceAllow = /dev/null rw +DeviceAllow = /dev/urandom r +InaccessibleDirectories = /home + +[Install] +WantedBy = multi-user.target diff --git a/contrib/include.am b/contrib/include.am index 0120798..ede9806 100644 --- a/contrib/include.am +++ b/contrib/include.am @@ -5,6 +5,7 @@ EXTRA_DIST+= \ contrib/dist/suse/tor.sh.in \ contrib/dist/tor.sh \ contrib/dist/torctl \ + contrib/dist/tor.service.in \ contrib/operator-tools/linux-tor-prio.sh \ contrib/operator-tools/tor-exit-notice.html \ contrib/or-tools/exitlist \ diff --git a/contrib/tor.service b/contrib/tor.service deleted file mode 100644 index 2780aaa..0000000 --- a/contrib/tor.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description = Anonymizing overlay network for TCP -After = syslog.target network.target nss-lookup.target - -[Service] -Type = simple -ExecStart = /usr/bin/tor -f /etc/tor/torrc -ExecReload = /bin/kill -HUP ${MAINPID} -KillSignal = SIGINT -TimeoutSec = 30 -Restart = on-failure -LimitNOFILE = 32768 - -# Hardening -PrivateTmp = yes -DeviceAllow = /dev/null rw -DeviceAllow = /dev/urandom r -InaccessibleDirectories = /home - -[Install] -WantedBy = multi-user.target

1 0

[tor/master] Add contrib/tor.service for use with systemd
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit a42e81eea10363654cde5724337c4aaea2bb40d0 Author: Jamie Nguyen <j(a)jamielinux.com> Date: Mon Apr 21 14:47:44 2014 +0100 Add contrib/tor.service for use with systemd --- changes/bug8368 | 4 ++++ contrib/tor.service | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/changes/bug8368 b/changes/bug8368 new file mode 100644 index 0000000..fa3991c --- /dev/null +++ b/changes/bug8368 @@ -0,0 +1,4 @@ + o Minor features: + - Add a systemd service file (tor.service) that can be installed by + Linux distributions that make use of the systemd init daemon. + Fixes bug 8368. diff --git a/contrib/tor.service b/contrib/tor.service new file mode 100644 index 0000000..2780aaa --- /dev/null +++ b/contrib/tor.service @@ -0,0 +1,21 @@ +[Unit] +Description = Anonymizing overlay network for TCP +After = syslog.target network.target nss-lookup.target + +[Service] +Type = simple +ExecStart = /usr/bin/tor -f /etc/tor/torrc +ExecReload = /bin/kill -HUP ${MAINPID} +KillSignal = SIGINT +TimeoutSec = 30 +Restart = on-failure +LimitNOFILE = 32768 + +# Hardening +PrivateTmp = yes +DeviceAllow = /dev/null rw +DeviceAllow = /dev/urandom r +InaccessibleDirectories = /home + +[Install] +WantedBy = multi-user.target

1 0

[tor/master] Stop leaking memory in error cases of md parsing
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit 65575b0755f64d21d59532bf58e6c27e14086bbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 12:45:34 2014 -0400 Stop leaking memory in error cases of md parsing When clearing a list of tokens, it's important to do token_clear() on them first, or else any keys they contain will leak. This didn't leak memory on any of the successful microdescriptor parsing paths, but it does leak on some failing paths when the failure happens during tokenization. Fixes bug 11618; bugfix on 0.2.2.6-alpha. --- changes/md_leak_bug | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/changes/md_leak_bug b/changes/md_leak_bug new file mode 100644 index 0000000..26270aa --- /dev/null +++ b/changes/md_leak_bug @@ -0,0 +1,5 @@ + o Major bugfixes (security, OOM) + - Fix a memory leak that could occur if a microdescriptor parse + fails during the tokenizing step. This could enable a memory + exhaustion attack by directory servers. Fixes bug #11649; bugfix + on 0.2.2.6-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 97e0bc8..3ff887c 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4455,11 +4455,13 @@ microdescs_parse_from_string(const char *s, const char *eos, microdesc_free(md); md = NULL; + SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t)); memarea_clear(area); smartlist_clear(tokens); s = start_of_next_microdesc; } + SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t)); memarea_drop_all(area); smartlist_free(tokens);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit 1d3ffc0ec96777203b2eafee5905464d54ef9f91 Merge: 9e44df2 65575b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 29 13:02:18 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/md_leak_bug | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit 0514bcd37c6e6e0eb3f3c47da94cb182d01ef15f Merge: c0a73c8 1d3ffc0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 29 13:03:27 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/md_leak_bug | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)

1 0

[tor/maint-0.2.4] Stop leaking memory in error cases of md parsing
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit 65575b0755f64d21d59532bf58e6c27e14086bbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 12:45:34 2014 -0400 Stop leaking memory in error cases of md parsing When clearing a list of tokens, it's important to do token_clear() on them first, or else any keys they contain will leak. This didn't leak memory on any of the successful microdescriptor parsing paths, but it does leak on some failing paths when the failure happens during tokenization. Fixes bug 11618; bugfix on 0.2.2.6-alpha. --- changes/md_leak_bug | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/changes/md_leak_bug b/changes/md_leak_bug new file mode 100644 index 0000000..26270aa --- /dev/null +++ b/changes/md_leak_bug @@ -0,0 +1,5 @@ + o Major bugfixes (security, OOM) + - Fix a memory leak that could occur if a microdescriptor parse + fails during the tokenizing step. This could enable a memory + exhaustion attack by directory servers. Fixes bug #11649; bugfix + on 0.2.2.6-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 97e0bc8..3ff887c 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4455,11 +4455,13 @@ microdescs_parse_from_string(const char *s, const char *eos, microdesc_free(md); md = NULL; + SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t)); memarea_clear(area); smartlist_clear(tokens); s = start_of_next_microdesc; } + SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t)); memarea_drop_all(area); smartlist_free(tokens);

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit 1d3ffc0ec96777203b2eafee5905464d54ef9f91 Merge: 9e44df2 65575b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 29 13:02:18 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/md_leak_bug | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)

1 0

[tor/maint-0.2.3] Stop leaking memory in error cases of md parsing
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit 65575b0755f64d21d59532bf58e6c27e14086bbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 12:45:34 2014 -0400 Stop leaking memory in error cases of md parsing When clearing a list of tokens, it's important to do token_clear() on them first, or else any keys they contain will leak. This didn't leak memory on any of the successful microdescriptor parsing paths, but it does leak on some failing paths when the failure happens during tokenization. Fixes bug 11618; bugfix on 0.2.2.6-alpha. --- changes/md_leak_bug | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/changes/md_leak_bug b/changes/md_leak_bug new file mode 100644 index 0000000..26270aa --- /dev/null +++ b/changes/md_leak_bug @@ -0,0 +1,5 @@ + o Major bugfixes (security, OOM) + - Fix a memory leak that could occur if a microdescriptor parse + fails during the tokenizing step. This could enable a memory + exhaustion attack by directory servers. Fixes bug #11649; bugfix + on 0.2.2.6-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 97e0bc8..3ff887c 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4455,11 +4455,13 @@ microdescs_parse_from_string(const char *s, const char *eos, microdesc_free(md); md = NULL; + SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t)); memarea_clear(area); smartlist_clear(tokens); s = start_of_next_microdesc; } + SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t)); memarea_drop_all(area); smartlist_free(tokens);

1 0