sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-11-22 00:01:45 -05:00
Code Issues Projects Releases Wiki Activity

kernel-pfroute: Fix kernel response handling

Browse Source 
The condvar is signaled for every handled message received from the
kernel not only for replies (this changed with 2a2d7a4dc8).  This may
cause segfaults because this->reply is not set when the waiting thread is
woken due to an IP address change.

Since this->reply is only set when it is actually the expected reply (and
only one request is sent at a time, thanks to c9a323c1d9) we only have
to make sure the reply is there (and clear it once we handled it).

Using separate condvars could also be an option in the future.
This commit is contained in:
Tobias Brunner 2014-08-19 11:08:33 +02:00
parent b04f40406d
commit 52ba4f6bf4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
View File

@ -1518,8 +1518,7 @@ retry:
{ /* timed out? */
break;
}
if (this->reply->rtm_msglen < sizeof(*this->reply) ||
msg.hdr.rtm_seq != this->reply->rtm_seq)
if (!this->reply)
{
continue;
}
@ -1559,6 +1558,8 @@ retry:
{
failed = TRUE;
}
free(this->reply);
this->reply = NULL;
/* signal completion of query to a waiting thread */
this->waiting_seq = 0;
this->condvar->signal(this->condvar);