September 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit b8628ac2a7f1676e7321fe742efbdf75d903700a Merge: cda7f4d8b a3342b382 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 19:12:19 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'bug31570_041' into maint-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit c6f7943269c36be41d7c22ebb38eccc37357022b Merge: 50f981719 52342327c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 19:04:25 2019 -0400 Merge branch 'bug31570_041' into maint-0.4.1 changes/bug31570 | 5 +++++ src/lib/malloc/map_anon.c | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.1'
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 48afec91ce4121fac76f2bae9c822f7195c6b819 Merge: 48b281587 c6f794326 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 19:05:13 2019 -0400 Merge branch 'maint-0.4.1'

1 0

[tor/release-0.4.1] Merge branch 'bug31570_041' into maint-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit c6f7943269c36be41d7c22ebb38eccc37357022b Merge: 50f981719 52342327c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 19:04:25 2019 -0400 Merge branch 'bug31570_041' into maint-0.4.1 changes/bug31570 | 5 +++++ src/lib/malloc/map_anon.c | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] madvise: tolerate EINVAL and ENOSYS
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 52342327c7e566a25bf69dc6df651de45959e6d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 2 14:49:53 2019 -0400 madvise: tolerate EINVAL and ENOSYS These errors can occur if we are built on a system with support for madvise(MADV_NOFORK) but then we are run on a system whose kernel does not support that flag. If the error is something that we don't tolerate at all, we now log it before crashing. Fixes bug 31570. I am calling this a bugfix on 0.4.1.1-alpha, where we actually started using the map_anon code. --- changes/bug31570 | 5 +++++ src/lib/malloc/map_anon.c | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/changes/bug31570 b/changes/bug31570 new file mode 100644 index 000000000..f70b577b4 --- /dev/null +++ b/changes/bug31570 @@ -0,0 +1,5 @@ + o Major bugfixes (crash, android): + - Tolerate systems (including some Android installations) where madvise + and MADV_DONTDUMP are available at build-time, but not at run time. + Previously, these systems would notice a failed syscall and abort. + Fixes bug 31570; bugfix on 0.4.1.1-alpha. diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index 0f6a4150c..79bbb99f7 100644 --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@ -27,6 +27,9 @@ #include <windows.h> #endif +#include <string.h> +#include <errno.h> + /** * Macro to get the high bytes of a size_t, if there are high bytes. * Windows needs this; other operating systems define a size_t that does @@ -108,7 +111,17 @@ static int nodump_mem(void *mem, size_t sz) { #if defined(MADV_DONTDUMP) - return madvise(mem, sz, MADV_DONTDUMP); + int rv = madvise(mem, sz, MADV_DONTDUMP); + if (rv == 0) { + return 0; + } else if (errno == ENOSYS || errno == EINVAL) { + return 0; // syscall not supported, or flag not supported. + } else { + tor_log_err_sigsafe("Unexpected error from madvise: ", + strerror(errno), + NULL); + return -1; + } #else (void) mem; (void) sz;

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit ca5e2caf53bf678954d051d8dec469bf6eede0b9 Merge: a32646c2e c6f794326 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 19:05:04 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31570 | 5 +++++ src/lib/malloc/map_anon.c | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.1] Merge branch 'bug31570_041' into maint-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit c6f7943269c36be41d7c22ebb38eccc37357022b Merge: 50f981719 52342327c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 19:04:25 2019 -0400 Merge branch 'bug31570_041' into maint-0.4.1 changes/bug31570 | 5 +++++ src/lib/malloc/map_anon.c | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.1] madvise: tolerate EINVAL and ENOSYS
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 52342327c7e566a25bf69dc6df651de45959e6d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 2 14:49:53 2019 -0400 madvise: tolerate EINVAL and ENOSYS These errors can occur if we are built on a system with support for madvise(MADV_NOFORK) but then we are run on a system whose kernel does not support that flag. If the error is something that we don't tolerate at all, we now log it before crashing. Fixes bug 31570. I am calling this a bugfix on 0.4.1.1-alpha, where we actually started using the map_anon code. --- changes/bug31570 | 5 +++++ src/lib/malloc/map_anon.c | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/changes/bug31570 b/changes/bug31570 new file mode 100644 index 000000000..f70b577b4 --- /dev/null +++ b/changes/bug31570 @@ -0,0 +1,5 @@ + o Major bugfixes (crash, android): + - Tolerate systems (including some Android installations) where madvise + and MADV_DONTDUMP are available at build-time, but not at run time. + Previously, these systems would notice a failed syscall and abort. + Fixes bug 31570; bugfix on 0.4.1.1-alpha. diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index 0f6a4150c..79bbb99f7 100644 --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@ -27,6 +27,9 @@ #include <windows.h> #endif +#include <string.h> +#include <errno.h> + /** * Macro to get the high bytes of a size_t, if there are high bytes. * Windows needs this; other operating systems define a size_t that does @@ -108,7 +111,17 @@ static int nodump_mem(void *mem, size_t sz) { #if defined(MADV_DONTDUMP) - return madvise(mem, sz, MADV_DONTDUMP); + int rv = madvise(mem, sz, MADV_DONTDUMP); + if (rv == 0) { + return 0; + } else if (errno == ENOSYS || errno == EINVAL) { + return 0; // syscall not supported, or flag not supported. + } else { + tor_log_err_sigsafe("Unexpected error from madvise: ", + strerror(errno), + NULL); + return -1; + } #else (void) mem; (void) sz;

1 0

[tor/maint-0.2.9] build: The <sys/sysctl.h> is now deprecated on Linux
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 484710f25be73d18fefa1e03339c9247e8ec7337 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Sep 9 11:47:37 2019 -0400 build: The <sys/sysctl.h> is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/common/compat.c | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/ticket31673 b/changes/ticket31673 new file mode 100644 index 000000000..3b2bb4a46 --- /dev/null +++ b/changes/ticket31673 @@ -0,0 +1,3 @@ + o New system requirements (build system): + - Do not include the deprecated <sys/sysctl.h> on Linux or Windows system. + Closes 31673; diff --git a/src/common/compat.c b/src/common/compat.c index ee3bf0fd5..e99abcb16 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -27,9 +27,6 @@ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif -#ifdef HAVE_SYS_SYSCTL_H -#include <sys/sysctl.h> -#endif #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif @@ -70,6 +67,11 @@ #include <sys/capability.h> #endif +/* Now deprecated in Linux GLIBC */ +#if defined(HAVE_SYS_SYSCTL_H) && !defined(_WIN32) && !defined(__linux__) +#include <sys/sysctl.h> +#endif + #ifdef _WIN32 #include <conio.h> #include <wchar.h>

1 0

[tor/maint-0.3.5] build: The <sys/sysctl.h> is now deprecated on Linux
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 409df19b5a0053175f05851086e6ef35c5bce2c0 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Sep 9 11:55:33 2019 -0400 build: The <sys/sysctl.h> is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/ticket31673 b/changes/ticket31673 new file mode 100644 index 000000000..3b2bb4a46 --- /dev/null +++ b/changes/ticket31673 @@ -0,0 +1,3 @@ + o New system requirements (build system): + - Do not include the deprecated <sys/sysctl.h> on Linux or Windows system. + Closes 31673; diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index f23318889..f4fa45167 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -18,9 +18,6 @@ #include "lib/log/log.h" #include "lib/malloc/malloc.h" -#ifdef HAVE_SYS_SYSCTL_H -#include <sys/sysctl.h> -#endif #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif @@ -36,6 +33,10 @@ #endif #include <string.h> +#if defined(HAVE_SYS_SYSCTL_H) && !defined(_WIN32) && !defined(__linux__) +#include <sys/sysctl.h> +#endif + DISABLE_GCC_WARNING(aggregate-return) /** Call the platform malloc info function, and dump the results to the log at * level <b>severity</b>. If no such function exists, do nothing. */

1 0