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

[tor/maint-0.2.7-redux] Fix assertion failure related to openbsd strtol().
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit bb3f74e66bd9df94ce9d1949164348efac728ea9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 3 11:20:09 2017 -0400 Fix assertion failure related to openbsd strtol(). Fixes bug 22789; bugfix on 0.2.3.8-alpha. --- changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/changes/bug22789 b/changes/bug22789 new file mode 100644 index 0000000..dc9fa29 --- /dev/null +++ b/changes/bug22789 @@ -0,0 +1,6 @@ + o Major bugfixes (openbsd, denial-of-service): + - Avoid an assertion failure bug affecting our implementation of + inet_pton(AF_INET6) on certain OpenBSD systems whose strtol() + handling of "0xfoo" differs from what we had expected. + Fixes bug 22789; bugfix on 0.2.3.8-alpha. + diff --git a/src/common/compat.c b/src/common/compat.c index d88c5f9..b77f25b 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2045,8 +2045,12 @@ tor_inet_pton(int af, const char *src, void *dst) char *next; ssize_t len; long r = strtol(src, &next, 16); - tor_assert(next != NULL); - tor_assert(next != src); + if (next == NULL || next == src) { + /* The 'next == src' error case can happen on versions of openbsd + * where treats "0xfoo" as an error, rather than as "0" followed by + * "xfoo". */ + return 0; + } len = *next == '\0' ? eow - src : next - src; if (len > 4) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index fec85a4..645fc64 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -340,6 +340,15 @@ test_addr_ip6_helpers(void) test_pton6_bad("a:::b:c"); test_pton6_bad(":::a:b:c"); test_pton6_bad("a:b:c:::"); + /* Regression tests for 22789. */ + test_pton6_bad("0xfoo"); + test_pton6_bad("0x88"); + test_pton6_bad("0xyxxy"); + test_pton6_bad("0XFOO"); + test_pton6_bad("0X88"); + test_pton6_bad("0XYXXY"); + test_pton6_bad("0x"); + test_pton6_bad("0X"); /* test internal checking */ test_external_ip("fbff:ffff::2:7", 0);

1 0

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

05 Jul '17

commit 0ee15c92d5486fc73ba49dea7f12bf2f89012cfb Merge: d56f699 bb3f74e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:41:27 2017 -0400 Merge branch 'bug22789_024' into maint-0.2.4 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.8] Fix assertion failure related to openbsd strtol().
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit bb3f74e66bd9df94ce9d1949164348efac728ea9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 3 11:20:09 2017 -0400 Fix assertion failure related to openbsd strtol(). Fixes bug 22789; bugfix on 0.2.3.8-alpha. --- changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/changes/bug22789 b/changes/bug22789 new file mode 100644 index 0000000..dc9fa29 --- /dev/null +++ b/changes/bug22789 @@ -0,0 +1,6 @@ + o Major bugfixes (openbsd, denial-of-service): + - Avoid an assertion failure bug affecting our implementation of + inet_pton(AF_INET6) on certain OpenBSD systems whose strtol() + handling of "0xfoo" differs from what we had expected. + Fixes bug 22789; bugfix on 0.2.3.8-alpha. + diff --git a/src/common/compat.c b/src/common/compat.c index d88c5f9..b77f25b 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2045,8 +2045,12 @@ tor_inet_pton(int af, const char *src, void *dst) char *next; ssize_t len; long r = strtol(src, &next, 16); - tor_assert(next != NULL); - tor_assert(next != src); + if (next == NULL || next == src) { + /* The 'next == src' error case can happen on versions of openbsd + * where treats "0xfoo" as an error, rather than as "0" followed by + * "xfoo". */ + return 0; + } len = *next == '\0' ? eow - src : next - src; if (len > 4) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index fec85a4..645fc64 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -340,6 +340,15 @@ test_addr_ip6_helpers(void) test_pton6_bad("a:::b:c"); test_pton6_bad(":::a:b:c"); test_pton6_bad("a:b:c:::"); + /* Regression tests for 22789. */ + test_pton6_bad("0xfoo"); + test_pton6_bad("0x88"); + test_pton6_bad("0xyxxy"); + test_pton6_bad("0XFOO"); + test_pton6_bad("0X88"); + test_pton6_bad("0XYXXY"); + test_pton6_bad("0x"); + test_pton6_bad("0X"); /* test internal checking */ test_external_ip("fbff:ffff::2:7", 0);

1 0

[tor/maint-0.2.6] Fix assertion failure related to openbsd strtol().
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit bb3f74e66bd9df94ce9d1949164348efac728ea9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 3 11:20:09 2017 -0400 Fix assertion failure related to openbsd strtol(). Fixes bug 22789; bugfix on 0.2.3.8-alpha. --- changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/changes/bug22789 b/changes/bug22789 new file mode 100644 index 0000000..dc9fa29 --- /dev/null +++ b/changes/bug22789 @@ -0,0 +1,6 @@ + o Major bugfixes (openbsd, denial-of-service): + - Avoid an assertion failure bug affecting our implementation of + inet_pton(AF_INET6) on certain OpenBSD systems whose strtol() + handling of "0xfoo" differs from what we had expected. + Fixes bug 22789; bugfix on 0.2.3.8-alpha. + diff --git a/src/common/compat.c b/src/common/compat.c index d88c5f9..b77f25b 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2045,8 +2045,12 @@ tor_inet_pton(int af, const char *src, void *dst) char *next; ssize_t len; long r = strtol(src, &next, 16); - tor_assert(next != NULL); - tor_assert(next != src); + if (next == NULL || next == src) { + /* The 'next == src' error case can happen on versions of openbsd + * where treats "0xfoo" as an error, rather than as "0" followed by + * "xfoo". */ + return 0; + } len = *next == '\0' ? eow - src : next - src; if (len > 4) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index fec85a4..645fc64 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -340,6 +340,15 @@ test_addr_ip6_helpers(void) test_pton6_bad("a:::b:c"); test_pton6_bad(":::a:b:c"); test_pton6_bad("a:b:c:::"); + /* Regression tests for 22789. */ + test_pton6_bad("0xfoo"); + test_pton6_bad("0x88"); + test_pton6_bad("0xyxxy"); + test_pton6_bad("0XFOO"); + test_pton6_bad("0X88"); + test_pton6_bad("0XYXXY"); + test_pton6_bad("0x"); + test_pton6_bad("0X"); /* test internal checking */ test_external_ip("fbff:ffff::2:7", 0);

1 0

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

05 Jul '17

commit ff8c230d7cadb6c24dcf9c121521cff976fc83a5 Merge: ccae991 0ee15c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:42:26 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --cc src/test/test_addr.c index 50011e6,645fc64..2c126e6 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@@ -346,9 -340,15 +346,18 @@@ test_addr_ip6_helpers(void test_pton6_bad("a:::b:c"); test_pton6_bad(":::a:b:c"); test_pton6_bad("a:b:c:::"); + test_pton6_bad("1.2.3.4"); + test_pton6_bad(":1.2.3.4"); + test_pton6_bad(".2.3.4"); + /* Regression tests for 22789. */ + test_pton6_bad("0xfoo"); + test_pton6_bad("0x88"); + test_pton6_bad("0xyxxy"); + test_pton6_bad("0XFOO"); + test_pton6_bad("0X88"); + test_pton6_bad("0XYXXY"); + test_pton6_bad("0x"); + test_pton6_bad("0X"); /* test internal checking */ test_external_ip("fbff:ffff::2:7", 0);

1 0

[tor/maint-0.2.7-redux] Merge branch 'bug22789_024' into maint-0.2.4
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 0ee15c92d5486fc73ba49dea7f12bf2f89012cfb Merge: d56f699 bb3f74e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:41:27 2017 -0400 Merge branch 'bug22789_024' into maint-0.2.4 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

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

05 Jul '17

commit ff8c230d7cadb6c24dcf9c121521cff976fc83a5 Merge: ccae991 0ee15c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:42:26 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --cc src/test/test_addr.c index 50011e6,645fc64..2c126e6 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@@ -346,9 -340,15 +346,18 @@@ test_addr_ip6_helpers(void test_pton6_bad("a:::b:c"); test_pton6_bad(":::a:b:c"); test_pton6_bad("a:b:c:::"); + test_pton6_bad("1.2.3.4"); + test_pton6_bad(":1.2.3.4"); + test_pton6_bad(".2.3.4"); + /* Regression tests for 22789. */ + test_pton6_bad("0xfoo"); + test_pton6_bad("0x88"); + test_pton6_bad("0xyxxy"); + test_pton6_bad("0XFOO"); + test_pton6_bad("0X88"); + test_pton6_bad("0XYXXY"); + test_pton6_bad("0x"); + test_pton6_bad("0X"); /* test internal checking */ test_external_ip("fbff:ffff::2:7", 0);

1 0

[tor/maint-0.2.6] Merge branch 'bug22789_024' into maint-0.2.4
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 0ee15c92d5486fc73ba49dea7f12bf2f89012cfb Merge: d56f699 bb3f74e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:41:27 2017 -0400 Merge branch 'bug22789_024' into maint-0.2.4 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

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

05 Jul '17

commit f6420bceec9707324fe23c98a2a70dd2612f183f Merge: 3de2761 ff8c230 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:42:32 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

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

05 Jul '17

commit f6420bceec9707324fe23c98a2a70dd2612f183f Merge: 3de2761 ff8c230 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:42:32 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0