diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-11 17:00:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-11 17:00:52 -0500 |
| commit | 684d57fe8a21ee74b7b66f0035674ccbe0c1f921 (patch) | |
| tree | 778cc7721b4f794f6ae43e34ec9238744a4baecd | |
| parent | 4de20d175476ab684ca15ea794af729348297540 (diff) | |
| parent | eccef6ba60e59c6d7001d8f6623eb4d01ea8ca11 (diff) | |
| download | tor-684d57fe8a21ee74b7b66f0035674ccbe0c1f921.tar.gz tor-684d57fe8a21ee74b7b66f0035674ccbe0c1f921.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
| -rw-r--r-- | changes/bug21074_downgrade | 4 | ||||
| -rw-r--r-- | 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 0000000000..c9f81bd137 --- /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 7fe97488e3..83bb707e17 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1667,7 +1667,7 @@ get_max_sockets(void) * fail by returning -1 and <b>max_out</b> is untouched. * * If we are unable to set the limit value because of setrlimit() failing, - * return -1 and <b>max_out</b> is set to the current maximum value returned + * return 0 and <b>max_out</b> is set to the current maximum value returned * by getrlimit(). * * Otherwise, return 0 and store the maximum we found inside <b>max_out</b> @@ -1732,13 +1732,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((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 " @@ -1753,14 +1754,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 /* 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, */ |