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

[tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6
by asn＠torproject.org 23 Apr '21

23 Apr '21

commit f0260c4cea6da784369e8d47f0b4bf01863c5af5 Merge: 38bfb3cdfe 8c29729916 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 23 13:00:23 2021 +0300 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61 ++++++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 25 deletions(-) diff --cc src/feature/hs/hs_cache.c index bb1532f808,9c35936748..cf8e377313 --- a/src/feature/hs/hs_cache.c +++ b/src/feature/hs/hs_cache.c @@@ -390,10 -415,21 +415,21 @@@ remove_v3_desc_as_client(const hs_cache static void store_v3_desc_as_client(hs_cache_client_descriptor_t *desc) { + hs_cache_client_descriptor_t *cached_desc; + tor_assert(desc); + + /* Because the lookup function doesn't return an expired entry, it can linger + * in the cache until we clean it up or a new descriptor is stored. So, + * before adding, we'll make sure we are not overwriting an old descriptor + * (which is OK in terms of semantic) but leads to memory leak. */ + cached_desc = digest256map_get(hs_cache_v3_client, desc->key.pubkey); + if (cached_desc) { + cache_client_desc_free(cached_desc); + } digest256map_set(hs_cache_v3_client, desc->key.pubkey, desc); /* Update cache size with this entry for the OOM handler. */ - rend_cache_increment_allocation(cache_get_client_entry_size(desc)); + hs_cache_increment_allocation(cache_get_client_entry_size(desc)); } /** Query our cache and return the entry or NULL if not found or if expired. */

1 0

[tor/release-0.4.5] hs: Fix memory leak in client cache
by asn＠torproject.org 23 Apr '21

23 Apr '21

commit 8c29729916be9cd9692657096babb838fc2e7a4c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 20 13:13:54 2021 -0400 hs: Fix memory leak in client cache Fixes #40356 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61 ++++++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/changes/ticket40356 b/changes/ticket40356 new file mode 100644 index 0000000000..59c32ce0cc --- /dev/null +++ b/changes/ticket40356 @@ -0,0 +1,3 @@ + o Minor bugfix (onion service, client, memory leak): + - An expired cached descriptor could have been overwritten with a new one + leading to a memory leak. Fixes bug 40356; bugfix on 0.3.5.1-alpha. diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c index c1334a7d27..9c35936748 100644 --- a/src/feature/hs/hs_cache.c +++ b/src/feature/hs/hs_cache.c @@ -353,6 +353,31 @@ static digest256map_t *hs_cache_v3_client; * objects all related to a specific service. */ static digest256map_t *hs_cache_client_intro_state; +#define cache_client_desc_free(val) \ + FREE_AND_NULL(hs_cache_client_descriptor_t, cache_client_desc_free_, (val)) + +/** Free memory allocated by desc. */ +static void +cache_client_desc_free_(hs_cache_client_descriptor_t *desc) +{ + if (desc == NULL) { + return; + } + hs_descriptor_free(desc->desc); + memwipe(&desc->key, 0, sizeof(desc->key)); + memwipe(desc->encoded_desc, 0, strlen(desc->encoded_desc)); + tor_free(desc->encoded_desc); + tor_free(desc); +} + +/** Helper function: Use by the free all function to clear the client cache */ +static void +cache_client_desc_free_void(void *ptr) +{ + hs_cache_client_descriptor_t *desc = ptr; + cache_client_desc_free(desc); +} + /** Return the size of a client cache entry in bytes. */ static size_t cache_get_client_entry_size(const hs_cache_client_descriptor_t *entry) @@ -390,7 +415,18 @@ remove_v3_desc_as_client(const hs_cache_client_descriptor_t *desc) static void store_v3_desc_as_client(hs_cache_client_descriptor_t *desc) { + hs_cache_client_descriptor_t *cached_desc; + tor_assert(desc); + + /* Because the lookup function doesn't return an expired entry, it can linger + * in the cache until we clean it up or a new descriptor is stored. So, + * before adding, we'll make sure we are not overwriting an old descriptor + * (which is OK in terms of semantic) but leads to memory leak. */ + cached_desc = digest256map_get(hs_cache_v3_client, desc->key.pubkey); + if (cached_desc) { + cache_client_desc_free(cached_desc); + } digest256map_set(hs_cache_v3_client, desc->key.pubkey, desc); /* Update cache size with this entry for the OOM handler. */ rend_cache_increment_allocation(cache_get_client_entry_size(desc)); @@ -473,31 +509,6 @@ cache_client_desc_new(const char *desc_str, return client_desc; } -#define cache_client_desc_free(val) \ - FREE_AND_NULL(hs_cache_client_descriptor_t, cache_client_desc_free_, (val)) - -/** Free memory allocated by desc. */ -static void -cache_client_desc_free_(hs_cache_client_descriptor_t *desc) -{ - if (desc == NULL) { - return; - } - hs_descriptor_free(desc->desc); - memwipe(&desc->key, 0, sizeof(desc->key)); - memwipe(desc->encoded_desc, 0, strlen(desc->encoded_desc)); - tor_free(desc->encoded_desc); - tor_free(desc); -} - -/** Helper function: Use by the free all function to clear the client cache */ -static void -cache_client_desc_free_void(void *ptr) -{ - hs_cache_client_descriptor_t *desc = ptr; - cache_client_desc_free(desc); -} - /** Return a newly allocated and initialized hs_cache_intro_state_t object. */ static hs_cache_intro_state_t * cache_intro_state_new(void)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by asn＠torproject.org 23 Apr '21

23 Apr '21

commit f0260c4cea6da784369e8d47f0b4bf01863c5af5 Merge: 38bfb3cdfe 8c29729916 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 23 13:00:23 2021 +0300 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61 ++++++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 25 deletions(-) diff --cc src/feature/hs/hs_cache.c index bb1532f808,9c35936748..cf8e377313 --- a/src/feature/hs/hs_cache.c +++ b/src/feature/hs/hs_cache.c @@@ -390,10 -415,21 +415,21 @@@ remove_v3_desc_as_client(const hs_cache static void store_v3_desc_as_client(hs_cache_client_descriptor_t *desc) { + hs_cache_client_descriptor_t *cached_desc; + tor_assert(desc); + + /* Because the lookup function doesn't return an expired entry, it can linger + * in the cache until we clean it up or a new descriptor is stored. So, + * before adding, we'll make sure we are not overwriting an old descriptor + * (which is OK in terms of semantic) but leads to memory leak. */ + cached_desc = digest256map_get(hs_cache_v3_client, desc->key.pubkey); + if (cached_desc) { + cache_client_desc_free(cached_desc); + } digest256map_set(hs_cache_v3_client, desc->key.pubkey, desc); /* Update cache size with this entry for the OOM handler. */ - rend_cache_increment_allocation(cache_get_client_entry_size(desc)); + hs_cache_increment_allocation(cache_get_client_entry_size(desc)); } /** Query our cache and return the entry or NULL if not found or if expired. */

1 0

[tor/master] Merge branch 'maint-0.4.6'
by asn＠torproject.org 23 Apr '21

23 Apr '21

commit 973fcf056a21087157e2f07ac94899521b50e1d4 Merge: fe9bd6bd96 f0260c4cea Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 23 13:00:24 2021 +0300 Merge branch 'maint-0.4.6' changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61 ++++++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 25 deletions(-)

1 0

[tor/release-0.4.6] hs: Fix memory leak in client cache
by asn＠torproject.org 23 Apr '21

23 Apr '21

commit 8c29729916be9cd9692657096babb838fc2e7a4c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 20 13:13:54 2021 -0400 hs: Fix memory leak in client cache Fixes #40356 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61 ++++++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/changes/ticket40356 b/changes/ticket40356 new file mode 100644 index 0000000000..59c32ce0cc --- /dev/null +++ b/changes/ticket40356 @@ -0,0 +1,3 @@ + o Minor bugfix (onion service, client, memory leak): + - An expired cached descriptor could have been overwritten with a new one + leading to a memory leak. Fixes bug 40356; bugfix on 0.3.5.1-alpha. diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c index c1334a7d27..9c35936748 100644 --- a/src/feature/hs/hs_cache.c +++ b/src/feature/hs/hs_cache.c @@ -353,6 +353,31 @@ static digest256map_t *hs_cache_v3_client; * objects all related to a specific service. */ static digest256map_t *hs_cache_client_intro_state; +#define cache_client_desc_free(val) \ + FREE_AND_NULL(hs_cache_client_descriptor_t, cache_client_desc_free_, (val)) + +/** Free memory allocated by desc. */ +static void +cache_client_desc_free_(hs_cache_client_descriptor_t *desc) +{ + if (desc == NULL) { + return; + } + hs_descriptor_free(desc->desc); + memwipe(&desc->key, 0, sizeof(desc->key)); + memwipe(desc->encoded_desc, 0, strlen(desc->encoded_desc)); + tor_free(desc->encoded_desc); + tor_free(desc); +} + +/** Helper function: Use by the free all function to clear the client cache */ +static void +cache_client_desc_free_void(void *ptr) +{ + hs_cache_client_descriptor_t *desc = ptr; + cache_client_desc_free(desc); +} + /** Return the size of a client cache entry in bytes. */ static size_t cache_get_client_entry_size(const hs_cache_client_descriptor_t *entry) @@ -390,7 +415,18 @@ remove_v3_desc_as_client(const hs_cache_client_descriptor_t *desc) static void store_v3_desc_as_client(hs_cache_client_descriptor_t *desc) { + hs_cache_client_descriptor_t *cached_desc; + tor_assert(desc); + + /* Because the lookup function doesn't return an expired entry, it can linger + * in the cache until we clean it up or a new descriptor is stored. So, + * before adding, we'll make sure we are not overwriting an old descriptor + * (which is OK in terms of semantic) but leads to memory leak. */ + cached_desc = digest256map_get(hs_cache_v3_client, desc->key.pubkey); + if (cached_desc) { + cache_client_desc_free(cached_desc); + } digest256map_set(hs_cache_v3_client, desc->key.pubkey, desc); /* Update cache size with this entry for the OOM handler. */ rend_cache_increment_allocation(cache_get_client_entry_size(desc)); @@ -473,31 +509,6 @@ cache_client_desc_new(const char *desc_str, return client_desc; } -#define cache_client_desc_free(val) \ - FREE_AND_NULL(hs_cache_client_descriptor_t, cache_client_desc_free_, (val)) - -/** Free memory allocated by desc. */ -static void -cache_client_desc_free_(hs_cache_client_descriptor_t *desc) -{ - if (desc == NULL) { - return; - } - hs_descriptor_free(desc->desc); - memwipe(&desc->key, 0, sizeof(desc->key)); - memwipe(desc->encoded_desc, 0, strlen(desc->encoded_desc)); - tor_free(desc->encoded_desc); - tor_free(desc); -} - -/** Helper function: Use by the free all function to clear the client cache */ -static void -cache_client_desc_free_void(void *ptr) -{ - hs_cache_client_descriptor_t *desc = ptr; - cache_client_desc_free(desc); -} - /** Return a newly allocated and initialized hs_cache_intro_state_t object. */ static hs_cache_intro_state_t * cache_intro_state_new(void)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by asn＠torproject.org 23 Apr '21

23 Apr '21

commit 13fd8f362fe34a68466c1320329c924f6fefaa45 Merge: 792151e4f4 8c29729916 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 23 13:00:23 2021 +0300 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61 ++++++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 25 deletions(-)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 23 Apr '21

23 Apr '21

commit c9e5dc4f5022e4d55a8ef93cdf7928b24af991c6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 23 09:49:02 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+de.po b/contents+de.po index 279c5c5e0f..e0c9210394 100644 --- a/contents+de.po +++ b/contents+de.po @@ -16,8 +16,8 @@ # 9ade41d8cd5364e7a01baeac2d1b50ef_4e0e5fa, 2020 # Not AName <atzeje(a)web.de>, 2021 # Vormrodo <volkandogruer08(a)gmail.com>, 2021 -# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2021 # Emma Peel, 2021 +# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2021 # msgid "" msgstr "" @@ -25,7 +25,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2021\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2620,7 +2620,7 @@ msgid "" msgstr "" "Du solltest jedoch weiterhin auf die URL-Leiste des Browsers achten, um " "sicherzustellen, dass Websites, denen du vertrauliche Informationen zur " -"Verfügung stellst, ein [Vorhängeschloss] (https://support.mozilla.org/en-" +"Verfügung stellst, ein [Vorhängeschloss](https://support.mozilla.org/en-" "US/kb/how-do-i-tell-if-my-connection-is-secure) oder ein [Onion-" "Symbol](/onionservices/onionservices-5) in der Adressleiste anzeigen, " "**https://** in die URL einfügen und den korrekten erwarteten Namen für die "

1 0

[manual/translations] remove directory 'public' to regenerate translations
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit ae96c1039517fc4ecf2eba02a1a4c46764653737 Author: emma peel <emmapeel(a)torproject.org> Date: Tue Apr 20 09:00:18 2021 +0000 remove directory 'public' to regenerate translations --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 937c0e0..bd551ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ pages: stage: production script: - apt update - - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-venv python3-openssl python3-cryptography -y + - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-venv python3-openssl python3-cryptography -y - pip3 install babel - pip3 install wheel - pip3 install lektor @@ -17,6 +17,7 @@ pages: - rm -rf lego - git clone https://git.torproject.org/project/web/lego.git lego - cd lego && git checkout origin/master && cd .. + - rm -rf public - lektor build --output-path public artifacts: paths:

1 0

[manual/translations] change apt for apt-get, because of scary warning. add lektor plugin command. build lektor a couple of times to see if it fixes translations
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 5f67ed7ec512c6a6f793532dafd133fb0d0dda65 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Apr 20 11:38:58 2021 +0200 change apt for apt-get, because of scary warning. add lektor plugin command. build lektor a couple of times to see if it fixes translations --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc0ffb8..33fcf43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,8 +6,8 @@ stages: pages: stage: build script: - - apt update - - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-venv python3-openssl python3-cryptography -y + - apt-get update + - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-venv python3-openssl python3-cryptography i18nspector -y - pip3 install babel - pip3 install wheel - pip3 install lektor

1 0

[manual/translations] correct translation branch
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 74dfe5525edc4adb0392ca2e484d7da987362a6d Author: emma peel <emmapeel(a)torproject.org> Date: Tue Apr 20 08:41:04 2021 +0000 correct translation branch --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 420222f..937c0e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ pages: - pip3 install lektor - rm -rf i18n - git clone https://git.torproject.org/translation.git i18n - - cd i18n && git checkout support-portal && cd .. + - cd i18n && git checkout tbmanual-contentspot && cd .. - rm -rf lego - git clone https://git.torproject.org/project/web/lego.git lego - cd lego && git checkout origin/master && cd ..

1 0