June 2017 - tor-commits - lists.torproject.org

[tor-browser-build/master] Fix gcc lib path on linux32
by boklm＠torproject.org 05 Jun '17

05 Jun '17

commit 8e1099b5c657b30ae9cd5f57842b18533aa62e69 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 5 19:41:50 2017 +0200 Fix gcc lib path on linux32 --- projects/gcc/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/gcc/config b/projects/gcc/config index d97afbf..6bf14ad 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -13,7 +13,7 @@ var: tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/gcc/bin:$PATH" [% IF c("var/osname") == "linux-i686" -%] - export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib32 + export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib [% ELSE -%] export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib64 [% END -%]

1 0

[tor-browser-build/master] Build snowflake on linux32 too
by boklm＠torproject.org 05 Jun '17

05 Jun '17

commit cb1d87e923cbbb1d76a0fab4891ec33e7015323b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 5 19:42:27 2017 +0200 Build snowflake on linux32 too --- projects/webrtc/build | 1 + rbm.conf | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/webrtc/build b/projects/webrtc/build index 3ae7ed0..c07824f 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -1,5 +1,6 @@ #!/bin/bash [% c("var/set_default_env") -%] +[% c("var/setarch") -%] distdir=/var/tmp/dist/[% project %] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] diff --git a/rbm.conf b/rbm.conf index 6a1cc43..7b58503 100644 --- a/rbm.conf +++ b/rbm.conf @@ -111,8 +111,6 @@ targets: var: linux-x86_64: 1 osname: linux-x86_64 - # We only build snowflake on linux-x86_64 for now - snowflake: 1 container: arch: amd64 linux-i686: @@ -132,6 +130,8 @@ targets: var: linux: 1 compiler: gcc + # We only build snowflake on linux for now + snowflake: 1 container: suite: wheezy deps:

1 0

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit db2f18b1f92509de04be6cd973f9120e9c7be489 Merge: 26d9fff 578a439 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 12:02:47 2017 -0400 Merge branch 'maint-0.3.0' changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 33fcc0f61d1feb2fbdf3153c7c64780dcdce6767 Merge: 5b45d73 3f2d1f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 12:01:17 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 1a540b579248c04eba79c3e18d022054b238f6f5 Merge: 68d6720 e3ebae4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 12:00:08 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit d75be189df970f0da3a59f649e3be9c5d57868c6 Merge: ec61ae5 33fcc0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 12:02:15 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 9ea3d0877a5be2762cfcb4d7c2015e5ec43a2055 Merge: 159ddf6 1a540b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 12:00:27 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 3f2d1f7f0730a17b81d2fb94df9b6a5b8b277893 Merge: 71dd1d7 9ea3d08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 12:00:41 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 578a4392e94faaa85ae79dfe1d4e7e93d0700de5 Merge: 41ed9e9 d75be18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 12:02:26 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Fix undefined behavior in geoip_parse_entry().
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit e3ebae48040b9ed3946e65dbc6a24e8f5e48ff6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 10:09:39 2017 -0400 Fix undefined behavior in geoip_parse_entry(). Fixes bug 22490; bugfix on 6a241ff3ffe7dc1 in 0.2.4.6-alpha. Found by teor using clang-5.0's AddressSanitizer stack-use-after-scope. --- changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug22490 b/changes/bug22490 new file mode 100644 index 0000000..244dd50 --- /dev/null +++ b/changes/bug22490 @@ -0,0 +1,3 @@ + o Minor bugfixes (correctness): + - Avoid undefined behavior when parsing IPv6 entries from the geoip6 + file. Fixes bug 22490; bugfix on 0.2.4.6-alpha. diff --git a/src/or/geoip.c b/src/or/geoip.c index e2e98e8..4abd519 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -145,6 +145,7 @@ geoip_parse_entry(const char *line, sa_family_t family) if (*line == '#') return 0; + char buf[512]; if (family == AF_INET) { unsigned int low, high; if (tor_sscanf(line,"%u,%u,%2s", &low, &high, c) == 3 || @@ -155,7 +156,6 @@ geoip_parse_entry(const char *line, sa_family_t family) goto fail; country = c; } else { /* AF_INET6 */ - char buf[512]; char *low_str, *high_str; struct in6_addr low, high; char *strtok_state;

1 0