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

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 23 Oct '18

23 Oct '18

commit fd6078b33a0a174a060a2ae90e9455e6f0ee6fe9 Merge: 7edc594ee b2c52f5d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:50:53 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/rust/protover/ffi.rs | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 23 Oct '18

23 Oct '18

commit 274ef2637fc09444212147bcd625c6a16eae0765 Merge: 271144c99 fd6078b33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:54:16 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 src/rust/protover/ffi.rs | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 23 Oct '18

23 Oct '18

commit 5fde2c2544ae7315939e56a47e2af2d44cce3922 Merge: 8a0728789 b2c52f5d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:54:16 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/rust/protover/ffi.rs | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/release-0.3.4] Remove a now-unused rust "use".
by nickm＠torproject.org 23 Oct '18

23 Oct '18

commit b2c52f5d6d52a70e11bb4f60036dd6772b55661a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:50:45 2018 -0400 Remove a now-unused rust "use". --- src/rust/protover/ffi.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 8ab11842d..8d9f4b874 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -7,7 +7,6 @@ use libc::{c_char, c_int, uint32_t}; use std::ffi::CStr; -use std::ffi::CString; use smartlist::*; use tor_allocate::allocate_and_copy_string;

1 0

[tor/release-0.3.5] Remove a now-unused rust "use".
by nickm＠torproject.org 23 Oct '18

23 Oct '18

commit b2c52f5d6d52a70e11bb4f60036dd6772b55661a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:50:45 2018 -0400 Remove a now-unused rust "use". --- src/rust/protover/ffi.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 8ab11842d..8d9f4b874 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -7,7 +7,6 @@ use libc::{c_char, c_int, uint32_t}; use std::ffi::CStr; -use std::ffi::CString; use smartlist::*; use tor_allocate::allocate_and_copy_string;

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 23 Oct '18

23 Oct '18

commit fd6078b33a0a174a060a2ae90e9455e6f0ee6fe9 Merge: 7edc594ee b2c52f5d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:50:53 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/rust/protover/ffi.rs | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 23 Oct '18

23 Oct '18

commit 131ab9d5233a2f452c608bf85a39255903d036c1 Merge: 289a7dbac fd6078b33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:54:04 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" version to avoid removing rust use declaration.

1 0

[tor/maint-0.3.3] Remove a now-unused rust "use".
by nickm＠torproject.org 23 Oct '18

23 Oct '18

commit b2c52f5d6d52a70e11bb4f60036dd6772b55661a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:50:45 2018 -0400 Remove a now-unused rust "use". --- src/rust/protover/ffi.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 8ab11842d..8d9f4b874 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -7,7 +7,6 @@ use libc::{c_char, c_int, uint32_t}; use std::ffi::CStr; -use std::ffi::CString; use smartlist::*; use tor_allocate::allocate_and_copy_string;

1 0

[tor/maint-0.3.4] rust/protover: fix null deref in protover_all_supported()
by nickm＠torproject.org 23 Oct '18

23 Oct '18

commit db89b4b1527103455e1bd85839a88d614a402354 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Sep 21 04:57:26 2018 +0000 rust/protover: fix null deref in protover_all_supported() Fortunately with the current callers it couldn't happen in practice. Fix on d1820c1516a31a149fc51a9e5126bf899e4c4e08. --- changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 3 +++ src/test/test_protover.c | 1 + 3 files changed, 7 insertions(+) diff --git a/changes/bug27804 b/changes/bug27804 new file mode 100644 index 000000000..fa7fec0bc --- /dev/null +++ b/changes/bug27804 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Fix a potential null dereference in protover_all_supported(). + Add a test for it. Fixes bug 27804; bugfix on 0.3.3.1-alpha. diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 9656e8c31..ca9a504fe 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -68,6 +68,9 @@ pub extern "C" fn protover_all_supported( if maybe_unsupported.is_some() { let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap(); + if missing_out.is_null() { + return 0; + } let c_unsupported: CString = match CString::new(unsupported.to_string()) { Ok(n) => n, Err(_) => return 1, diff --git a/src/test/test_protover.c b/src/test/test_protover.c index fb374c728..d1fc7752d 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -259,6 +259,7 @@ test_protover_all_supported(void *arg) tt_ptr_op(msg, OP_EQ, NULL); // Some things we don't support + tt_assert(! protover_all_supported("Wombat=9", NULL)); tt_assert(! protover_all_supported("Wombat=9", &msg)); tt_str_op(msg, OP_EQ, "Wombat=9"); tor_free(msg);

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3
by nickm＠torproject.org 23 Oct '18

23 Oct '18

commit 169bc670ddf9fe898800a2814a1ec30dcc3249da Merge: 93fd924bd 42558df7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:17:48 2018 -0400 Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3 changes/bug27740 | 4 ++++ changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 10 ++++------ src/test/test_protover.c | 1 + 4 files changed, 12 insertions(+), 6 deletions(-)

1 0