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

tnc-pdp: Fix lock type when adding/replacing a connection

Browse Source 
The entry was updated and the previous EAP method and IKE SA destroyed
under a read lock, which is not safe (there could be threads in
get_state(), or even some that called it before and now still hold
that read lock while interacting with the EAP method).

Fixes: 37884ab10f ("Add locking to TNC-PDP connections")
This commit is contained in:
Tobias Brunner
2026-07-23 10:26:08 +02:00
parent dc8fa5fea5
commit 5e51fc7902
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c
+2 -4
View File
@@ -174,7 +174,7 @@ METHOD(tnc_pdp_connections_t, add, void,
ike_sa_id->destroy(ike_sa_id); ike_sa_id->destroy(ike_sa_id);
ike_sa->set_other_id(ike_sa, peer); ike_sa->set_other_id(ike_sa, peer);
this->lock->read_lock(this->lock); this->lock->write_lock(this->lock);
enumerator = this->list->create_enumerator(this->list); enumerator = this->list->create_enumerator(this->list);
while (enumerator->enumerate(enumerator, &entry)) while (enumerator->enumerate(enumerator, &entry))
{ {
@@ -191,7 +191,6 @@ METHOD(tnc_pdp_connections_t, add, void,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
if (!found) if (!found)
{ {
@@ -202,10 +201,9 @@ METHOD(tnc_pdp_connections_t, add, void,
.ike_sa = ike_sa, .ike_sa = ike_sa,
.created = time_monotonic(NULL), .created = time_monotonic(NULL),
); );
this->lock->write_lock(this->lock);
this->list->insert_last(this->list, entry); this->list->insert_last(this->list, entry);
this->lock->unlock(this->lock);
} }
this->lock->unlock(this->lock);
/* schedule timeout checking */ /* schedule timeout checking */
lib->scheduler->schedule_job_ms(lib->scheduler, lib->scheduler->schedule_job_ms(lib->scheduler,