diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-18 09:40:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-18 09:40:40 -0400 |
| commit | 23c4592ee98df59ccfe1a31bf714809caa78ca98 (patch) | |
| tree | f13c00b19c78ba18000a13edf58d9d7ebbcfc156 | |
| parent | 49b5ad6b75f5f9e223a92033d9b3930e3e1d132f (diff) | |
| parent | 139bda4fe48e0cdba68c9e802be983fb971e55be (diff) | |
| download | tor-23c4592ee98df59ccfe1a31bf714809caa78ca98.tar.gz tor-23c4592ee98df59ccfe1a31bf714809caa78ca98.zip | |
Merge branch 'maint-0.3.0' into maint-0.3.1
| -rw-r--r-- | changes/trove-2017-008 | 5 | ||||
| -rw-r--r-- | src/or/rendservice.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/trove-2017-008 b/changes/trove-2017-008 new file mode 100644 index 0000000000..4b9c5b0a12 --- /dev/null +++ b/changes/trove-2017-008 @@ -0,0 +1,5 @@ + o Major bugfixes (security, hidden services, loggging): + - Fix a bug where we could log uninitialized stack when a certain + hidden service error occurred while SafeLogging was disabled. + Fixes bug #23490; bugfix on 0.2.7.2-alpha. + This is also tracked as TROVE-2017-008 and CVE-2017-0380. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 2236fcca77..2d3a15ab23 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3446,6 +3446,8 @@ rend_service_intro_established(origin_circuit_t *circuit, (unsigned)circuit->base_.n_circ_id); goto err; } + base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32 + 1, + rend_pk_digest, REND_SERVICE_ID_LEN); /* We've just successfully established a intro circuit to one of our * introduction point, account for it. */ intro = find_intro_point(circuit); @@ -3462,8 +3464,6 @@ rend_service_intro_established(origin_circuit_t *circuit, service->desc_is_dirty = time(NULL); circuit_change_purpose(TO_CIRCUIT(circuit), CIRCUIT_PURPOSE_S_INTRO); - base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32 + 1, - rend_pk_digest, REND_SERVICE_ID_LEN); log_info(LD_REND, "Received INTRO_ESTABLISHED cell on circuit %u for service %s", (unsigned)circuit->base_.n_circ_id, serviceid); |