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

[tor/maint-0.4.0] Merge branch 'rust-panic1-034' into rust-panic1-035
by asn＠torproject.org 15 Apr '19

15 Apr '19

commit a6d0420f7cfe899d8953fdaee6ba3c0714b297b8 Merge: 9f3f99938 5ab5c8ec1 Author: teor <teor(a)torproject.org> Date: Mon Apr 15 10:18:01 2019 +1000 Merge branch 'rust-panic1-034' into rust-panic1-035 Trivial merge: a blank line was removed between 0.3.4 and 0.3.5. changes/bug27199 | 3 +++ src/rust/Cargo.toml | 11 +++++++++++ 2 files changed, 14 insertions(+)

1 0

[tor/maint-0.4.0] Merge branch 'rust-panic1' into rust-panic1-034
by asn＠torproject.org 15 Apr '19

15 Apr '19

commit 5ab5c8ec15de7a54c9196b9adcfda6042d4db5e4 Merge: 48e990359 fecd583c0 Author: teor <teor(a)torproject.org> Date: Mon Apr 15 10:15:02 2019 +1000 Merge branch 'rust-panic1' into rust-panic1-034 changes/bug27199 | 3 +++ src/rust/Cargo.toml | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --cc src/rust/Cargo.toml index c3e44d2a7,c22eea984..de8693ea3 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@@ -1,15 -1,11 +1,20 @@@ [workspace] -members = ["tor_util", "protover", "smartlist", "external", "tor_allocate", "tor_rust"] +members = [ + "crypto", + "external", + "protover", + "smartlist", + "tor_allocate", + "tor_log", + "tor_rust", + "tor_util", +] + # Can remove panic="abort" when this issue is fixed: + # https://github.com/rust-lang/rust/issues/52652 + [profile.dev] + panic = "abort" + [profile.release] debug = true panic = "abort"

1 0

[tor/maint-0.4.0] Merge branch 'tor-github/pr/948' into maint-0.4.0
by asn＠torproject.org 15 Apr '19

15 Apr '19

commit 15591e1bbda17983fa2f8f099d48fcef2e675971 Merge: 40471d73e 1177818c3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Apr 15 13:56:37 2019 +0300 Merge branch 'tor-github/pr/948' into maint-0.4.0 changes/bug27199 | 3 +++ src/rust/Cargo.toml | 11 +++++++++++ 2 files changed, 14 insertions(+)

1 0

[tor/master] Travis: use stem backtrace signals with timelimit
by asn＠torproject.org 15 Apr '19

15 Apr '19

commit 6ef38197985326ea7599db6e6abd5efb470ddd04 Author: teor <teor(a)torproject.org> Date: Wed Apr 10 21:15:04 2019 +1000 Travis: use stem backtrace signals with timelimit Part of 30117. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 45da26324..144cfe0bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -211,7 +211,7 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes - - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -T 30 make src/app/tor test-stem; fi + - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -s USR1 -T 30 -S ABRT make src/app/tor test-stem; fi - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi

1 0

[tor/master] changes: file for 30117
by asn＠torproject.org 15 Apr '19

15 Apr '19

commit 8ff6ab0a399235c081ef4413449581879b7db99b Author: teor <teor(a)torproject.org> Date: Thu Apr 11 12:17:04 2019 +1000 changes: file for 30117 --- changes/ticket30117 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket30117 b/changes/ticket30117 new file mode 100644 index 000000000..5b6e6dabf --- /dev/null +++ b/changes/ticket30117 @@ -0,0 +1,4 @@ + o Testing (continuous integration): + - In Travis, tell timelimit to use stem's backtrace signals. And launch + python directly from timelimit, so python receives the signals from + timelimit, rather than make. Closes ticket 30117.

1 0

[tor/master] rust: abort on panic in all profiles
by asn＠torproject.org 15 Apr '19

15 Apr '19

commit fecd583c0e7e580f07d81b24b1a3522c52938c61 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Aug 18 19:18:48 2018 +0000 rust: abort on panic in all profiles Until https://github.com/rust-lang/rust/issues/52652 is fixed, unwinding on panic is potentially unsound in a mixed C/Rust codebase. The codebase is supposed to be panic-free already, but just to be safe. This started mattering at commit d1820c1516a31a149fc51a9e5126bf899e4c4e08. Fixes #27199; bugfix on tor-0.3.3.1-alpha. --- changes/bug27199 | 3 +++ src/rust/Cargo.toml | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/bug27199 b/changes/bug27199 new file mode 100644 index 000000000..f9d2a422f --- /dev/null +++ b/changes/bug27199 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Abort on panic in all build profiles, instead of potentially unwinding + into C code. Fixes bug 27199; bugfix on 0.3.3.1-alpha. diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index 953c9b96b..c22eea984 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -1,7 +1,17 @@ [workspace] members = ["tor_util", "protover", "smartlist", "external", "tor_allocate", "tor_rust"] +# Can remove panic="abort" when this issue is fixed: +# https://github.com/rust-lang/rust/issues/52652 +[profile.dev] +panic = "abort" + [profile.release] debug = true panic = "abort" +[profile.test] +panic = "abort" + +[profile.bench] +panic = "abort"

1 0

[tor/master] Travis: expand "make test-stem", so timelimit can signal python on timeout
by asn＠torproject.org 15 Apr '19

15 Apr '19

commit 6d01879fe18d30fef10fc0fc6f746569082b3faf Author: teor <teor(a)torproject.org> Date: Thu Apr 11 12:11:03 2019 +1000 Travis: expand "make test-stem", so timelimit can signal python on timeout Unlike kill, timelimit can only signal the process it launches. So we need timelimit to launch python, not make. Closes ticket 30117; diagnostic for 29437. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 144cfe0bd..89040d822 100644 --- a/.travis.yml +++ b/.travis.yml @@ -211,7 +211,7 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes - - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -s USR1 -T 30 -S ABRT make src/app/tor test-stem; fi + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --log notice --target RUN_ALL; fi - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi

1 0

[tor/master] Merge branch 'rust-panic1' into rust-panic1-034
by asn＠torproject.org 15 Apr '19

15 Apr '19

commit 5ab5c8ec15de7a54c9196b9adcfda6042d4db5e4 Merge: 48e990359 fecd583c0 Author: teor <teor(a)torproject.org> Date: Mon Apr 15 10:15:02 2019 +1000 Merge branch 'rust-panic1' into rust-panic1-034 changes/bug27199 | 3 +++ src/rust/Cargo.toml | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --cc src/rust/Cargo.toml index c3e44d2a7,c22eea984..de8693ea3 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@@ -1,15 -1,11 +1,20 @@@ [workspace] -members = ["tor_util", "protover", "smartlist", "external", "tor_allocate", "tor_rust"] +members = [ + "crypto", + "external", + "protover", + "smartlist", + "tor_allocate", + "tor_log", + "tor_rust", + "tor_util", +] + # Can remove panic="abort" when this issue is fixed: + # https://github.com/rust-lang/rust/issues/52652 + [profile.dev] + panic = "abort" + [profile.release] debug = true panic = "abort"

1 0

[tor/master] Merge branch 'tor-github/pr/948' into maint-0.4.0
by asn＠torproject.org 15 Apr '19

15 Apr '19

commit 15591e1bbda17983fa2f8f099d48fcef2e675971 Merge: 40471d73e 1177818c3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Apr 15 13:56:37 2019 +0300 Merge branch 'tor-github/pr/948' into maint-0.4.0 changes/bug27199 | 3 +++ src/rust/Cargo.toml | 11 +++++++++++ 2 files changed, 14 insertions(+)

1 0

[tor/master] Merge branch 'rust-panic1-035' into rust-panic1-040
by asn＠torproject.org 15 Apr '19

15 Apr '19

commit 1177818c3211e5346c7196d5fbbbd6c9079bef41 Merge: 454bdb22e a6d0420f7 Author: teor <teor(a)torproject.org> Date: Mon Apr 15 10:18:59 2019 +1000 Merge branch 'rust-panic1-035' into rust-panic1-040 changes/bug27199 | 3 +++ src/rust/Cargo.toml | 11 +++++++++++ 2 files changed, 14 insertions(+)

1 0