Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix IPv6 regression: Segfault in initiate_socket_connection (socketio_berkeley) when DNS resolution fails (gh#636) #637

Merged
merged 3 commits into from
Aug 2, 2023
Merged

Fix IPv6 regression: Segfault in initiate_socket_connection (socketio_berkeley) when DNS resolution fails (gh#636) #637

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df1d9d0
Fix for Segfault in initiate_socket_connection (socketio_berkeley) wh…
ewertons Jul 31, 2023
03f6e65
Add missing else statement
ewertons Jul 31, 2023
d460bb7
Adding check to assert hostname is not NULL
RLeclair Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 41 additions & 34 deletions adapters/socketio_berkeley.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,48 +520,55 @@ static int initiate_socket_connection(SOCKET_IO_INSTANCE* socket_io_instance)
}
else
{
size_t hostname_len = strlen(socket_io_instance->hostname);
if (hostname_len + 1 > sizeof(addrInfoUn.sun_path))
if (socket_io_instance->hostname != NULL)
{
LogError("Hostname %s is too long for a unix socket (max len = %lu)", socket_io_instance->hostname, (unsigned long)sizeof(addrInfoUn.sun_path));
result = MU_FAILURE;
size_t hostname_len = strlen(socket_io_instance->hostname);
if (hostname_len + 1 > sizeof(addrInfoUn.sun_path))
{
LogError("Hostname %s is too long for a unix socket (max len = %lu)", socket_io_instance->hostname, (unsigned long)sizeof(addrInfoUn.sun_path));
result = MU_FAILURE;
}
else
{
memset(&addrInfoUn, 0, sizeof(addrInfoUn));
addrInfoUn.sun_family = AF_UNIX;
// No need to add NULL terminator due to the above memset
(void)memcpy(addrInfoUn.sun_path, socket_io_instance->hostname, hostname_len);
result = 0;
}
}
else
{
memset(&addrInfoUn, 0, sizeof(addrInfoUn));
addrInfoUn.sun_family = AF_UNIX;
// No need to add NULL terminator due to the above memset
(void)memcpy(addrInfoUn.sun_path, socket_io_instance->hostname, hostname_len);
result = 0;
LogError("Hostname is NULL");
result = MU_FAILURE;
}
RLeclair marked this conversation as resolved.
Show resolved Hide resolved
}

if (socket_io_instance->address_type == ADDRESS_TYPE_IP)
{
socket_io_instance->socket = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
}
else
{
socket_io_instance->socket = socket(AF_UNIX, SOCK_STREAM, 0);
}

if (socket_io_instance->socket < SOCKET_SUCCESS)
{
LogError("Failure: socket create failure %d.", socket_io_instance->socket);
result = MU_FAILURE;
}
#ifndef __APPLE__
else if (socket_io_instance->target_mac_address != NULL &&
set_target_network_interface(socket_io_instance->socket, socket_io_instance->target_mac_address) != 0)
{
LogError("Failure: failed selecting target network interface (MACADDR=%s).", socket_io_instance->target_mac_address);
result = MU_FAILURE;
}
#endif //__APPLE__

if(result == 0)
CIPop marked this conversation as resolved.
Show resolved Hide resolved
ewertons marked this conversation as resolved.
Show resolved Hide resolved
{
if ((-1 == (flags = fcntl(socket_io_instance->socket, F_GETFL, 0))) ||
if (socket_io_instance->address_type == ADDRESS_TYPE_IP)
{
socket_io_instance->socket = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
}
else
{
socket_io_instance->socket = socket(AF_UNIX, SOCK_STREAM, 0);
}

if (socket_io_instance->socket < SOCKET_SUCCESS)
{
LogError("Failure: socket create failure %d.", socket_io_instance->socket);
result = MU_FAILURE;
}
#ifndef __APPLE__
else if (socket_io_instance->target_mac_address != NULL &&
set_target_network_interface(socket_io_instance->socket, socket_io_instance->target_mac_address) != 0)
{
LogError("Failure: failed selecting target network interface (MACADDR=%s).", socket_io_instance->target_mac_address);
result = MU_FAILURE;
}
#endif //__APPLE__
else if ((-1 == (flags = fcntl(socket_io_instance->socket, F_GETFL, 0))) ||
(fcntl(socket_io_instance->socket, F_SETFL, flags | O_NONBLOCK) == -1))
{
LogError("Failure: fcntl failure.");
CIPop marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -583,7 +590,7 @@ static int initiate_socket_connection(SOCKET_IO_INSTANCE* socket_io_instance)
LogError("Failure: connect failure %d.", errno);
result = MU_FAILURE;
}
else
else // result == 0 || errno == EINPROGRESS
{
// Async connect will return -1.
result = 0;
Expand Down