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

avoid too many alloca()s in netlink send, problematic on MIPS

Browse Source
This commit is contained in:
Martin Willi
2008-08-21 07:55:16 +00:00
parent bdbf3c49fc
commit 02e907fe66
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/kernel/kernel_interface.c
+7 -2
View File
@@ -1104,12 +1104,14 @@ static status_t netlink_send(private_kernel_interface_t *this,
} }
DBG1(DBG_KNL, "error reading from netlink socket: %s", strerror(errno)); DBG1(DBG_KNL, "error reading from netlink socket: %s", strerror(errno));
pthread_mutex_unlock(&this->nl_mutex); pthread_mutex_unlock(&this->nl_mutex);
free(result.ptr);
return FAILED; return FAILED;
} }
if (!NLMSG_OK(msg, len)) if (!NLMSG_OK(msg, len))
{ {
DBG1(DBG_KNL, "received corrupted netlink message"); DBG1(DBG_KNL, "received corrupted netlink message");
pthread_mutex_unlock(&this->nl_mutex); pthread_mutex_unlock(&this->nl_mutex);
free(result.ptr);
return FAILED; return FAILED;
} }
if (msg->nlmsg_seq != this->seq) if (msg->nlmsg_seq != this->seq)
@@ -1120,11 +1122,14 @@ static status_t netlink_send(private_kernel_interface_t *this,
continue; continue;
} }
pthread_mutex_unlock(&this->nl_mutex); pthread_mutex_unlock(&this->nl_mutex);
free(result.ptr);
return FAILED; return FAILED;
} }
tmp.len = len; tmp.len = len;
result = chunk_cata("cc", result, tmp); result.ptr = realloc(result.ptr, result.len + tmp.len);
memcpy(result.ptr + result.len, tmp.ptr, tmp.len);
result.len += tmp.len;
/* NLM_F_MULTI flag does not seem to be set correctly, we use sequence /* NLM_F_MULTI flag does not seem to be set correctly, we use sequence
* numbers to detect multi header messages */ * numbers to detect multi header messages */
@@ -1140,7 +1145,7 @@ static status_t netlink_send(private_kernel_interface_t *this,
} }
*out_len = result.len; *out_len = result.len;
*out = (struct nlmsghdr*)clalloc(result.ptr, result.len); *out = (struct nlmsghdr*)result.ptr;
pthread_mutex_unlock(&this->nl_mutex); pthread_mutex_unlock(&this->nl_mutex);