sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

This commit is contained in:
Nick Mathewson 2015-05-13 11:05:50 -04:00
parent 407441c652 614d9bc967
commit dad3522712
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug15823 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (hidden service):
- Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells
on a client authorized hidden service. Fixes bug 15823; bugfix
on 0.2.1.6-alpha.

18
src/or/rendservice.c
View File

@ -1098,11 +1098,13 @@ rend_service_requires_uptime(rend_service_t *service)
return 0;
}
/** Check client authorization of a given <b>descriptor_cookie</b> for
* <b>service</b>. Return 1 for success and 0 for failure. */
/** Check client authorization of a given <b>descriptor_cookie</b> of
* length <b>cookie_len</b> for <b>service</b>. Return 1 for success
* and 0 for failure. */
static int
rend_check_authorization(rend_service_t *service,
const char *descriptor_cookie)
const char *descriptor_cookie,
size_t cookie_len)
{
rend_authorized_client_t *auth_client = NULL;
tor_assert(service);
@ -1113,6 +1115,13 @@ rend_check_authorization(rend_service_t *service,
return 0;
}
if (cookie_len != REND_DESC_COOKIE_LEN) {
log_info(LD_REND, "Descriptor cookie is %lu bytes, but we expected "
"%lu bytes. Dropping cell.",
(unsigned long)cookie_len, (unsigned long)REND_DESC_COOKIE_LEN);
return 0;
}
/* Look up client authorization by descriptor cookie. */
SMARTLIST_FOREACH(service->clients, rend_authorized_client_t *, client, {
if (tor_memeq(client->descriptor_cookie, descriptor_cookie,
@ -1459,7 +1468,8 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
if (service->clients) {
if (parsed_req->version == 3 && parsed_req->u.v3.auth_len > 0) {
if (rend_check_authorization(service,
(const char*)parsed_req->u.v3.auth_data)) {
(const char*)parsed_req->u.v3.auth_data,
parsed_req->u.v3.auth_len)) {
log_info(LD_REND, "Authorization data in INTRODUCE2 cell are valid.");
} else {
log_info(LD_REND, "The authorization data that are contained in "