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

[tor/maint-0.4.1] Try using make -k in the Appveyor configuration
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 49a11f8a8a61a4d8b8657a98291862ffc96e99d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 23 15:04:54 2019 -0400 Try using make -k in the Appveyor configuration Frequently, when a patch fails, it has failures in several files. Using the "-k" flag will let us learn all the compilation errors, not just the first one that the compiler hits. Based on a patch by rl1987. Closes ticket 31372. --- .appveyor.yml | 6 +++--- changes/ticket31372_appveyor | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9913bf3bd..25f87fa45 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -83,8 +83,8 @@ build_script: # configure its flags. liblzma just works. #> Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" - Execute-Bash "V=1 make -j2" - Execute-Bash "V=1 make -j2 install" + Execute-Bash "V=1 make -k -j2" + Execute-Bash "V=1 make -k -j2 install" } test_script: @@ -95,7 +95,7 @@ test_script: $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' Set-Location "${env:build}" - Execute-Bash "VERBOSE=1 make -j2 check" + Execute-Bash "VERBOSE=1 make -k -j2 check" } on_finish: diff --git a/changes/ticket31372_appveyor b/changes/ticket31372_appveyor new file mode 100644 index 000000000..e7bb03182 --- /dev/null +++ b/changes/ticket31372_appveyor @@ -0,0 +1,4 @@ + o Minor features (continuous integration): + - When building on Appveyor, pass the "-k" flag to make, so that + we are informed of all compilation failures, not just the first + one or two. Closes part of ticket 31372.

1 0

[tor/maint-0.4.1] Prevent UB on signed overflow.
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 0d4a689d3ae8f7e05b3baf8ad71d983a767ef55b Author: Tobias Stoeckmann <tobias(a)stoeckmann.org> Date: Mon Jun 24 22:08:49 2019 +0200 Prevent UB on signed overflow. Overflowing a signed integer in C is an undefined behaviour. It is possible to trigger this undefined behaviour in tor_asprintf on Windows or systems lacking vasprintf. On these systems, eiter _vscprintf or vsnprintf is called to retrieve the required amount of bytes to hold the string. These functions can return INT_MAX. The easiest way to recreate this is the use of a specially crafted configuration file, e.g. containing the line: FirewallPorts AAAAA<in total 2147483610 As> This line triggers the needed tor_asprintf call which eventually leads to an INT_MAX return value from _vscprintf or vsnprintf. The needed byte for \0 is added to the result, triggering the overflow and therefore the undefined behaviour. Casting the value to size_t before addition fixes the behaviour. Signed-off-by: Tobias Stoeckmann <tobias(a)stoeckmann.org> --- src/common/compat.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 975875112..6f7ac7bd7 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -540,8 +540,8 @@ tor_vasprintf(char **strp, const char *fmt, va_list args) *strp = NULL; return -1; } - strp_tmp = tor_malloc(len + 1); - r = _vsnprintf(strp_tmp, len+1, fmt, args); + strp_tmp = tor_malloc((size_t)len + 1); + r = _vsnprintf(strp_tmp, (size_t)len+1, fmt, args); if (r != len) { tor_free(strp_tmp); *strp = NULL; @@ -566,9 +566,9 @@ tor_vasprintf(char **strp, const char *fmt, va_list args) *strp = tor_strdup(buf); return len; } - strp_tmp = tor_malloc(len+1); + strp_tmp = tor_malloc((size_t)len+1); /* use of tor_vsnprintf() will ensure string is null terminated */ - r = tor_vsnprintf(strp_tmp, len+1, fmt, args); + r = tor_vsnprintf(strp_tmp, (size_t)len+1, fmt, args); if (r != len) { tor_free(strp_tmp); *strp = NULL; @@ -3543,4 +3543,3 @@ tor_get_avail_disk_space(const char *path) return -1; #endif } -

1 0

[tor/maint-0.4.1] Changes file for bug 31001
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 97d73db7c36ec3fac2974726012f76bff63f9dfc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 19 09:21:08 2019 -0400 Changes file for bug 31001 --- changes/ticket31001 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket31001 b/changes/ticket31001 new file mode 100644 index 000000000..2ce1cbdf3 --- /dev/null +++ b/changes/ticket31001 @@ -0,0 +1,6 @@ + o Minor bugfixes (compatibility, standards compliance): + - Fix a bug that would invoke undefined behavior on certain operating + systems when trying to asprintf() a string exactly INT_MAX bytes + long. We don't believe this is exploitable, but it's better + to fix it anyway. Fixes bug 31001; bugfix on 0.2.2.11-alpha. + Found and fixed by Tobias Stoeckmann.

1 0

[tor/maint-0.4.1] Merge branch 'ticket31372_029' into ticket31372_035
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit da5c8277eacc3a18234373228da1397f36112e19 Merge: 49a11f8a8 6ed3d8dbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 24 08:01:43 2019 -0400 Merge branch 'ticket31372_029' into ticket31372_035 .travis.yml | 6 ++++-- changes/ticket31372_travis | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 7660a7cf7d4191e44aba0bf3e02a001d7e979d29 Merge: 511aeba8e 97d73db7c Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:20:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9 changes/ticket31001 | 6 ++++++ src/common/compat.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 57acdaa3f14db52efb5e9ae2be3e54ddbf17bad9 Merge: 641f13044 d175e7081 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:47:08 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug12399 | 3 +++ changes/bug23507 | 5 +++++ changes/bug23818_v2 | 6 ++++++ changes/bug23818_v3 | 6 ++++++ src/feature/hs/hs_circuit.c | 28 ++++++++++++++++++++++------ src/feature/hs/hs_circuit.h | 3 ++- src/feature/hs/hs_service.c | 30 +++++++++++++++++++++++------- src/feature/rend/rendmid.c | 3 ++- src/feature/rend/rendservice.c | 19 +++++++++++++++---- 9 files changed, 84 insertions(+), 19 deletions(-)

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 1ea19d7a5bf538f5b9f0988c2375966f88d87867 Merge: 21c3488af 7660a7cf7 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:24:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 `git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 641f1304475402c975ede04b11e9be7c8675411b Merge: 4013e50cb 246fdd874 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:35:17 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0 .appveyor.yml | 6 +++--- .travis.yml | 6 ++++-- changes/ticket31372_appveyor | 4 ++++ changes/ticket31372_travis | 4 ++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --cc .travis.yml index c48294f36,595be57a9..6078210c5 --- a/.travis.yml +++ b/.travis.yml @@@ -15,13 -15,17 +15,15 @@@ compiler os: - linux - - osx -## The build matrix in the following stanza expands into builds for each -## OS and compiler. +## We don't use the build matrix cross-product, because it makes too many jobs +## Instead, we list each job under matrix: include: env: global: - ## The Travis CI environment allows us two cores, so let's use both. - - MAKEFLAGS="-j 2" + ## The Travis CI environment allows us two cores, so let's use both. Also, + ## let's use the "-k" flag so that we get all of the compilation failures, + ## not just the first one. + - MAKEFLAGS="-k -j 2" ## We turn on hardening by default ## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later - HARDENING_OPTIONS="--enable-expensive-hardening"

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit d175e70817ccff01cd9eb73d8da9e306745fb469 Merge: c77162e4e 8682442c7 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:47:01 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 003be727c4a88c04424cb13429cf36f887e92f5c Merge: 1ea19d7a5 41bc1fac8 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:28:03 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5 changes/bug23507 | 5 +++++ changes/bug23818_v2 | 6 ++++++ changes/bug23818_v3 | 6 ++++++ src/feature/hs/hs_circuit.c | 28 ++++++++++++++++++++++------ src/feature/hs/hs_circuit.h | 3 ++- src/feature/hs/hs_service.c | 30 +++++++++++++++++++++++------- src/feature/rend/rendservice.c | 19 +++++++++++++++---- 7 files changed, 79 insertions(+), 18 deletions(-)

1 0