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

[tor/master] Merge remote-tracking branch 'public/easy_ratelim'
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit 3433216268a97f8c1595fd389da0e960e8074d32 Merge: e5b07ba a7334f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 7 17:13:51 2013 -0500 Merge remote-tracking branch 'public/easy_ratelim' Conflicts: src/or/connection.c changes/easy.ratelim | 3 ++ src/common/log.c | 69 +++++++++++++++++++++++++++++++++++++++---------- src/common/torlog.h | 15 +++++++++++ src/common/util.h | 9 ++++++ src/or/buffers.c | 11 +++----- src/or/circuituse.c | 10 ++----- src/or/connection.c | 7 +--- src/or/router.c | 9 ++---- 8 files changed, 94 insertions(+), 39 deletions(-) diff --cc src/or/connection.c index d0602fd,5da4d39..7b0f081 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -1444,12 -1441,13 +1444,9 @@@ connection_connect(connection_t *conn, /* We should never even try to connect anyplace if DisableNetwork is set. * Warn if we do, and refuse to make the connection. */ static ratelim_t disablenet_violated = RATELIM_INIT(30*60); - char *m; -#ifdef _WIN32 - *socket_error = WSAENETUNREACH; -#else - *socket_error = ENETUNREACH; -#endif + *socket_error = SOCK_ERRNO(ENETUNREACH); - if ((m = rate_limit_log(&disablenet_violated, approx_time()))) { - log_warn(LD_BUG, "Tried to open a socket with DisableNetwork set.%s", m); - tor_free(m); - } + log_fn_ratelim(&disablenet_violated, LOG_WARN, LD_BUG, + "Tried to open a socket with DisableNetwork set."); tor_fragile_assert(); return -1; }

1 0

[tor/master] Wrapper function for the common rate-limited-log pattern.
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit f269e0f9a51ecc7f22e62bde302afd8574d2f96f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 26 10:51:58 2012 -0500 Wrapper function for the common rate-limited-log pattern. --- changes/easy.ratelim | 3 ++ src/common/log.c | 69 +++++++++++++++++++++++++++++++++++++++---------- src/common/torlog.h | 15 +++++++++++ src/common/util.h | 9 ++++++ 4 files changed, 82 insertions(+), 14 deletions(-) diff --git a/changes/easy.ratelim b/changes/easy.ratelim new file mode 100644 index 0000000..cadd1e4 --- /dev/null +++ b/changes/easy.ratelim @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Add a wrapper function for the common "log a message with a rate-limit" + case. diff --git a/src/common/log.c b/src/common/log.c index 5bf12cf..15df2e0 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -140,11 +140,12 @@ static char *domain_to_string(log_domain_mask_t domain, char *buf, size_t buflen); static INLINE char *format_msg(char *buf, size_t buf_len, log_domain_mask_t domain, int severity, const char *funcname, + const char *suffix, const char *format, va_list ap, size_t *msg_len_out) - CHECK_PRINTF(6,0); + CHECK_PRINTF(7,0); static void logv(int severity, log_domain_mask_t domain, const char *funcname, - const char *format, va_list ap) - CHECK_PRINTF(4,0); + const char *suffix, const char *format, va_list ap) + CHECK_PRINTF(5,0); /** Name of the application: used to generate the message we write at the * start of each new log. */ @@ -251,6 +252,7 @@ log_tor_version(logfile_t *lf, int reset) static INLINE char * format_msg(char *buf, size_t buf_len, log_domain_mask_t domain, int severity, const char *funcname, + const char *suffix, const char *format, va_list ap, size_t *msg_len_out) { size_t n; @@ -312,6 +314,13 @@ format_msg(char *buf, size_t buf_len, n = buf_len; } else { n += r; + if (suffix) { + size_t suffix_len = strlen(suffix); + if (buf_len-n >= suffix_len) { + memcpy(buf+n, suffix, suffix_len); + n += suffix_len; + } + } } buf[n]='\n'; buf[n+1]='\0'; @@ -325,7 +334,7 @@ format_msg(char *buf, size_t buf_len, */ static void logv(int severity, log_domain_mask_t domain, const char *funcname, - const char *format, va_list ap) + const char *suffix, const char *format, va_list ap) { char buf[10024]; size_t msg_len = 0; @@ -361,8 +370,8 @@ logv(int severity, log_domain_mask_t domain, const char *funcname, if (!formatted) { end_of_prefix = - format_msg(buf, sizeof(buf), domain, severity, funcname, format, ap, - &msg_len); + format_msg(buf, sizeof(buf), domain, severity, funcname, suffix, + format, ap, &msg_len); formatted = 1; } @@ -426,7 +435,7 @@ tor_log(int severity, log_domain_mask_t domain, const char *format, ...) if (severity > log_global_min_severity_) return; va_start(ap,format); - logv(severity, domain, NULL, format, ap); + logv(severity, domain, NULL, NULL, format, ap); va_end(ap); } @@ -443,8 +452,24 @@ log_fn_(int severity, log_domain_mask_t domain, const char *fn, if (severity > log_global_min_severity_) return; va_start(ap,format); - logv(severity, domain, fn, format, ap); + logv(severity, domain, fn, NULL, format, ap); + va_end(ap); +} +void +log_fn_ratelim_(ratelim_t *ratelim, int severity, log_domain_mask_t domain, + const char *fn, const char *format, ...) +{ + va_list ap; + char *m; + if (severity > log_global_min_severity_) + return; + m = rate_limit_log(ratelim, approx_time()); + if (m == NULL) + return; + va_start(ap, format); + logv(severity, domain, fn, m, format, ap); va_end(ap); + tor_free(m); } #else /** @{ */ @@ -460,11 +485,27 @@ log_fn_(int severity, log_domain_mask_t domain, const char *format, ...) if (severity > log_global_min_severity_) return; va_start(ap,format); - logv(severity, domain, log_fn_function_name_, format, ap); + logv(severity, domain, log_fn_function_name_, NULL, format, ap); va_end(ap); log_fn_function_name_ = NULL; } void +log_fn_ratelim_(ratelim_t *ratelim, int severity, log_domain_mask_t domain, + const char *format, ...) +{ + va_list ap; + char *m; + if (severity > log_global_min_severity_) + return; + m = rate_limit_log(ratelim, approx_time()); + if (m == NULL) + return; + va_start(ap, format); + logv(severity, domain, log_fn_function_name_, m, format, ap); + va_end(ap); + tor_free(m); +} +void log_debug_(log_domain_mask_t domain, const char *format, ...) { va_list ap; @@ -472,7 +513,7 @@ log_debug_(log_domain_mask_t domain, const char *format, ...) if (PREDICT_LIKELY(LOG_DEBUG > log_global_min_severity_)) return; va_start(ap,format); - logv(LOG_DEBUG, domain, log_fn_function_name_, format, ap); + logv(LOG_DEBUG, domain, log_fn_function_name_, NULL, format, ap); va_end(ap); log_fn_function_name_ = NULL; } @@ -483,7 +524,7 @@ log_info_(log_domain_mask_t domain, const char *format, ...) if (LOG_INFO > log_global_min_severity_) return; va_start(ap,format); - logv(LOG_INFO, domain, log_fn_function_name_, format, ap); + logv(LOG_INFO, domain, log_fn_function_name_, NULL, format, ap); va_end(ap); log_fn_function_name_ = NULL; } @@ -494,7 +535,7 @@ log_notice_(log_domain_mask_t domain, const char *format, ...) if (LOG_NOTICE > log_global_min_severity_) return; va_start(ap,format); - logv(LOG_NOTICE, domain, log_fn_function_name_, format, ap); + logv(LOG_NOTICE, domain, log_fn_function_name_, NULL, format, ap); va_end(ap); log_fn_function_name_ = NULL; } @@ -505,7 +546,7 @@ log_warn_(log_domain_mask_t domain, const char *format, ...) if (LOG_WARN > log_global_min_severity_) return; va_start(ap,format); - logv(LOG_WARN, domain, log_fn_function_name_, format, ap); + logv(LOG_WARN, domain, log_fn_function_name_, NULL, format, ap); va_end(ap); log_fn_function_name_ = NULL; } @@ -516,7 +557,7 @@ log_err_(log_domain_mask_t domain, const char *format, ...) if (LOG_ERR > log_global_min_severity_) return; va_start(ap,format); - logv(LOG_ERR, domain, log_fn_function_name_, format, ap); + logv(LOG_ERR, domain, log_fn_function_name_, NULL, format, ap); va_end(ap); log_fn_function_name_ = NULL; } diff --git a/src/common/torlog.h b/src/common/torlog.h index ab97f9c..cc1fa64 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -161,10 +161,20 @@ extern int log_global_min_severity_; void log_fn_(int severity, log_domain_mask_t domain, const char *funcname, const char *format, ...) CHECK_PRINTF(4,5); +struct ratelim_t; +void log_fn_ratelim_(struct ratelim_t *ratelim, int severity, + log_domain_mask_t domain, const char *funcname, + const char *format, ...) + CHECK_PRINTF(5,6); /** Log a message at level <b>severity</b>, using a pretty-printed version * of the current function name. */ #define log_fn(severity, domain, args...) \ log_fn_(severity, domain, __PRETTY_FUNCTION__, args) +/** As log_fn, but use <b>ratelim</b> (an instance of ratelim_t) to control + * the frequency at which messages can appear. + */ +#define log_fn_ratelim(ratelim, severity, domain, args...) \ + log_fn_ratelim_(ratelim, severity, domain, __PRETTY_FUNCTION__, args) #define log_debug(domain, args...) \ STMT_BEGIN \ if (PREDICT_UNLIKELY(log_global_min_severity_ == LOG_DEBUG)) \ @@ -182,6 +192,9 @@ void log_fn_(int severity, log_domain_mask_t domain, #else /* ! defined(__GNUC__) */ void log_fn_(int severity, log_domain_mask_t domain, const char *format, ...); +struct ratelim_t; +void log_fn_ratelim_(struct ratelim_t *ratelim, int severity, + log_domain_mask_t domain, const char *format, ...); void log_debug_(log_domain_mask_t domain, const char *format, ...); void log_info_(log_domain_mask_t domain, const char *format, ...); void log_notice_(log_domain_mask_t domain, const char *format, ...); @@ -191,6 +204,7 @@ void log_err_(log_domain_mask_t domain, const char *format, ...); #if defined(_MSC_VER) && _MSC_VER < 1300 /* MSVC 6 and earlier don't have __func__, or even __LINE__. */ #define log_fn log_fn_ +#define log_fn_ratelim log_fn_ratelim_ #define log_debug log_debug_ #define log_info log_info_ #define log_notice log_notice_ @@ -204,6 +218,7 @@ extern const char *log_fn_function_name_; * do {...} while (0) trick to wrap this macro, since the macro can't take * arguments. */ #define log_fn (log_fn_function_name_=__func__),log_fn_ +#define log_fn_ratelim (log_fn_function_name_=__func__),log_fn_ratelim_ #define log_debug (log_fn_function_name_=__func__),log_debug_ #define log_info (log_fn_function_name_=__func__),log_info_ #define log_notice (log_fn_function_name_=__func__),log_notice_ diff --git a/src/common/util.h b/src/common/util.h index fabfdb1..005a3f3 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -284,6 +284,15 @@ void update_approx_time(time_t now); } } </pre> + + As a convenience wrapper for logging, you can replace the above with: + <pre> + if (possibly_very_frequent_event()) { + static ratelim_t warning_limit = RATELIM_INIT(300); + log_fn_ratelim(&warning_limit, LOG_WARN, LD_GENERAL, + "The event occurred!"); + } + </pre> */ typedef struct ratelim_t { int rate;

1 0

[torspec/master] Document a corner-case of the STREAM event format
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit 3ad9d19e03bd816e1e0f0b9eeb839ee1eedcaedf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 7 16:46:03 2013 -0500 Document a corner-case of the STREAM event format Fix for 7598 --- control-spec.txt | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 80e1194..5ea5038 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1411,10 +1411,15 @@ "CLOSED" / ; Stream closed "DETACHED" ; Detached from circuit; still retriable - Target = Address ":" Port + Target = TargetAddress ":" Port + Port = an integer from 0 to 65535 inclusive + TargetAddress = Address / "(Tor_internal)" The circuit ID designates which circuit this stream is attached to. If - the stream is unattached, the circuit ID "0" is given. + the stream is unattached, the circuit ID "0" is given. The target + indicates the address which the stream is meant to resolve or connect to; + it can be "(Tor_internal)" for a virtual stream created by the Tor program + to talk to itself. Reason = "MISC" / "RESOLVEFAILED" / "CONNECTREFUSED" / "EXITPOLICY" / "DESTROY" / "DONE" / "TIMEOUT" /

1 0

[tor/master] Merge remote-tracking branch 'arma/bug7054'
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit e5b07ba17947ba4782cbac8f12de7024b2969c99 Merge: ba7d93d 0b598cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 7 15:22:36 2013 -0500 Merge remote-tracking branch 'arma/bug7054' changes/bug7054 | 4 ++++ doc/tor.1.txt | 42 +++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 21 deletions(-)

1 0

[tor/master] Say "KBytes" rather than "KB" in the man page
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit 0b598cb2bbddd91a0152ca30af4387d8f9162cc1 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Oct 6 01:57:13 2012 -0400 Say "KBytes" rather than "KB" in the man page (for various values of K), to further reduce confusion about whether Tor counts in units of memory or fractions of units of memory. Fixes bug 7054. --- changes/bug7054 | 4 ++++ doc/tor.1.txt | 42 +++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/changes/bug7054 b/changes/bug7054 new file mode 100644 index 0000000..15680d7 --- /dev/null +++ b/changes/bug7054 @@ -0,0 +1,4 @@ + o Minor bugfixes (man page): + - Say "KBytes" rather than "KB" in the man page (for various values + of K), to further reduce confusion about whether Tor counts in + units of memory or fractions of units of memory. Fixes bug 7054. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8245ff4..fe78fc3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -124,42 +124,42 @@ option name with a forward slash. GENERAL OPTIONS --------------- -**BandwidthRate** __N__ **bytes**|**KB**|**MB**|**GB**:: +**BandwidthRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: A token bucket limits the average incoming bandwidth usage on this node to the specified number of bytes per second, and the average outgoing bandwidth usage to that same value. If you want to run a relay in the - public network, this needs to be _at the very least_ 30 KB (that is, - 30720 bytes). (Default: 1 GB) + public network, this needs to be _at the very least_ 30 KBytes (that is, + 30720 bytes). (Default: 1 GByte) -**BandwidthBurst** __N__ **bytes**|**KB**|**MB**|**GB**:: +**BandwidthBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: Limit the maximum token bucket size (also known as the burst) to the given - number of bytes in each direction. (Default: 1 GB) + number of bytes in each direction. (Default: 1 GByte) -**MaxAdvertisedBandwidth** __N__ **bytes**|**KB**|**MB**|**GB**:: +**MaxAdvertisedBandwidth** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: If set, we will not advertise more than this amount of bandwidth for our BandwidthRate. Server operators who want to reduce the number of clients who ask to build circuits through them (since this is proportional to advertised bandwidth rate) can thus reduce the CPU demands on their server without impacting network performance. -**RelayBandwidthRate** __N__ **bytes**|**KB**|**MB**|**GB**:: +**RelayBandwidthRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: If not 0, a separate token bucket limits the average incoming bandwidth usage for \_relayed traffic_ on this node to the specified number of bytes per second, and the average outgoing bandwidth usage to that same value. Relayed traffic currently is calculated to include answers to directory requests, but that may change in future versions. (Default: 0) -**RelayBandwidthBurst** __N__ **bytes**|**KB**|**MB**|**GB**:: +**RelayBandwidthBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: If not 0, limit the maximum token bucket size (also known as the burst) for \_relayed traffic_ to the given number of bytes in each direction. (Default: 0) -**PerConnBWRate** __N__ **bytes**|**KB**|**MB**|**GB**:: +**PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: If set, do separate rate limiting for each connection from a non-relay. You should never need to change this value, since a network-wide value is published in the consensus and your relay will use that value. (Default: 0) -**PerConnBWBurst** __N__ **bytes**|**KB**|**MB**|**GB**:: +**PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: If set, do separate rate limiting for each connection from a non-relay. You should never need to change this value, since a network-wide value is published in the consensus and your relay will use that value. (Default: 0) @@ -217,7 +217,7 @@ GENERAL OPTIONS the TCP stream and will reduce throughput in proportion to round trip time on long paths. (Default: 0) -**ConstrainedSockSize** __N__ **bytes**|**KB**:: +**ConstrainedSockSize** __N__ **bytes**|**KBytes**:: When **ConstrainedSockets** is enabled the receive and transmit buffers for all sockets will be set to this limit. Must be a value between 2048 and 262144, in 1024 byte increments. Default of 8192 is recommended. @@ -1370,14 +1370,14 @@ is non-zero): server is still alive and doing useful things. Settings this to 0 will disable the heartbeat. (Default: 6 hours) -**AccountingMax** __N__ **bytes**|**KB**|**MB**|**GB**|**TB**:: +**AccountingMax** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**:: Never send more than the specified number of bytes in a given accounting period, or receive more than that number in the period. For example, with - AccountingMax set to 1 GB, a server could send 900 MB and receive 800 MB - and continue running. It will only hibernate once one of the two reaches 1 - GB. When the number of bytes gets low, Tor will stop accepting new - connections and circuits. When the number of bytes - is exhausted, Tor will hibernate until some + AccountingMax set to 1 GByte, a server could send 900 MBytes and + receive 800 MBytes and continue running. It will only hibernate once + one of the two reaches 1 GByte. When the number of bytes gets low, + Tor will stop accepting new connections and circuits. When the + number of bytes is exhausted, Tor will hibernate until some time in the next accounting period. To prevent all servers from waking at the same time, Tor will also wait until a random point in each period before waking up. If you have bandwidth cost issues, enabling hibernation @@ -1683,15 +1683,15 @@ DIRECTORY AUTHORITY SERVER OPTIONS Authoritative directories only. Like AuthDirMaxServersPerAddr, but applies to addresses shared with directory authorities. (Default: 5) -**AuthDirFastGuarantee** __N__ **bytes**|**KB**|**MB**|**GB**:: +**AuthDirFastGuarantee** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: Authoritative directories only. If non-zero, always vote the Fast flag for any relay advertising this amount of capacity or - more. (Default: 100 KB) + more. (Default: 100 KBytes) -**AuthDirGuardBWGuarantee** __N__ **bytes**|**KB**|**MB**|**GB**:: +**AuthDirGuardBWGuarantee** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: Authoritative directories only. If non-zero, this advertised capacity or more is always sufficient to satisfy the bandwidth requirement - for the Guard flag. (Default: 250 KB) + for the Guard flag. (Default: 250 KBytes) **BridgePassword** __Password__:: If set, contains an HTTP authenticator that tells a bridge authority to

1 0

[tor/master] Fix memory leak in safe-cookie authentication code
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit 4b571d3ab3d4c8e13fe0bc73f15431294d19615a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 28 22:38:42 2012 -0500 Fix memory leak in safe-cookie authentication code Coverity spotted this. Bug 7816. Fix on 0.2.3.13-alpha. --- changes/bug7816_023 | 3 +++ src/or/control.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug7816_023 b/changes/bug7816_023 new file mode 100644 index 0000000..cfa754a --- /dev/null +++ b/changes/bug7816_023 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leak, controller): + - Fix a memory leak during safe-cookie controller authentication. + Spotted by Coverity. Fixes part of bug 7816; bugfix on 0.2.3.13-alpha. diff --git a/src/or/control.c b/src/or/control.c index 913d18a..fc7bae2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3099,6 +3099,8 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, "SERVERNONCE=%s\r\n", server_hash_encoded, server_nonce_encoded); + + tor_free(client_nonce); return 0; }

1 0

[tor/master] Avoid leaking headers received from SSL proxy
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit b509ead20d93277697c1cb961a2ae520bce7fd7f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 28 22:44:45 2012 -0500 Avoid leaking headers received from SSL proxy Fixes part of 7816. Spotted by coverity. Fix on 0.2.2.1-alpha. --- changes/bug7816_023 | 4 ++++ src/or/connection.c | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug7816_023 b/changes/bug7816_023 index cfa754a..a453029 100644 --- a/changes/bug7816_023 +++ b/changes/bug7816_023 @@ -1,3 +1,7 @@ o Minor bugfixes (memory leak, controller): - Fix a memory leak during safe-cookie controller authentication. Spotted by Coverity. Fixes part of bug 7816; bugfix on 0.2.3.13-alpha. + + o Minor bugfixes (memory leak, HTTPS proxy support): + - Fix a memory leak when receiving headers from an HTTPS proxy. + Spotted by Coverity. Fixes part of bug 7816; bugfix on 0.2.1.1-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index eac9c4f..4c68262 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1607,6 +1607,7 @@ connection_read_https_proxy_response(connection_t *conn) tor_free(headers); return -1; } + tor_free(headers); if (!reason) reason = tor_strdup("[no reason given]"); if (status_code == 200) {

1 0

[tor/master] Merge remote-tracking branch 'public/bug7816_023'
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit ba7d93db16fd53c951b6a159adeb7b4094817c11 Merge: 0061d42 d3aabf4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 7 15:20:50 2013 -0500 Merge remote-tracking branch 'public/bug7816_023' Conflicts: src/common/util.c changes/bug7816_023 | 7 +++++++ changes/bug7816_023_small | 3 +++ src/common/log.c | 4 +++- src/common/util.c | 4 +++- src/or/connection.c | 4 ++++ src/or/control.c | 2 ++ src/or/geoip.c | 5 ++++- 7 files changed, 26 insertions(+), 3 deletions(-) diff --cc src/common/util.c index 7d72a89,29aa83e..93e2ba8 --- a/src/common/util.c +++ b/src/common/util.c @@@ -2358,24 -2305,10 +2358,26 @@@ read_file_to_str(const char *filename, return NULL; } +#ifndef _WIN32 +/** When we detect that we're reading from a FIFO, don't read more than + * this many bytes. It's insane overkill for most uses. */ +#define FIFO_READ_MAX (1024*1024) + if (S_ISFIFO(statbuf.st_mode)) { + size_t sz = 0; + string = read_file_to_str_until_eof(fd, FIFO_READ_MAX, &sz); + if (string && stat_out) { + statbuf.st_size = sz; + memcpy(stat_out, &statbuf, sizeof(struct stat)); + } + close(fd); + return string; + } +#endif + - if ((uint64_t)(statbuf.st_size)+1 >= SIZE_T_CEILING) + if ((uint64_t)(statbuf.st_size)+1 >= SIZE_T_CEILING) { + close(fd); return NULL; + } string = tor_malloc((size_t)(statbuf.st_size+1));

1 0

[tor/master] Fix various small leaks on error cases
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit d3aabf4db176a44d19046b58b99f2edb8c5f49bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 28 22:49:32 2012 -0500 Fix various small leaks on error cases Spotted by coverity, bug 7816, bugfix on various versions. --- changes/bug7816_023_small | 3 +++ src/common/log.c | 4 +++- src/common/util.c | 4 +++- src/or/connection.c | 3 +++ src/or/geoip.c | 5 ++++- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/changes/bug7816_023_small b/changes/bug7816_023_small new file mode 100644 index 0000000..cd90f03 --- /dev/null +++ b/changes/bug7816_023_small @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix various places where we leak file descriptors or memory on + error cases. Spotted by coverity. Fixes parts of bug 7816. diff --git a/src/common/log.c b/src/common/log.c index 5e2e6b5..5f0b4f8 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -833,8 +833,10 @@ add_file_log(const log_severity_list_t *severity, const char *filename) fd = tor_open_cloexec(filename, O_WRONLY|O_CREAT|O_APPEND, 0644); if (fd<0) return -1; - if (tor_fd_seekend(fd)<0) + if (tor_fd_seekend(fd)<0) { + close(fd); return -1; + } LOCK_LOGS(); add_stream_log_impl(severity, filename, fd); diff --git a/src/common/util.c b/src/common/util.c index 6fb597a..29aa83e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2305,8 +2305,10 @@ read_file_to_str(const char *filename, int flags, struct stat *stat_out) return NULL; } - if ((uint64_t)(statbuf.st_size)+1 >= SIZE_T_CEILING) + if ((uint64_t)(statbuf.st_size)+1 >= SIZE_T_CEILING) { + close(fd); return NULL; + } string = tor_malloc((size_t)(statbuf.st_size+1)); diff --git a/src/or/connection.c b/src/or/connection.c index 4c68262..8c4228e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -992,6 +992,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, if (bind(s, listensockaddr, (socklen_t)sizeof(struct sockaddr_un)) == -1) { log_warn(LD_NET,"Bind to %s failed: %s.", address, tor_socket_strerror(tor_socket_errno(s))); + tor_close_socket(s); goto err; } #ifdef HAVE_PWD_H @@ -1000,9 +1001,11 @@ connection_listener_new(const struct sockaddr *listensockaddr, if (pw == NULL) { log_warn(LD_NET,"Unable to chown() %s socket: user %s not found.", address, options->User); + tor_close_socket(s); } else if (chown(address, pw->pw_uid, pw->pw_gid) < 0) { log_warn(LD_NET,"Unable to chown() %s socket: %s.", address, strerror(errno)); + tor_close_socket(s); goto err; } } diff --git a/src/or/geoip.c b/src/or/geoip.c index 6b7cc82..8ca95af 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1316,8 +1316,11 @@ load_bridge_stats(time_t now) fname = get_datadir_fname2("stats", "bridge-stats"); contents = read_file_to_str(fname, RFTS_IGNORE_MISSING, NULL); - if (contents && validate_bridge_stats(contents, now)) + if (contents && validate_bridge_stats(contents, now)) { bridge_stats_extrainfo = contents; + } else { + tor_free(contents); + } tor_free(fname); }

1 0

[tor/master] Fix a leak-on-error case in 0.2.4 spotted by coverity
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit ee1d8dc4805e0aabfbda4c8b34e12d2071333a51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 28 22:57:00 2012 -0500 Fix a leak-on-error case in 0.2.4 spotted by coverity This one hits if the snprintf() fails when we're writing our IPv6 exit policy. It's new in 0.2.4.7-alpha. Part of bug 7816. --- changes/bug7816.024 | 4 ++++ src/or/router.c | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug7816.024 b/changes/bug7816.024 new file mode 100644 index 0000000..6ed6b74 --- /dev/null +++ b/changes/bug7816.024 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid leaking IPv6 policy content if we fail to format it into + a router descriptor. Spotted by Coverity. Fixes part of 7816; + bugfix on 0.2.4.7-alpha. diff --git a/src/or/router.c b/src/or/router.c index c7380cb..e892ce0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2190,6 +2190,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, "ipv6-policy %s\n", p6); if (result<0) { log_warn(LD_BUG,"Descriptor printf of policy ran out of room"); + tor_free(p6); return -1; } written += result;

1 0