May 2019 - tor-commits - lists.torproject.org

[tor/release-0.3.5] Don't pass a NULL into a %s when logging client auth file load failure
by nickm＠torproject.org 15 May '19

15 May '19

commit ff5584034361154de381874e1a24d0a421aa0631 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 10 17:47:43 2019 -0400 Don't pass a NULL into a %s when logging client auth file load failure Fortunately, in 0.3.5.1-alpha we improved logging for various failure cases involved with onion service client auth. Unfortunately, for this one, we freed the file right before logging its name. Fortunately, tor_free() sets its pointer to NULL, so we didn't have a use-after-free bug. Unfortunately, passing NULL to %s is not defined. Fortunately, GCC 9.1.1 caught the issue! Unfortunately, nobody has actually tried building Tor with GCC 9.1.1 before. Or if they had, they didn't report the warning. Fixes bug 30475; bugfix on 0.3.5.1-alpha. --- changes/bug30475 | 4 ++++ src/feature/hs/hs_service.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug30475 b/changes/bug30475 new file mode 100644 index 000000000..839597b88 --- /dev/null +++ b/changes/bug30475 @@ -0,0 +1,4 @@ + o Minor bugfixes (): + - Avoid a GCC 9.1.1 warning (and possible crash depending on libc + implemenation) when failing to load a hidden service client authorization + file. Fixes bug 30475; bugfix on 0.3.5.1-alpha. diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 828ca1da4..402929036 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -1259,16 +1259,16 @@ load_client_keys(hs_service_t *service) client_key_file_path = hs_path_from_filename(client_keys_dir_path, filename); client_key_str = read_file_to_str(client_key_file_path, 0, NULL); - /* Free immediately after using it. */ - tor_free(client_key_file_path); /* If we cannot read the file, continue with the next file. */ if (!client_key_str) { log_warn(LD_REND, "Client authorization file %s can't be read. " "Corrupted or verify permission? Ignoring.", client_key_file_path); + tor_free(client_key_file_path); continue; } + tor_free(client_key_file_path); client = parse_authorized_client(client_key_str); /* Wipe and free immediately after using it. */

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 15 May '19

15 May '19

commit 7e3f7ab4060531c28ebf3f544f4ec5196e0424ec Merge: cd264e145 6945f2b3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 15 07:41:42 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0

[tor/release-0.3.5] Merge branch 'bug30475_035' into maint-0.3.5
by nickm＠torproject.org 15 May '19

15 May '19

commit 6945f2b3efb65f9812885e91179203621d37dd7a Merge: 231036a11 ff5584034 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 15 07:41:34 2019 -0400 Merge branch 'bug30475_035' into maint-0.3.5 changes/bug30475 | 4 ++++ src/feature/hs/hs_service.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 15 May '19

15 May '19

commit bd2fe0d8f1076b8146538026cd23b1cef7b184b7 Merge: bf35c6ae7 6945f2b3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 15 07:41:42 2019 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug30475 | 4 ++++ src/feature/hs/hs_service.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 15 May '19

15 May '19

commit 34e03b9ecca3e5e93623153d0e7311814d5aa1cd Merge: 72e799d28 7e3f7ab40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 15 07:41:42 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 15 May '19

15 May '19

commit 7e3f7ab4060531c28ebf3f544f4ec5196e0424ec Merge: cd264e145 6945f2b3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 15 07:41:42 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0

[tor/release-0.4.0] Merge branch 'bug30475_035' into maint-0.3.5
by nickm＠torproject.org 15 May '19

15 May '19

commit 6945f2b3efb65f9812885e91179203621d37dd7a Merge: 231036a11 ff5584034 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 15 07:41:34 2019 -0400 Merge branch 'bug30475_035' into maint-0.3.5 changes/bug30475 | 4 ++++ src/feature/hs/hs_service.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 15 May '19

15 May '19

commit 840c50615dd8158d428aeee7d55c1129895858db Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 11:20:08 2019 +0000 Update translations for tor-launcher-properties_completed --- nl/torlauncher.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nl/torlauncher.properties b/nl/torlauncher.properties index 147628159..56d636341 100644 --- a/nl/torlauncher.properties +++ b/nl/torlauncher.properties @@ -67,16 +67,16 @@ torlauncher.bootstrapStatus.loading_status=Laden van de netwerkstatus torlauncher.bootstrapStatus.loading_keys=Laden van de authoriteitcertificaten torlauncher.bootstrapStatus.requesting_descriptors=Opvragen van verbindingsinformatie torlauncher.bootstrapStatus.loading_descriptors=Laden van verbindingsinformatie -torlauncher.bootstrapStatus.enough_dirinfo=Klaar met het laden van relay informatie +torlauncher.bootstrapStatus.enough_dirinfo=Laden van relay-informatie voltooid torlauncher.bootstrapStatus.ap_conn_pt=Circuit maken: verbinden met brug torlauncher.bootstrapStatus.ap_conn_done_pt=Circuits bouwen: verbonden met bridge torlauncher.bootstrapStatus.ap_conn_proxy=Circuits bouwen: verbinden met proxy torlauncher.bootstrapStatus.ap_conn_done_proxy=Circuits bouwen: verbonden met proxy torlauncher.bootstrapStatus.ap_conn=Circuits bouwen: verbinden met een Tor-relay torlauncher.bootstrapStatus.ap_conn_done=Circuit opbouwen: Verbonden met een Tor relay -torlauncher.bootstrapStatus.ap_handshake=Circuits opzetten: Onderhandelen met een TOR relay -torlauncher.bootstrapStatus.ap_handshake_done=Circuits opzetten: Klaar met onderhandelen met een TOR relay -torlauncher.bootstrapStatus.circuit_create=Circuits opzetten: TOR circuit tot stand aan het brengen +torlauncher.bootstrapStatus.ap_handshake=Circuits opzetten: onderhandelen met een Tor-relay +torlauncher.bootstrapStatus.ap_handshake_done=Circuits opzetten: onderhandelen met een Tor-relay voltooid +torlauncher.bootstrapStatus.circuit_create=Circuits opzetten: Tor-circuit tot stand brengen torlauncher.bootstrapStatus.done=Verbonden met het Tor-netwerk! torlauncher.bootstrapWarning.done=uitgevoerd

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 15 May '19

15 May '19

commit ef525bfd73ee13b0ed7ca514074a82760482da13 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 11:20:02 2019 +0000 Update translations for tor-launcher-properties --- nl/torlauncher.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nl/torlauncher.properties b/nl/torlauncher.properties index 147628159..56d636341 100644 --- a/nl/torlauncher.properties +++ b/nl/torlauncher.properties @@ -67,16 +67,16 @@ torlauncher.bootstrapStatus.loading_status=Laden van de netwerkstatus torlauncher.bootstrapStatus.loading_keys=Laden van de authoriteitcertificaten torlauncher.bootstrapStatus.requesting_descriptors=Opvragen van verbindingsinformatie torlauncher.bootstrapStatus.loading_descriptors=Laden van verbindingsinformatie -torlauncher.bootstrapStatus.enough_dirinfo=Klaar met het laden van relay informatie +torlauncher.bootstrapStatus.enough_dirinfo=Laden van relay-informatie voltooid torlauncher.bootstrapStatus.ap_conn_pt=Circuit maken: verbinden met brug torlauncher.bootstrapStatus.ap_conn_done_pt=Circuits bouwen: verbonden met bridge torlauncher.bootstrapStatus.ap_conn_proxy=Circuits bouwen: verbinden met proxy torlauncher.bootstrapStatus.ap_conn_done_proxy=Circuits bouwen: verbonden met proxy torlauncher.bootstrapStatus.ap_conn=Circuits bouwen: verbinden met een Tor-relay torlauncher.bootstrapStatus.ap_conn_done=Circuit opbouwen: Verbonden met een Tor relay -torlauncher.bootstrapStatus.ap_handshake=Circuits opzetten: Onderhandelen met een TOR relay -torlauncher.bootstrapStatus.ap_handshake_done=Circuits opzetten: Klaar met onderhandelen met een TOR relay -torlauncher.bootstrapStatus.circuit_create=Circuits opzetten: TOR circuit tot stand aan het brengen +torlauncher.bootstrapStatus.ap_handshake=Circuits opzetten: onderhandelen met een Tor-relay +torlauncher.bootstrapStatus.ap_handshake_done=Circuits opzetten: onderhandelen met een Tor-relay voltooid +torlauncher.bootstrapStatus.circuit_create=Circuits opzetten: Tor-circuit tot stand brengen torlauncher.bootstrapStatus.done=Verbonden met het Tor-netwerk! torlauncher.bootstrapWarning.done=uitgevoerd

1 0

[tor/maint-0.4.0] Don't pass a NULL into a %s when logging client auth file load failure
by asn＠torproject.org 15 May '19

15 May '19

commit ff5584034361154de381874e1a24d0a421aa0631 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 10 17:47:43 2019 -0400 Don't pass a NULL into a %s when logging client auth file load failure Fortunately, in 0.3.5.1-alpha we improved logging for various failure cases involved with onion service client auth. Unfortunately, for this one, we freed the file right before logging its name. Fortunately, tor_free() sets its pointer to NULL, so we didn't have a use-after-free bug. Unfortunately, passing NULL to %s is not defined. Fortunately, GCC 9.1.1 caught the issue! Unfortunately, nobody has actually tried building Tor with GCC 9.1.1 before. Or if they had, they didn't report the warning. Fixes bug 30475; bugfix on 0.3.5.1-alpha. --- changes/bug30475 | 4 ++++ src/feature/hs/hs_service.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug30475 b/changes/bug30475 new file mode 100644 index 000000000..839597b88 --- /dev/null +++ b/changes/bug30475 @@ -0,0 +1,4 @@ + o Minor bugfixes (): + - Avoid a GCC 9.1.1 warning (and possible crash depending on libc + implemenation) when failing to load a hidden service client authorization + file. Fixes bug 30475; bugfix on 0.3.5.1-alpha. diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 828ca1da4..402929036 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -1259,16 +1259,16 @@ load_client_keys(hs_service_t *service) client_key_file_path = hs_path_from_filename(client_keys_dir_path, filename); client_key_str = read_file_to_str(client_key_file_path, 0, NULL); - /* Free immediately after using it. */ - tor_free(client_key_file_path); /* If we cannot read the file, continue with the next file. */ if (!client_key_str) { log_warn(LD_REND, "Client authorization file %s can't be read. " "Corrupted or verify permission? Ignoring.", client_key_file_path); + tor_free(client_key_file_path); continue; } + tor_free(client_key_file_path); client = parse_authorized_client(client_key_str); /* Wipe and free immediately after using it. */

1 0