i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net_socket: check underflow condition happening on x86_64.

Browse Source 
* move the test for the availability of the add_anillary_data function in the
protocol out of the loop, as suggested by Axel.
* fix #12737.
This commit is contained in:
Jérôme Duval
2016-04-29 17:34:48 +02:00
parent 29fa68b21c
commit 571a4030ea
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/stack/net_socket.cpp
+10 -5
View File
@@ -221,18 +221,23 @@ add_ancillary_data(net_socket* socket, ancillary_data_container* container,
{ {
cmsghdr* header = (cmsghdr*)data; cmsghdr* header = (cmsghdr*)data;
while (dataLen > 0) { if (dataLen == 0)
if (header->cmsg_len < sizeof(cmsghdr) || header->cmsg_len > dataLen) return B_OK;
return B_BAD_VALUE;
if (socket->first_info->add_ancillary_data == NULL) if (socket->first_info->add_ancillary_data == NULL)
return B_NOT_SUPPORTED; return B_NOT_SUPPORTED;
while (true) {
if (header->cmsg_len < CMSG_LEN(0) || header->cmsg_len > dataLen)
return B_BAD_VALUE;
status_t status = socket->first_info->add_ancillary_data( status_t status = socket->first_info->add_ancillary_data(
socket->first_protocol, container, header); socket->first_protocol, container, header);
if (status != B_OK) if (status != B_OK)
return status; return status;
if (dataLen <= _ALIGN(header->cmsg_len))
break;
dataLen -= _ALIGN(header->cmsg_len); dataLen -= _ALIGN(header->cmsg_len);
header = (cmsghdr*)((uint8*)header + _ALIGN(header->cmsg_len)); header = (cmsghdr*)((uint8*)header + _ALIGN(header->cmsg_len));
} }