denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not clone hashes of initial IKE messages when storing them in the hash table.

Browse Source
This commit is contained in:
Tobias Brunner
2012-03-20 17:31:40 +01:00
parent 20e3d5ea00
commit 4b2f428f40
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa_manager.c
+6 -7
View File
@@ -901,7 +901,8 @@ static void remove_connected_peers(private_ike_sa_manager_t *this, entry_t *entr
/** /**
* Check if we already have created an IKE_SA based on the initial IKE message * Check if we already have created an IKE_SA based on the initial IKE message
* with the given hash. If not the hash is stored. * with the given hash.
* If not the hash is stored, the hash data is not(!) cloned.
* *
* @returns TRUE if the message with the given hash was seen before * @returns TRUE if the message with the given hash was seen before
*/ */
@@ -912,6 +913,7 @@ static bool check_and_put_init_hash(private_ike_sa_manager_t *this,
linked_list_t *list; linked_list_t *list;
u_int row, segment; u_int row, segment;
mutex_t *mutex; mutex_t *mutex;
chunk_t *chunk;
row = chunk_hash(init_hash) & this->table_mask; row = chunk_hash(init_hash) & this->table_mask;
segment = row & this->segment_mask; segment = row & this->segment_mask;
@@ -934,13 +936,11 @@ static bool check_and_put_init_hash(private_ike_sa_manager_t *this,
list = this->init_hashes_table[row] = linked_list_create(); list = this->init_hashes_table[row] = linked_list_create();
} }
INIT(clone, INIT(chunk,
.len = init_hash.len, .len = init_hash.len,
.ptr = malloc(init_hash.len), .ptr = init_hash.ptr,
); );
memcpy(clone->ptr, init_hash.ptr, clone->len); list->insert_last(list, chunk);
list->insert_last(list, clone);
mutex->unlock(mutex); mutex->unlock(mutex);
return FALSE; return FALSE;
} }
@@ -970,7 +970,6 @@ static void remove_init_hash(private_ike_sa_manager_t *this, chunk_t init_hash)
if (chunk_equals_ptr(current, &init_hash)) if (chunk_equals_ptr(current, &init_hash))
{ {
list->remove_at(list, enumerator); list->remove_at(list, enumerator);
chunk_free(current);
free(current); free(current);
break; break;
} }