December 2011 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 57ff9913b25ff640f4ae45dc9b60bc28c30f53b8 Merge: d9edee3 6171bdd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:17:52 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/connection_or.c The conflict in src/or/connection_or.c is resolved by taking the version in master, since e27a26d5 already fixed bug 4531 on master. This merge just adds the changes file from 0.2.2. changes/bug4531 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.2] Don't call tor_tls_set_logged_address till after checking conn->tls
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 6171bdd1056e3511b1842ac8a3e17aa349616075 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:15:52 2011 -0500 Don't call tor_tls_set_logged_address till after checking conn->tls Fixes bug 4531; partial backport of e27a26d5. --- changes/bug4531 | 4 ++++ src/or/connection_or.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug4531 b/changes/bug4531 new file mode 100644 index 0000000..6209f9a --- /dev/null +++ b/changes/bug4531 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Fix null-pointer access that could occur if TLS allocation failed. + Fixes bug 4531; bugfix on 0.2.0.20-rc. Found by "troll_un". + diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 1fffba7..dc8850e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -871,12 +871,12 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving) { conn->_base.state = OR_CONN_STATE_TLS_HANDSHAKING; conn->tls = tor_tls_new(conn->_base.s, receiving); - tor_tls_set_logged_address(conn->tls, // XXX client and relay? - escaped_safe_str(conn->_base.address)); if (!conn->tls) { log_warn(LD_BUG,"tor_tls_new failed. Closing."); return -1; } + tor_tls_set_logged_address(conn->tls, // XXX client and relay? + escaped_safe_str(conn->_base.address)); connection_start_reading(TO_CONN(conn)); log_debug(LD_HANDSHAKE,"starting TLS handshake on fd %d", conn->_base.s); note_crypto_pk_op(receiving ? TLS_HANDSHAKE_S : TLS_HANDSHAKE_C);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit d9edee3a3b98eaae5192f1307197d1a33122ec61 Merge: f78fc8c 2b5a035 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:10:17 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4535 | 3 +++ src/common/compat.c | 2 +- src/common/compat.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --cc src/common/compat.c index ea95f9f,a4e5074..33e2864 --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -979,19 -934,10 +979,19 @@@ tor_open_socket(int domain, int type, i /** As socket(), but counts the number of open sockets. */ tor_socket_t - tor_accept_socket(int sockfd, struct sockaddr *addr, socklen_t *len) + tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) { - tor_socket_t s = accept(sockfd, addr, len); + tor_socket_t s; +#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) +#define LINUX_CLOEXEC_ACCEPT + s = accept4(sockfd, addr, len, SOCK_CLOEXEC); +#else + s = accept(sockfd, addr, len); +#endif if (SOCKET_OK(s)) { +#if !defined(LINUX_CLOEXEC_ACCEPT) && defined(FD_CLOEXEC) + fcntl(s, F_SETFD, FD_CLOEXEC); +#endif socket_accounting_lock(); ++n_sockets_open; mark_socket_open(s);

1 0

[tor/master] tor_accept_socket() should take tor_addr_t for listener arg
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 2b5a0356047e7622c66e434cd8ac4a7689d4cc28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:09:16 2011 -0500 tor_accept_socket() should take tor_addr_t for listener arg Fixes bug 4535; bugfix on 0.2.2.28-beta; found by "troll_un" --- changes/bug4535 | 3 +++ src/common/compat.c | 2 +- src/common/compat.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug4535 b/changes/bug4535 new file mode 100644 index 0000000..57ced29 --- /dev/null +++ b/changes/bug4535 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Use tor_socket_t type for listener argument to accept(). Fixes bug + 4535; bugfix on 0.2.2.28-beta. Found by "troll_un". diff --git a/src/common/compat.c b/src/common/compat.c index 266fc61..a4e5074 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -934,7 +934,7 @@ tor_open_socket(int domain, int type, int protocol) /** As socket(), but counts the number of open sockets. */ tor_socket_t -tor_accept_socket(int sockfd, struct sockaddr *addr, socklen_t *len) +tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) { tor_socket_t s = accept(sockfd, addr, len); if (SOCKET_OK(s)) { diff --git a/src/common/compat.h b/src/common/compat.h index 011b9c8..3e1b5b8 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -404,7 +404,7 @@ typedef int socklen_t; int tor_close_socket(tor_socket_t s); tor_socket_t tor_open_socket(int domain, int type, int protocol); -tor_socket_t tor_accept_socket(int sockfd, struct sockaddr *addr, +tor_socket_t tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len); int get_n_open_sockets(void);

1 0

[tor/maint-0.2.2] tor_accept_socket() should take tor_addr_t for listener arg
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 2b5a0356047e7622c66e434cd8ac4a7689d4cc28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:09:16 2011 -0500 tor_accept_socket() should take tor_addr_t for listener arg Fixes bug 4535; bugfix on 0.2.2.28-beta; found by "troll_un" --- changes/bug4535 | 3 +++ src/common/compat.c | 2 +- src/common/compat.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug4535 b/changes/bug4535 new file mode 100644 index 0000000..57ced29 --- /dev/null +++ b/changes/bug4535 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Use tor_socket_t type for listener argument to accept(). Fixes bug + 4535; bugfix on 0.2.2.28-beta. Found by "troll_un". diff --git a/src/common/compat.c b/src/common/compat.c index 266fc61..a4e5074 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -934,7 +934,7 @@ tor_open_socket(int domain, int type, int protocol) /** As socket(), but counts the number of open sockets. */ tor_socket_t -tor_accept_socket(int sockfd, struct sockaddr *addr, socklen_t *len) +tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) { tor_socket_t s = accept(sockfd, addr, len); if (SOCKET_OK(s)) { diff --git a/src/common/compat.h b/src/common/compat.h index 011b9c8..3e1b5b8 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -404,7 +404,7 @@ typedef int socklen_t; int tor_close_socket(tor_socket_t s); tor_socket_t tor_open_socket(int domain, int type, int protocol); -tor_socket_t tor_accept_socket(int sockfd, struct sockaddr *addr, +tor_socket_t tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len); int get_n_open_sockets(void);

1 0

[tor/master] Give DirAllowPrivateAddress an explicit default
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit f78fc8cfb4de9dac3d806c22fc577c8103df2420 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:04:18 2011 -0500 Give DirAllowPrivateAddress an explicit default By convention, we say whether each bool's default is 0 or 1 Fixes 4536; found by "troll_un" --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 525ff16..073b44d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -232,7 +232,7 @@ static config_var_t _option_vars[] = { V(DataDirectory, FILENAME, NULL), OBSOLETE("DebugLogFile"), V(DisableNetwork, BOOL, "0"), - V(DirAllowPrivateAddresses, BOOL, NULL), + V(DirAllowPrivateAddresses, BOOL, "0"), V(TestingAuthDirTimeToLearnReachability, INTERVAL, "30 minutes"), V(DirListenAddress, LINELIST, NULL), OBSOLETE("DirFetchPeriod"),

1 0

[tor/master] Resolve bug 3448: remove mention of tor-ops (which is not in use)
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit cf14a520c87c7a98c1ab351b476f46b69e7be75d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 15:42:15 2011 -0500 Resolve bug 3448: remove mention of tor-ops (which is not in use) --- changes/bug3448 | 3 +++ src/or/connection.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/bug3448 b/changes/bug3448 new file mode 100644 index 0000000..6e7d4b4 --- /dev/null +++ b/changes/bug3448 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix a log message suggesting that people contact a non-existent + email address. Fix for bug 3448. diff --git a/src/or/connection.c b/src/or/connection.c index 7b95aca..28d8bca 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3137,8 +3137,7 @@ connection_handle_write_impl(connection_t *conn, int force) /* Sometimes, "writable" means "connected". */ if (connection_state_is_connecting(conn)) { if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, (void*)&e, &len) < 0) { - log_warn(LD_BUG, - "getsockopt() syscall failed?! Please report to tor-ops."); + log_warn(LD_BUG, "getsockopt() syscall failed"); if (CONN_IS_EDGE(conn)) connection_edge_end_errno(TO_EDGE_CONN(conn)); connection_mark_for_close(conn);

1 0

[tor/master] Fix bug 4530; check return val of tor_addr_lookup correctly
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit b7015603fa014c91056fa46cb012976a9e166cd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 15:37:24 2011 -0500 Fix bug 4530; check return val of tor_addr_lookup correctly Fix on 0.2.1.5-alpha; reported by troll_un --- changes/bug4530 | 6 ++++++ src/common/address.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug4530 b/changes/bug4530 new file mode 100644 index 0000000..7cd4726 --- /dev/null +++ b/changes/bug4530 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Correctly detect and handle transient lookup failures from + tor_addr_lookup. Fixes bug 4530; bugfix on 0.2.1.5-alpha. + Reported by "troll_un". + diff --git a/src/common/address.c b/src/common/address.c index 46ccb1f..17bdea9 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1034,7 +1034,7 @@ tor_addr_port_parse(const char *s, tor_addr_t *addr_out, uint16_t *port_out) ++port; } - if (tor_addr_lookup(tmp, AF_UNSPEC, &addr) < 0) + if (tor_addr_lookup(tmp, AF_UNSPEC, &addr) != 0) goto err; tor_free(tmp);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 0920cd02f4c49b64d30879b18c4287384a36d9f1 Merge: cd10013 b701560 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 15:38:29 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4530 | 6 ++++++ src/common/address.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Fix bug 4530; check return val of tor_addr_lookup correctly
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit b7015603fa014c91056fa46cb012976a9e166cd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 15:37:24 2011 -0500 Fix bug 4530; check return val of tor_addr_lookup correctly Fix on 0.2.1.5-alpha; reported by troll_un --- changes/bug4530 | 6 ++++++ src/common/address.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug4530 b/changes/bug4530 new file mode 100644 index 0000000..7cd4726 --- /dev/null +++ b/changes/bug4530 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Correctly detect and handle transient lookup failures from + tor_addr_lookup. Fixes bug 4530; bugfix on 0.2.1.5-alpha. + Reported by "troll_un". + diff --git a/src/common/address.c b/src/common/address.c index 46ccb1f..17bdea9 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1034,7 +1034,7 @@ tor_addr_port_parse(const char *s, tor_addr_t *addr_out, uint16_t *port_out) ++port; } - if (tor_addr_lookup(tmp, AF_UNSPEC, &addr) < 0) + if (tor_addr_lookup(tmp, AF_UNSPEC, &addr) != 0) goto err; tor_free(tmp);

1 0