March 2013 - tor-commits - lists.torproject.org

[tor/maint-0.2.4] Check return values from fcntl and setsockopt
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 63b67577d6df1080e0bca89d66a2e1550da6265d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 20:58:28 2013 -0400 Check return values from fcntl and setsockopt (Based on a patch from flupzor; bug #8206) --- changes/bug6206 | 6 +++++ src/common/compat.c | 54 ++++++++++++++++++++++++++++++++++++++++++-------- src/common/compat.h | 2 +- src/ext/eventdns.c | 8 ++++++- src/or/connection.c | 23 +++++++++++++++++---- src/or/cpuworker.c | 7 ++++- 6 files changed, 82 insertions(+), 18 deletions(-) diff --git a/changes/bug6206 b/changes/bug6206 new file mode 100644 index 0000000..61a16d2 --- /dev/null +++ b/changes/bug6206 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Always check the return values of functions fcntl() and + setsockopt(). We don't believe these are ever actually failing in + practice, but better safe than sorry. Also, checking these return + values should please some analysis tools (like Coverity). Patch + from 'flupzor'. Fix for bug 8206; bugfix on all versions of Tor. diff --git a/src/common/compat.c b/src/common/compat.c index d7ce894..25df9a9 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -137,8 +137,13 @@ tor_open_cloexec(const char *path, int flags, unsigned mode) fd = open(path, flags, mode); #ifdef FD_CLOEXEC - if (fd >= 0) - fcntl(fd, F_SETFD, FD_CLOEXEC); + if (fd >= 0) { + if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) { + log_warn(LD_FS,"Couldn't set FD_CLOEXEC: %s", strerror(errno)); + close(fd); + return -1; + } + } #endif return fd; } @@ -150,8 +155,13 @@ tor_fopen_cloexec(const char *path, const char *mode) { FILE *result = fopen(path, mode); #ifdef FD_CLOEXEC - if (result != NULL) - fcntl(fileno(result), F_SETFD, FD_CLOEXEC); + if (result != NULL) { + if (fcntl(fileno(result), F_SETFD, FD_CLOEXEC) == -1) { + log_warn(LD_FS,"Couldn't set FD_CLOEXEC: %s", strerror(errno)); + fclose(result); + return NULL; + } + } #endif return result; } @@ -1024,7 +1034,15 @@ tor_open_socket(int domain, int type, int protocol) return s; #if defined(FD_CLOEXEC) - fcntl(s, F_SETFD, FD_CLOEXEC); + if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) { + log_warn(LD_FS,"Couldn't set FD_CLOEXEC: %s", strerror(errno)); +#if defined(_WIN32) + closesocket(s); +#else + close(s); +#endif + return -1; + } #endif goto socket_ok; /* So that socket_ok will not be unused. */ @@ -1059,7 +1077,11 @@ tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) return s; #if defined(FD_CLOEXEC) - fcntl(s, F_SETFD, FD_CLOEXEC); + if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) { + log_warn(LD_NET, "Couldn't set FD_CLOEXEC: %s", strerror(errno)); + close(s); + return TOR_INVALID_SOCKET; + } #endif goto socket_ok; /* So that socket_ok will not be unused. */ @@ -1083,17 +1105,31 @@ get_n_open_sockets(void) return n; } -/** Turn <b>socket</b> into a nonblocking socket. +/** Turn <b>socket</b> into a nonblocking socket. Return 0 on success, -1 + * on failure. */ -void +int set_socket_nonblocking(tor_socket_t socket) { #if defined(_WIN32) unsigned long nonblocking = 1; ioctlsocket(socket, FIONBIO, (unsigned long*) &nonblocking); #else - fcntl(socket, F_SETFL, O_NONBLOCK); + int flags; + + flags = fcntl(socket, F_GETFL, 0); + if (flags == -1) { + log_warn(LD_NET, "Couldn't get file status flags: %s", strerror(errno)); + return -1; + } + flags |= O_NONBLOCK; + if (fcntl(socket, F_SETFL, flags) == -1) { + log_warn(LD_NET, "Couldn't set file status flags: %s", strerror(errno)); + return -1; + } #endif + + return 0; } /** diff --git a/src/common/compat.h b/src/common/compat.h index f9eb4ba..f0a34aa 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -518,7 +518,7 @@ int tor_inet_aton(const char *cp, struct in_addr *addr) ATTR_NONNULL((1,2)); const char *tor_inet_ntop(int af, const void *src, char *dst, size_t len); int tor_inet_pton(int af, const char *src, void *dst); int tor_lookup_hostname(const char *name, uint32_t *addr) ATTR_NONNULL((1,2)); -void set_socket_nonblocking(tor_socket_t socket); +int set_socket_nonblocking(tor_socket_t socket); int tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]); int network_init(void); diff --git a/src/ext/eventdns.c b/src/ext/eventdns.c index 3ee9f72..0dd7629 100644 --- a/src/ext/eventdns.c +++ b/src/ext/eventdns.c @@ -2275,6 +2275,7 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, const struct nameserver *server = server_head, *const started_at = server_head; struct nameserver *ns; + int flags; int err = 0; if (server) { @@ -2306,7 +2307,12 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, ioctlsocket(ns->socket, FIONBIO, &nonblocking); } #else - fcntl(ns->socket, F_SETFL, O_NONBLOCK); + if (fcntl(ns->socket, F_SETFL, O_NONBLOCK) == -1) { + evdns_log(EVDNS_LOG_WARN, "Error %s (%d) while settings file status flags.", + tor_socket_strerror(errno), errno); + err = 2; + goto out2; + } #endif if (global_bind_addr_is_set && diff --git a/src/or/connection.c b/src/or/connection.c index c659e65..622eadc 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -918,8 +918,11 @@ make_socket_reuseable(tor_socket_t sock) * right after somebody else has let it go. But REUSEADDR on win32 * means you can bind to the port _even when somebody else * already has it bound_. So, don't do that on Win32. */ - setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one, - (socklen_t)sizeof(one)); + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one, + (socklen_t)sizeof(one)) == -1) { + log_warn(LD_NET, "Error setting SO_REUSEADDR flag: %s", + tor_socket_strerror(errno)); + } #endif } @@ -1102,7 +1105,10 @@ connection_listener_new(const struct sockaddr *listensockaddr, tor_assert(0); } - set_socket_nonblocking(s); + if (set_socket_nonblocking(s) == -1) { + tor_close_socket(s); + goto err; + } lis_conn = listener_connection_new(type, listensockaddr->sa_family); conn = TO_CONN(lis_conn); @@ -1265,7 +1271,10 @@ connection_handle_listener_read(connection_t *conn, int new_type) (int)news,(int)conn->s); make_socket_reuseable(news); - set_socket_nonblocking(news); + if (set_socket_nonblocking(news) == -1) { + tor_close_socket(news); + return 0; + } if (options->ConstrainedSockets) set_constrained_socket_buffers(news, (int)options->ConstrainedSockSize); @@ -1494,7 +1503,11 @@ connection_connect(connection_t *conn, const char *address, } } - set_socket_nonblocking(s); + if (set_socket_nonblocking(s) == -1) { + *socket_error = tor_socket_errno(s); + tor_close_socket(s); + return -1; + } if (options->ConstrainedSockets) set_constrained_socket_buffers(s, (int)options->ConstrainedSockSize); diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 38c6613..61f9faa 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -535,13 +535,16 @@ spawn_cpuworker(void) conn = connection_new(CONN_TYPE_CPUWORKER, AF_UNIX); - set_socket_nonblocking(fd); - /* set up conn so it's got all the data we need to remember */ conn->s = fd; conn->address = tor_strdup("localhost"); tor_addr_make_unspec(&conn->addr); + if (set_socket_nonblocking(fd) == -1) { + connection_free(conn); /* this closes fd */ + return -1; + } + if (connection_add(conn) < 0) { /* no space, forget it */ log_warn(LD_NET,"connection_add for cpuworker failed. Giving up."); connection_free(conn); /* this closes fd */

1 0

[tor/maint-0.2.4] Merge branch 'bug8206_squashed' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 3894efc7601c17718a1ea2d228c0d841472104d8 Merge: eb94200 63b6757 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 14:29:12 2013 -0400 Merge branch 'bug8206_squashed' into maint-0.2.4 changes/bug6206 | 6 +++++ src/common/compat.c | 54 ++++++++++++++++++++++++++++++++++++++++++-------- src/common/compat.h | 2 +- src/ext/eventdns.c | 8 ++++++- src/or/connection.c | 23 +++++++++++++++++---- src/or/cpuworker.c | 7 ++++- 6 files changed, 82 insertions(+), 18 deletions(-)

1 0

[tor/maint-0.2.4] Remove an unused local variable.
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 57ffef3f89312be06aea7819cc0a6c6b9dc66452 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 14:30:11 2013 -0400 Remove an unused local variable. --- src/ext/eventdns.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/ext/eventdns.c b/src/ext/eventdns.c index 0dd7629..66280cc 100644 --- a/src/ext/eventdns.c +++ b/src/ext/eventdns.c @@ -2275,7 +2275,6 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, const struct nameserver *server = server_head, *const started_at = server_head; struct nameserver *ns; - int flags; int err = 0; if (server) {

1 0

[tor/master] Check for 0.2.4.8, not 0.2.4.7, to determine EXTEND2 support
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit eb9420082ddf88462fc1ff7589c58094d7681f64 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 13 12:47:48 2013 -0400 Check for 0.2.4.8, not 0.2.4.7, to determine EXTEND2 support Fixes bug 8464; bugfix on b2863739 in 0.2.4.8-alpha --- changes/bug8464 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug8464 b/changes/bug8464 new file mode 100644 index 0000000..74ff2e3 --- /dev/null +++ b/changes/bug8464 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Correct our check for which versions of Tor support the EXTEND2 + cell. We had been willing to send it to Tor 0.2.4.7-alpha and + later, when support was really added in version 0.2.4.8-alpha. + Fixes bug 8464; bugfix on 0.2.4.8-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index ce2cd5c..b86864b 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1953,7 +1953,7 @@ routerstatus_parse_entry_from_string(memarea_t *area, rs->version_supports_optimistic_data = tor_version_as_new_as(tok->args[0], "0.2.3.1-alpha"); rs->version_supports_extend2_cells = - tor_version_as_new_as(tok->args[0], "0.2.4.7-alpha"); + tor_version_as_new_as(tok->args[0], "0.2.4.8-alpha"); } if (vote_rs) { vote_rs->version = tor_strdup(tok->args[0]);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 3fa9c9b68891a126604bc4cc1e75d63fd53f07b7 Merge: f48daef eb94200 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 14:24:30 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8464 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.4] Check for 0.2.4.8, not 0.2.4.7, to determine EXTEND2 support
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit eb9420082ddf88462fc1ff7589c58094d7681f64 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 13 12:47:48 2013 -0400 Check for 0.2.4.8, not 0.2.4.7, to determine EXTEND2 support Fixes bug 8464; bugfix on b2863739 in 0.2.4.8-alpha --- changes/bug8464 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug8464 b/changes/bug8464 new file mode 100644 index 0000000..74ff2e3 --- /dev/null +++ b/changes/bug8464 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Correct our check for which versions of Tor support the EXTEND2 + cell. We had been willing to send it to Tor 0.2.4.7-alpha and + later, when support was really added in version 0.2.4.8-alpha. + Fixes bug 8464; bugfix on 0.2.4.8-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index ce2cd5c..b86864b 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1953,7 +1953,7 @@ routerstatus_parse_entry_from_string(memarea_t *area, rs->version_supports_optimistic_data = tor_version_as_new_as(tok->args[0], "0.2.3.1-alpha"); rs->version_supports_extend2_cells = - tor_version_as_new_as(tok->args[0], "0.2.4.7-alpha"); + tor_version_as_new_as(tok->args[0], "0.2.4.8-alpha"); } if (vote_rs) { vote_rs->version = tor_strdup(tok->args[0]);

1 0

[torspec/master] Document the effect of adding legacy-dir-key on consensuses
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit fc68aaf717036babf377989c7f8e74724a12d04f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 14:01:38 2013 -0400 Document the effect of adding legacy-dir-key on consensuses Fixes bug 7866 --- dir-spec.txt | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 7c4bfde..d139808 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1450,6 +1450,12 @@ consensus, as signed (that is, not including the signature). (Hex, upper-case.) + For each "legacy-dir-key" in the vote, there is an additional "dir-source" + line containing that legacy key's fingerprint, the authority's nickname + with "-legacy" appended, and all other fields as in the main "dir-source" + line for that authority. These "dir-source" lines do not have + corresponding "contact" or "vote-digest" entries. + Each router status entry contains the following items. Router status entries are sorted in ascending order by identity digest.

1 0

[torspec/master] Update multiple-addrs spec to match implementation
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 99a9587531a41209f80106fa10abca928cdc4786 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 13:54:32 2013 -0400 Update multiple-addrs spec to match implementation Right now, the implementation doesn't handle port-lists, and probably won't. Closes ticket 4613. --- dir-spec.txt | 8 +++----- proposals/000-index.txt | 4 ++-- proposals/186-multiple-orports.txt | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index bdb25de..7c4bfde 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -589,15 +589,13 @@ included for specialized controllers designed to support perspective access and such. - "or-address" SP ADDRESS ":" PORTLIST NL + "or-address" SP ADDRESS ":" PORT NL [Any number] ADDRESS = IP6ADDR | IP4ADDR IPV6ADDR = an ipv6 address, surrounded by square brackets. IPV4ADDR = an ipv4 address, represented as a dotted quad. - PORTLIST = PORTSPEC | PORTSPEC "," PORTLIST - PORTSPEC = PORT PORT = a number between 1 and 65535 inclusive. An alternative for the address and ORPort of the "router" line, but with @@ -1125,7 +1123,7 @@ (Only included when generating microdescriptors for consensus-method 16 or later.) - "a" SP address ":" portlist NL + "a" SP address ":" port NL [Any number] @@ -1470,7 +1468,7 @@ ORPort is its current OR port, "DirPort" is its current directory port, or "0" for "none". - "a" SP address ":" portlist NL + "a" SP address ":" port NL [Any number.] diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 112ea4b..f1fed25 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -106,7 +106,7 @@ Proposals by number: 183 Refill Intervals [CLOSED] 184 Miscellaneous changes for a v3 Tor link protocol [CLOSED] 185 Directory caches without DirPort [OPEN] -186 Multiple addresses for one OR or bridge [ACCEPTED] +186 Multiple addresses for one OR or bridge [CLOSED] 187 Reserve a cell type to allow client authorization [CLOSED] 188 Bridge Guards and other anti-enumeration defenses [OPEN] 189 AUTHORIZE and AUTHORIZED cells [OPEN] @@ -192,7 +192,6 @@ Proposals by status: 157 Make certificate downloads specific [for 0.2.4.x] 172 GETINFO controller option for circuit information 173 GETINFO Option Expansion - 186 Multiple addresses for one OR or bridge [for 0.2.4.x+] META: 000 Index of Tor Proposals 001 The Tor Proposal Process @@ -248,6 +247,7 @@ Proposals by status: 181 Optimistic Data for Tor: Client Side [in 0.2.3.3-alpha] 183 Refill Intervals [in 0.2.3.5-alpha] 184 Miscellaneous changes for a v3 Tor link protocol [for 0.2.3.x] + 186 Multiple addresses for one OR or bridge [for 0.2.4.x+] 187 Reserve a cell type to allow client authorization [for 0.2.3.x] 193 Safe cookie authentication for Tor controllers 200 Adding new, extensible CREATE, EXTEND, and related cells [in 0.2.4.8-alpha] diff --git a/proposals/186-multiple-orports.txt b/proposals/186-multiple-orports.txt index 9a186e0..f66ad83 100644 --- a/proposals/186-multiple-orports.txt +++ b/proposals/186-multiple-orports.txt @@ -3,7 +3,7 @@ Title: Multiple addresses for one OR or bridge Author: Nick Mathewson Created: 19-Sep-2011 Supersedes: 118 -Status: Accepted +Status: Closed Target: 0.2.4.x+ Status:

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 18 Mar '13

18 Mar '13

commit 051dab6e8a02d87ffb9c27a0b2a5fc30b66d0070 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 18 16:16:17 2013 +0000 Update translations for tails-greeter_completed --- zh_CN/zh_CN.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 3376b71..b33d023 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# J Tsai <tsaizb(a)gmail.com>, 2013. # <ln191810(a)gmail.com>, 2012. # <ln191810(a)gmail.com>, 2012. # Nathan <zhazhenzhong(a)gmail.com>, 2012. @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2012-11-15 08:53+0000\n" -"Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" +"PO-Revision-Date: 2013-03-18 16:07+0000\n" +"Last-Translator: simabull tsai <tsaizb(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgstr "" #: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 #: ../GdmGreeter/persistencewindow.py:128 msgid "Login" -msgstr "登陆" +msgstr "登录" #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 msgid "Welcome to Tails"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 18 Mar '13

18 Mar '13

commit f2fc105d8c4e2d8671517571bd5a1fbc5f18d184 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 18 16:16:15 2013 +0000 Update translations for tails-greeter --- zh_CN/zh_CN.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 3376b71..b33d023 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# J Tsai <tsaizb(a)gmail.com>, 2013. # <ln191810(a)gmail.com>, 2012. # <ln191810(a)gmail.com>, 2012. # Nathan <zhazhenzhong(a)gmail.com>, 2012. @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2012-11-15 08:53+0000\n" -"Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" +"PO-Revision-Date: 2013-03-18 16:07+0000\n" +"Last-Translator: simabull tsai <tsaizb(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgstr "" #: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 #: ../GdmGreeter/persistencewindow.py:128 msgid "Login" -msgstr "登陆" +msgstr "登录" #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 msgid "Welcome to Tails"

1 0