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

[tor/release-0.3.1] Add a cast to avoid a signed/unsigned comparison
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 0bfd5a659777688798722a20f894797a4f4b54f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 17 09:06:32 2018 -0500 Add a cast to avoid a signed/unsigned comparison --- src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat.c b/src/common/compat.c index a88e9b514..4ac443c13 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1723,7 +1723,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out) if (errno == EINVAL && try_limit < (uint64_t) rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ - rlim.rlim_cur = MIN(try_limit, rlim.rlim_cur); + rlim.rlim_cur = MIN((rlim_t) try_limit, rlim.rlim_cur); if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) { if (rlim.rlim_cur < (rlim_t)limit) { log_warn(LD_CONFIG, "We are limited to %lu file descriptors by "

1 0

[tor/release-0.3.2] Don't treat a setrlimit failure as fatal.
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 68ca6d2e1971372617f920e71a4a51e16900095e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 4 13:20:37 2018 -0500 Don't treat a setrlimit failure as fatal. Fixes bug 21074; bugfix on 4689243242e2e12 in 0.0.9rc5 when we started doing setrlimit() in the first place. --- changes/bug21074_downgrade | 4 ++++ src/common/compat.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/changes/bug21074_downgrade b/changes/bug21074_downgrade new file mode 100644 index 000000000..c9f81bd13 --- /dev/null +++ b/changes/bug21074_downgrade @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Don't exit the Tor process if setrlimit() fails to change the file + limit (which can happen sometimes on some versions of OSX). Fixes + bug 21074; bugfix on 0.0.9pre5. diff --git a/src/common/compat.c b/src/common/compat.c index e16dfb1d2..a88e9b514 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1651,7 +1651,7 @@ get_max_sockets(void) * fail by returning -1 and max_out is untouched. * * If we are unable to set the limit value because of setrlimit() failing, - * return -1 and max_out is set to the current maximum value returned + * return 0 and max_out is set to the current maximum value returned * by getrlimit(). * * Otherwise, return 0 and store the maximum we found inside max_out @@ -1716,13 +1716,14 @@ set_max_file_descriptors(rlim_t limit, int *max_out) rlim.rlim_cur = rlim.rlim_max; if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { - int bad = 1; + int couldnt_set = 1; + const int setrlimit_errno = errno; #ifdef OPEN_MAX uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; if (errno == EINVAL && try_limit < (uint64_t) rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ - rlim.rlim_cur = try_limit; + rlim.rlim_cur = MIN(try_limit, rlim.rlim_cur); if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) { if (rlim.rlim_cur < (rlim_t)limit) { log_warn(LD_CONFIG, "We are limited to %lu file descriptors by " @@ -1737,14 +1738,13 @@ set_max_file_descriptors(rlim_t limit, int *max_out) (unsigned long)try_limit, (unsigned long)OPEN_MAX, (unsigned long)rlim.rlim_max); } - bad = 0; + couldnt_set = 0; } } #endif /* OPEN_MAX */ - if (bad) { + if (couldnt_set) { log_warn(LD_CONFIG,"Couldn't set maximum number of file descriptors: %s", - strerror(errno)); - return -1; + strerror(setrlimit_errno)); } } /* leave some overhead for logs, etc, */

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 5dc785ceef465125f180f020991ec2c363bb8abc Merge: 320dac460 0bfd5a659 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 16:51:53 2018 -0500 Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9 changes/bug21074_downgrade | 4 ++++ src/common/compat.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit cf55f0516c9eecc3e2779931fdba9eeb5335f569 Merge: ed13a7f62 eccef6ba6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 16:51:56 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug21074_downgrade | 4 ++++ src/common/compat.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.2] Add a cast to avoid a signed/unsigned comparison
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 0bfd5a659777688798722a20f894797a4f4b54f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 17 09:06:32 2018 -0500 Add a cast to avoid a signed/unsigned comparison --- src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat.c b/src/common/compat.c index a88e9b514..4ac443c13 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1723,7 +1723,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out) if (errno == EINVAL && try_limit < (uint64_t) rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ - rlim.rlim_cur = MIN(try_limit, rlim.rlim_cur); + rlim.rlim_cur = MIN((rlim_t) try_limit, rlim.rlim_cur); if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) { if (rlim.rlim_cur < (rlim_t)limit) { log_warn(LD_CONFIG, "We are limited to %lu file descriptors by "

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 9e81221c96793adfe3c46979ae4f749ff26e3644 Merge: cb3c1f2e5 684d57fe8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 17:01:00 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug21074_downgrade | 4 ++++ src/common/compat.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 684d57fe8a21ee74b7b66f0035674ccbe0c1f921 Merge: 4de20d175 eccef6ba6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 17:00:52 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug21074_downgrade | 4 ++++ src/common/compat.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --cc src/common/compat.c index 7fe97488e,4a1f0013c..83bb707e1 --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -1753,14 -1752,13 +1754,13 @@@ set_max_file_descriptors(rlim_t limit, (unsigned long)try_limit, (unsigned long)OPEN_MAX, (unsigned long)rlim.rlim_max); } - bad = 0; + couldnt_set = 0; } } -#endif /* OPEN_MAX */ +#endif /* defined(OPEN_MAX) */ - if (bad) { + if (couldnt_set) { log_warn(LD_CONFIG,"Couldn't set maximum number of file descriptors: %s", - strerror(errno)); - return -1; + strerror(setrlimit_errno)); } } /* leave some overhead for logs, etc, */

1 0

[tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit eccef6ba60e59c6d7001d8f6623eb4d01ea8ca11 Merge: 86583ad78 5dc785cee Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 16:51:56 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug21074_downgrade | 4 ++++ src/common/compat.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'isis/bug25127_redux'
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit a75ae628c74d8105d7b021b051ffd6eaaed08904 Merge: 7aa94f744 45c59eff6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 16:17:41 2018 -0500 Merge remote-tracking branch 'isis/bug25127_redux' src/rust/protover/ffi.rs | 2 +- src/rust/protover/protover.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] rust: Replace two `unwrap()`s in FFI code with `unwrap_or()`s.
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 45c59eff6c0b261d1f868eb22e0bd36a39dfdbb3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 10 01:21:31 2018 +0000 rust: Replace two `unwrap()`s in FFI code with `unwrap_or()`s. --- src/rust/protover/ffi.rs | 2 +- src/rust/protover/protover.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index d724c102d..2ee0286ec 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -232,7 +232,7 @@ pub extern "C" fn protover_compute_for_old_tor(version: *const c_char) -> *const // we can see that the bytes we're passing into it 1) are valid UTF-8, // 2) have no intermediate NUL bytes, and 3) are terminated with a NUL // byte. - supported = CStr::from_bytes_with_nul(elder_protocols).unwrap(); + supported = CStr::from_bytes_with_nul(elder_protocols).unwrap_or(empty); supported.as_ptr() } diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 826f1b73f..25f776aed 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -110,7 +110,7 @@ pub fn get_supported_protocols() -> &'static str { // The `unwrap` is safe becauase we SUPPORTED_PROTOCOLS is under // our control. str::from_utf8(&SUPPORTED_PROTOCOLS[..SUPPORTED_PROTOCOLS.len() - 1]) - .unwrap() + .unwrap_or("") } pub struct SupportedProtocols(HashMap<Proto, Versions>);

1 0