diff options
author | Thomas Egerer <thomas.egerer@secunet.com> | 2011-12-14 18:17:49 +0100 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2011-12-14 18:17:49 +0100 |
commit | 64c4fd0a60abeb4ea46b5df111f30c3aec0557d6 (patch) | |
tree | 85b1a91baf9678a03ff3933926eee7726a844d5b /src | |
parent | b768d6a4a58b8d1d190049b5fc7ac6839bb867e8 (diff) | |
download | strongswan-64c4fd0a60abeb4ea46b5df111f30c3aec0557d6.tar.bz2 strongswan-64c4fd0a60abeb4ea46b5df111f30c3aec0557d6.tar.xz |
Always unlock mutex for installed policies in kernel-netlink plugin.
Diffstat (limited to 'src')
-rw-r--r-- | src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c index e51aeaf65..7a2df236f 100644 --- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c +++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c @@ -1993,7 +1993,8 @@ METHOD(kernel_ipsec_t, flush_sas, status_t, /** * Add or update a policy in the kernel. * - * Note: The mutex has to be locked when entering this function. + * Note: The mutex has to be locked when entering this function + * and is unlocked here in any case. */ static status_t add_policy_internal(private_kernel_netlink_ipsec_t *this, policy_entry_t *policy, policy_sa_t *mapping, bool update) @@ -2063,6 +2064,7 @@ static status_t add_policy_internal(private_kernel_netlink_ipsec_t *this, hdr->nlmsg_len += RTA_ALIGN(RTA_LENGTH(sizeof(struct xfrm_user_tmpl))); if (hdr->nlmsg_len > sizeof(request)) { + this->mutex->unlock(this->mutex); return FAILED; } @@ -2099,6 +2101,7 @@ static status_t add_policy_internal(private_kernel_netlink_ipsec_t *this, hdr->nlmsg_len += RTA_ALIGN(rthdr->rta_len); if (hdr->nlmsg_len > sizeof(request)) { + this->mutex->unlock(this->mutex); return FAILED; } @@ -2547,6 +2550,7 @@ METHOD(kernel_ipsec_t, del_policy, status_t, hdr->nlmsg_len += RTA_ALIGN(rthdr->rta_len); if (hdr->nlmsg_len > sizeof(request)) { + this->mutex->unlock(this->mutex); return FAILED; } |