Commit 90b840af authored by David Goulet's avatar David Goulet 🐼
Browse files

control: Fix NULL pointer access in HS desc event 



This was introduced 90562fc2 adding a code
path where we pass a NULL pointer for the HSDir fingerprint to the control
event subsystem. The HS desc failed function wasn't handling properly that
pointer for a NULL value.

Two unit tests are also added in this commit to make sure we handle properly
the case of a NULL hsdir fingerprint and a NULL content as well.

Fixes #22138

Signed-off-by: David Goulet's avatarDavid Goulet <dgoulet@torproject.org>
parent e0b1fd4d

src/or/control.c

+5 −0
Original line number Diff line number Diff line
@@ -6924,6 +6924,11 @@ get_desc_id_from_query(const rend_data_t *rend_data, const char *hsdir_fp) 
    goto end;

  }



  /* Without a directory fingerprint at this stage, we can't do much. */

  if (hsdir_fp == NULL) {

     goto end;

  }



  /* OK, we have an onion address so now let's find which descriptor ID

   * is the one associated with the HSDir fingerprint. */

  for (replica = 0; replica < REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS;

src/test/test_hs.c

+22 −1
Original line number Diff line number Diff line
@@ -210,8 +210,29 @@ test_hs_desc_event(void *arg) 
  tt_str_op(received_msg,OP_EQ, expected_msg);

  tor_free(received_msg);



  /* test valid content. */

  /* test no HSDir fingerprint type */

  rend_query.auth_type = REND_NO_AUTH;

  control_event_hs_descriptor_failed(&rend_query.base_, NULL,

                                     "QUERY_NO_HSDIR");

  expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" NO_AUTH " \

                 "UNKNOWN REASON=QUERY_NO_HSDIR\r\n";

  tt_assert(received_msg);

  tt_str_op(received_msg,OP_EQ, expected_msg);

  tor_free(received_msg);



  /* Test invalid content with no HSDir fingerprint. */

  char *exp_msg;

  control_event_hs_descriptor_content(rend_query.onion_address,

                                      STR_HS_CONTENT_DESC_ID, NULL, NULL);

  tor_asprintf(&exp_msg, "650+HS_DESC_CONTENT " STR_HS_ADDR " "\

               STR_HS_CONTENT_DESC_ID " UNKNOWN" \

               "\r\n\r\n.\r\n650 OK\r\n");

  tt_assert(received_msg);

  tt_str_op(received_msg, OP_EQ, exp_msg);

  tor_free(received_msg);

  tor_free(exp_msg);



  /* test valid content. */

  control_event_hs_descriptor_content(rend_query.onion_address,

                                      STR_HS_CONTENT_DESC_ID, HSDIR_EXIST_ID,

                                      hs_desc_content);