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

[torsocks/master] Make cpp conditional for definition of handle_mmap match use
by dgoulet＠torproject.org 24 Feb '17

24 Feb '17

commit 6520a009e1ba3c5f0c3a4e875aa4c8b396a3f2bc Author: Taylor R Campbell <campbell+torsocks(a)mumble.net> Date: Fri Feb 24 12:41:53 2017 -0500 Make cpp conditional for definition of handle_mmap match use Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/syscall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/syscall.c b/src/lib/syscall.c index d0fdaaa..41cba28 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -84,7 +84,7 @@ static LIBC_ACCEPT_RET_TYPE handle_accept(va_list args) return tsocks_accept(sockfd, addr, &addrlen); } -#if (defined(__linux__) || defined(__darwin__) || (defined(__FreeBSD_kernel__) && defined(__i386__)) || defined(__NetBSD__)) +#if !((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(__x86_64)) /* * Handle mmap(2) syscall. */ @@ -104,7 +104,7 @@ static LIBC_SYSCALL_RET_TYPE handle_mmap(va_list args) return (LIBC_SYSCALL_RET_TYPE) mmap(addr, len, prot, flags, fd, offset); } -#endif /* __linux__, __darwin__, __FreeBSD_kernel__, __i386__, __NetBSD__ */ +#endif /* __NetBSD__, __FreeBSD__, __FreeBSD_kernel__, __x86_64 */ /* * Handle munmap(2) syscall.

1 0

[torsocks/master] utils: Add useful function for later use
by dgoulet＠torproject.org 24 Feb '17

24 Feb '17

commit 98e84212f96bcda222e61dd8ad7bce98f08717c1 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Feb 24 12:33:32 2017 -0500 utils: Add useful function for later use Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/utils.c | 28 ++++++++++++++++++++++++++++ src/common/utils.h | 7 ++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/common/utils.c b/src/common/utils.c index 8fe9c6e..f02b1b4 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -366,3 +366,31 @@ int utils_get_port_from_addr(const struct sockaddr *sa) return port; } + +/* + * For a given sockaddr, return a const pointer to the address data structure. + * Return NULL if family is not IPv4 or IPv6. + */ +ATTR_HIDDEN +const char *utils_get_addr_from_sockaddr(const struct sockaddr *sa) +{ + static char buf[256]; + const void *addrp; + + assert(sa); + + memset(buf, 0, sizeof(buf)); + + if (sa->sa_family == AF_INET) { + addrp = &((const struct sockaddr_in *) sa)->sin_addr; + } else if (sa->sa_family == AF_INET6) { + addrp = &((const struct sockaddr_in6 *) sa)->sin6_addr; + } else { + goto end; + } + + inet_ntop(sa->sa_family, addrp, buf, sizeof(buf)); + +end: + return buf; +} diff --git a/src/common/utils.h b/src/common/utils.h index 83ea825..74f4f5e 100644 --- a/src/common/utils.h +++ b/src/common/utils.h @@ -1,7 +1,7 @@ /* - * Copyright (C) 2000-2008 - Shaun Clowes <delius(a)progsoc.org> - * 2008-2011 - Robert Hogan <robert(a)roberthogan.net> - * 2013 - David Goulet <dgoulet(a)ev0ke.net> + * Copyright (C) 2000-2008 - Shaun Clowes <delius(a)progsoc.org> + * 2008-2011 - Robert Hogan <robert(a)roberthogan.net> + * 2013 - David Goulet <dgoulet(a)ev0ke.net> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License, version 2 only, as @@ -34,5 +34,6 @@ int utils_sockaddr_is_localhost(const struct sockaddr *sa); int utils_localhost_resolve(const char *name, int af, void *buf, size_t len); int utils_is_addr_any(const struct sockaddr *sa); int utils_get_port_from_addr(const struct sockaddr *sa); +const char *utils_get_addr_from_sockaddr(const struct sockaddr *sa); #endif /* TORSOCKS_UTILS_H */

1 0

[torsocks/master] man: Some words were missing
by dgoulet＠torproject.org 24 Feb '17

24 Feb '17

commit 3891910fc6f089f7088582c722bac68ddacd9537 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Feb 24 12:00:55 2017 -0500 man: Some words were missing Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- doc/torsocks.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/torsocks.8 b/doc/torsocks.8 index c3f477f..7ba5a7f 100644 --- a/doc/torsocks.8 +++ b/doc/torsocks.8 @@ -137,7 +137,7 @@ This introduces overhead and should only be used when needed. Torsocks uses ELF dynamic loader features to intercept dynamic function calls from programs in which it is embedded. As a result, non-ELF executables, or executables that make system calls directly with the system call trap (int -0x80). +0x80) are not supported. .SH FILES /etc/tor/torsocks.conf - default torsocks configuration file

1 0

[torsocks/master] Remove clang warnings
by dgoulet＠torproject.org 24 Feb '17

24 Feb '17

commit a495bf1ef231da351a7e7430380699492a4ccd7c Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Feb 24 11:57:03 2017 -0500 Remove clang warnings The ht.h generated functions are now flagged with ATTR_UNUSED so the compiler knows to ignore the warnings if unused. Remove -fno-strict-overflow as well. Not needed for gcc and clang doesn't have it. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- configure.ac | 3 --- src/common/ht.h | 27 ++++++++++++++------------- src/common/macros.h | 4 ++++ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index f5dd992..f6fdb0e 100644 --- a/configure.ac +++ b/configure.ac @@ -252,9 +252,6 @@ AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1], AX_CHECK_COMPILE_FLAG([-fstack-protector-all], [CFLAGS="$CFLAGS -fstack-protector-all"],[],[] ) -AX_CHECK_COMPILE_FLAG([-fno-strict-overflow], - [CFLAGS="$CFLAGS -fno-strict-overflow"],[],[] -) dnl Add hardening linker flags AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[]) diff --git a/src/common/ht.h b/src/common/ht.h index e2fb809..b3d858e 100644 --- a/src/common/ht.h +++ b/src/common/ht.h @@ -133,7 +133,7 @@ ht_string_hash(const char *s) int name##_HT_GROW(struct name *ht, unsigned min_capacity); \ void name##_HT_CLEAR(struct name *ht); \ int name##_HT_REP_IS_BAD_(const struct name *ht); \ - static inline void \ + ATTR_UNUSED static inline void \ name##_HT_INIT(struct name *head) { \ head->hth_table_length = 0; \ head->hth_table = NULL; \ @@ -143,7 +143,7 @@ ht_string_hash(const char *s) } \ /* Helper: returns a pointer to the right location in the table \ * 'head' to find or insert the element 'elm'. */ \ - static inline struct type ** \ + ATTR_UNUSED static inline struct type ** \ name##_HT_FIND_P_(struct name *head, struct type *elm) \ { \ struct type **p; \ @@ -157,9 +157,9 @@ ht_string_hash(const char *s) } \ return p; \ } \ - /* Return a pointer to the element in the table 'head' matching 'elm', \ - * or NULL if no such element exists */ \ - static inline struct type * \ + /* Return a pointer to the element in the table 'head' matching \ + * 'elm', or NULL if no such element exists */ \ + ATTR_UNUSED static inline struct type * \ name##_HT_FIND(const struct name *head, struct type *elm) \ { \ struct type **p; \ @@ -170,11 +170,12 @@ ht_string_hash(const char *s) } \ /* Insert the element 'elm' into the table 'head'. Do not call this \ * function if the table might already contain a matching element. */ \ - static inline void \ + ATTR_UNUSED static inline void \ name##_HT_INSERT(struct name *head, struct type *elm) \ { \ struct type **p; \ - if (!head->hth_table || head->hth_n_entries >= head->hth_load_limit) \ + if (!head->hth_table || \ + head->hth_n_entries >= head->hth_load_limit) \ name##_HT_GROW(head, head->hth_n_entries+1); \ ++head->hth_n_entries; \ HT_SET_HASH_(elm, field, hashfn); \ @@ -185,7 +186,7 @@ ht_string_hash(const char *s) /* Insert the element 'elm' into the table 'head'. If there already \ * a matching element in the table, replace that element and return \ * it. */ \ - static inline struct type * \ + ATTR_UNUSED static inline struct type * \ name##_HT_REPLACE(struct name *head, struct type *elm) \ { \ struct type **p, *r; \ @@ -206,7 +207,7 @@ ht_string_hash(const char *s) } \ /* Remove any element matching 'elm' from the table 'head'. If such \ * an element is found, return it; otherwise return NULL. */ \ - static inline struct type * \ + ATTR_UNUSED static inline struct type * \ name##_HT_REMOVE(struct name *head, struct type *elm) \ { \ struct type **p, *r; \ @@ -224,7 +225,7 @@ ht_string_hash(const char *s) * using 'data' as its second argument. If the function returns \ * nonzero, remove the most recently examined element before invoking \ * the function again. */ \ - static inline void \ + ATTR_UNUSED static inline void \ name##_HT_FOREACH_FN(struct name *head, \ int (*fn)(struct type *, void *), \ void *data) \ @@ -250,7 +251,7 @@ ht_string_hash(const char *s) /* Return a pointer to the first element in the table 'head', under \ * an arbitrary order. This order is stable under remove operations, \ * but not under others. If the table is empty, return NULL. */ \ - static inline struct type ** \ + ATTR_UNUSED static inline struct type ** \ name##_HT_START(struct name *head) \ { \ unsigned b = 0; \ @@ -266,7 +267,7 @@ ht_string_hash(const char *s) * NULL. If 'elm' is to be removed from the table, you must call \ * this function for the next value before you remove it. \ */ \ - static inline struct type ** \ + ATTR_UNUSED static inline struct type ** \ name##_HT_NEXT(struct name *head, struct type **elm) \ { \ if ((*elm)->field.hte_next) { \ @@ -282,7 +283,7 @@ ht_string_hash(const char *s) return NULL; \ } \ } \ - static inline struct type ** \ + ATTR_UNUSED static inline struct type ** \ name##_HT_NEXT_RMV(struct name *head, struct type **elm) \ { \ unsigned h = HT_ELT_HASH_(*elm, field, hashfn); \ diff --git a/src/common/macros.h b/src/common/macros.h index 8b52814..92ede22 100644 --- a/src/common/macros.h +++ b/src/common/macros.h @@ -41,6 +41,10 @@ #define ATTR_HIDDEN __attribute__((visibility("hidden"))) #endif +#ifndef ATTR_UNUSED +#define ATTR_UNUSED __attribute__ ((unused)) +#endif + #ifndef min #define min(a, b) ((a) < (b) ? (a) : (b)) #endif

1 0

[tor/maint-0.3.0] Whitespace fix.
by nickm＠torproject.org 24 Feb '17

24 Feb '17

commit 619771f60bde6b69eeaad4efbd844705ec5bcb83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 24 11:37:33 2017 -0500 Whitespace fix. --- src/or/rendservice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 522f33e..cb87624 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3175,8 +3175,8 @@ count_intro_point_circuits(const rend_service_t *service) */ STATIC ssize_t encode_establish_intro_cell_legacy(char *cell_body_out, - size_t cell_body_out_len, - crypto_pk_t *intro_key, char *rend_circ_nonce) + size_t cell_body_out_len, + crypto_pk_t *intro_key, char *rend_circ_nonce) { int retval = -1; int r;

1 0

[tor/maint-0.3.0] hs: Fix bad use of sizeof() when encoding ESTABLISH_INTRO legacy cell
by nickm＠torproject.org 24 Feb '17

24 Feb '17

commit 4ed10e5053ebef31d5f922933f7236a6ab743bf9 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 24 09:48:14 2017 -0500 hs: Fix bad use of sizeof() when encoding ESTABLISH_INTRO legacy cell When encoding a legacy ESTABLISH_INTRO cell, we were using the sizeof() on a pointer instead of using the real size of the destination buffer leading to an overflow passing an enormous value to the signing digest function. Fortunately, that value was only used to make sure the destination buffer length was big enough for the key size and in this case it always was because of the overflow. Fixes #21553 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug21553 | 7 +++++++ src/or/rendservice.c | 12 +++++++----- src/or/rendservice.h | 1 + src/test/test_hs_intropoint.c | 1 + 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/changes/bug21553 b/changes/bug21553 new file mode 100644 index 0000000..6ffa3e2 --- /dev/null +++ b/changes/bug21553 @@ -0,0 +1,7 @@ + o Minor bugfixes (hidden service): + - When encoding a legacy ESTABLISH_INTRO cell, we were using the sizeof() + on a pointer instead of real size of the destination buffer leading to + an overflow passing an enormous value to the signing digest function. + Fortunately, that value was only used to make sure the destination + buffer length was big enough for the key size and in this case it was. + Fixes bug 21553; bugfix on tor-0.3.0.1-alpha. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 1d6fc0f..522f33e 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3174,8 +3174,9 @@ count_intro_point_circuits(const rend_service_t *service) of bytes written. On fail, return -1. */ STATIC ssize_t -encode_establish_intro_cell_legacy(char *cell_body_out, crypto_pk_t *intro_key, - char *rend_circ_nonce) +encode_establish_intro_cell_legacy(char *cell_body_out, + size_t cell_body_out_len, + crypto_pk_t *intro_key, char *rend_circ_nonce) { int retval = -1; int r; @@ -3202,7 +3203,7 @@ encode_establish_intro_cell_legacy(char *cell_body_out, crypto_pk_t *intro_key, len += 20; note_crypto_pk_op(REND_SERVER); r = crypto_pk_private_sign_digest(intro_key, cell_body_out+len, - sizeof(cell_body_out)-len, + cell_body_out_len - len, cell_body_out, len); if (r<0) { log_warn(LD_BUG, "Internal error: couldn't sign introduction request."); @@ -3313,8 +3314,9 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) /* Send the ESTABLISH_INTRO cell */ { ssize_t len; - len = encode_establish_intro_cell_legacy(buf, circuit->intro_key, - circuit->cpath->prev->rend_circ_nonce); + len = encode_establish_intro_cell_legacy(buf, sizeof(buf), + circuit->intro_key, + circuit->cpath->prev->rend_circ_nonce); if (len < 0) { reason = END_CIRC_REASON_INTERNAL; goto err; diff --git a/src/or/rendservice.h b/src/or/rendservice.h index 3bfac0b..85daaae 100644 --- a/src/or/rendservice.h +++ b/src/or/rendservice.h @@ -130,6 +130,7 @@ STATIC int rend_service_poison_new_single_onion_dir( const rend_service_t *s, const or_options_t* options); STATIC ssize_t encode_establish_intro_cell_legacy(char *cell_body_out, + size_t cell_body_out_len, crypto_pk_t *intro_key, char *rend_circ_nonce); STATIC void prune_services_on_reload(smartlist_t *old_service_list, diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index ea12aeb..b207cd4 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -489,6 +489,7 @@ helper_establish_intro_v2(or_circuit_t *intro_circ) /* Use old circuit_key_material why not */ cell_len = encode_establish_intro_cell_legacy((char*)cell_body, + sizeof(cell_body), key1, (char *) circuit_key_material); tt_int_op(cell_len, >, 0);

1 0

[tor/master] hs: Fix bad use of sizeof() when encoding ESTABLISH_INTRO legacy cell
by nickm＠torproject.org 24 Feb '17

24 Feb '17

commit 4ed10e5053ebef31d5f922933f7236a6ab743bf9 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 24 09:48:14 2017 -0500 hs: Fix bad use of sizeof() when encoding ESTABLISH_INTRO legacy cell When encoding a legacy ESTABLISH_INTRO cell, we were using the sizeof() on a pointer instead of using the real size of the destination buffer leading to an overflow passing an enormous value to the signing digest function. Fortunately, that value was only used to make sure the destination buffer length was big enough for the key size and in this case it always was because of the overflow. Fixes #21553 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug21553 | 7 +++++++ src/or/rendservice.c | 12 +++++++----- src/or/rendservice.h | 1 + src/test/test_hs_intropoint.c | 1 + 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/changes/bug21553 b/changes/bug21553 new file mode 100644 index 0000000..6ffa3e2 --- /dev/null +++ b/changes/bug21553 @@ -0,0 +1,7 @@ + o Minor bugfixes (hidden service): + - When encoding a legacy ESTABLISH_INTRO cell, we were using the sizeof() + on a pointer instead of real size of the destination buffer leading to + an overflow passing an enormous value to the signing digest function. + Fortunately, that value was only used to make sure the destination + buffer length was big enough for the key size and in this case it was. + Fixes bug 21553; bugfix on tor-0.3.0.1-alpha. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 1d6fc0f..522f33e 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3174,8 +3174,9 @@ count_intro_point_circuits(const rend_service_t *service) of bytes written. On fail, return -1. */ STATIC ssize_t -encode_establish_intro_cell_legacy(char *cell_body_out, crypto_pk_t *intro_key, - char *rend_circ_nonce) +encode_establish_intro_cell_legacy(char *cell_body_out, + size_t cell_body_out_len, + crypto_pk_t *intro_key, char *rend_circ_nonce) { int retval = -1; int r; @@ -3202,7 +3203,7 @@ encode_establish_intro_cell_legacy(char *cell_body_out, crypto_pk_t *intro_key, len += 20; note_crypto_pk_op(REND_SERVER); r = crypto_pk_private_sign_digest(intro_key, cell_body_out+len, - sizeof(cell_body_out)-len, + cell_body_out_len - len, cell_body_out, len); if (r<0) { log_warn(LD_BUG, "Internal error: couldn't sign introduction request."); @@ -3313,8 +3314,9 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) /* Send the ESTABLISH_INTRO cell */ { ssize_t len; - len = encode_establish_intro_cell_legacy(buf, circuit->intro_key, - circuit->cpath->prev->rend_circ_nonce); + len = encode_establish_intro_cell_legacy(buf, sizeof(buf), + circuit->intro_key, + circuit->cpath->prev->rend_circ_nonce); if (len < 0) { reason = END_CIRC_REASON_INTERNAL; goto err; diff --git a/src/or/rendservice.h b/src/or/rendservice.h index 3bfac0b..85daaae 100644 --- a/src/or/rendservice.h +++ b/src/or/rendservice.h @@ -130,6 +130,7 @@ STATIC int rend_service_poison_new_single_onion_dir( const rend_service_t *s, const or_options_t* options); STATIC ssize_t encode_establish_intro_cell_legacy(char *cell_body_out, + size_t cell_body_out_len, crypto_pk_t *intro_key, char *rend_circ_nonce); STATIC void prune_services_on_reload(smartlist_t *old_service_list, diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index ea12aeb..b207cd4 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -489,6 +489,7 @@ helper_establish_intro_v2(or_circuit_t *intro_circ) /* Use old circuit_key_material why not */ cell_len = encode_establish_intro_cell_legacy((char*)cell_body, + sizeof(cell_body), key1, (char *) circuit_key_material); tt_int_op(cell_len, >, 0);

1 0

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

24 Feb '17

commit 02aaa7f9edd333a40d364fd99f3c141dfe85b651 Merge: d73755e 619771f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 24 11:37:41 2017 -0500 Merge branch 'maint-0.3.0' src/or/rendservice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

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

24 Feb '17

commit d73755e36e83f30e9a961029b6eaba34c3935845 Merge: efa5bba 4ed10e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 24 11:37:04 2017 -0500 Merge branch 'maint-0.3.0' changes/bug21553 | 7 +++++++ src/or/rendservice.c | 12 +++++++----- src/or/rendservice.h | 1 + src/test/test_hs_intropoint.c | 1 + 4 files changed, 16 insertions(+), 5 deletions(-)

1 0

[tor/master] Whitespace fix.
by nickm＠torproject.org 24 Feb '17

24 Feb '17

commit 619771f60bde6b69eeaad4efbd844705ec5bcb83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 24 11:37:33 2017 -0500 Whitespace fix. --- src/or/rendservice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 522f33e..cb87624 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3175,8 +3175,8 @@ count_intro_point_circuits(const rend_service_t *service) */ STATIC ssize_t encode_establish_intro_cell_legacy(char *cell_body_out, - size_t cell_body_out_len, - crypto_pk_t *intro_key, char *rend_circ_nonce) + size_t cell_body_out_len, + crypto_pk_t *intro_key, char *rend_circ_nonce) { int retval = -1; int r;

1 0