Skip to content

Fix relay loop to track closed states independently for left and righ… #41342

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

Open
Eamon (Eamon2009) wants to merge 12 commits into
base: master
Choose a base branch
from
+20 −19
Open

Fix relay loop to track closed states independently for left and righ… #41342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d83705f
Refactor localhost.cpp to improve socket handling
Eamon2009 Aug 12, 2026
a188f1f
Refactor localhost.cpp to include necessary headersFix localhost rela…
Eamon2009 Aug 12, 2026
7d25594
Refactor localhost.cpp for socket relay management
Eamon2009 Aug 12, 2026
01aff2d
Fix localhost relay half-close and ioctl interface name handling
Eamon2009 Aug 13, 2026
00922ad
Fix relay loop to track closed states independently for left and righ…
Eamon2009 Aug 13, 2026
3e0ba44
Fix infinite loop in RunLocalHostRelay on peer disconnect
Eamon2009 Aug 13, 2026
3adbfa3
Merge branch 'master' into patch-2
Eamon2009 Aug 13, 2026
ca75732
Fix relay loop exit condition and add explicit null-termination for i…
Eamon2009 Aug 13, 2026
b0821cd
Fix relay loop hang on peer disconnect and add interface name null-te…
Eamon2009 Aug 13, 2026
dcd54b2
Merge remote-tracking branch 'origin/patch-2'
Eamon2009 Aug 14, 2026
fe58627
Merge branch 'master' into patch-4
Eamon2009 Aug 14, 2026
ba1381d
Fixes: localhost relay disconnect regression
Eamon2009 Aug 14, 2026
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
27 changes: 13 additions & 14 deletions src/linux/init/localhost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,31 +314,29 @@ void RunLocalHostRelay(sockaddr_vm hvSocketAddress, int listenSocket)

for (;;)
{
if ((pollDescriptors[0].fd == -1) || (pollDescriptors[1].fd == -1))
if ((pollDescriptors[0].fd == -1) && (pollDescriptors[1].fd == -1))
{
return;
}

THROW_LAST_ERROR_IF(poll(pollDescriptors, COUNT_OF(pollDescriptors), -1) < 0);

bytesRead = 0;
for (int Index = 0; Index < COUNT_OF(pollDescriptors); Index += 1)
{
if (pollDescriptors[Index].revents & POLLIN)
if (pollDescriptors[Index].revents & (POLLIN | POLLERR | POLLHUP))
{
bytesRead = UtilReadBuffer(pollDescriptors[Index].fd, buffer);
if (bytesRead == 0)
if (bytesRead > 0)
{
pollDescriptors[Index].fd = -1;
shutdown(outFd[Index], SHUT_WR);
}
else if (bytesRead < 0)
{
return;
if (UtilWriteBuffer(outFd[Index], buffer.data(), bytesRead) < 0)
{
return;
}
}
else if (UtilWriteBuffer(outFd[Index], buffer.data(), bytesRead) < 0)
else
{
return;
pollDescriptors[Index].fd = -1;
shutdown(outFd[Index], SHUT_WR);
}
}
}
Expand Down Expand Up @@ -516,7 +514,8 @@ int RunPortTracker(int Argc, char** Argv)
}

auto& ifRequest = *reinterpret_cast<ifreq*>(ifreqMemory->data());
memcpy(request.InterfaceName, ifRequest.ifr_ifrn.ifrn_name, sizeof(request.InterfaceName));
memcpy(request.InterfaceName, ifRequest.ifr_ifrn.ifrn_name, sizeof(request.InterfaceName) - 1);
request.InterfaceName[sizeof(request.InterfaceName) - 1] = '\0';

@OneBlue Blue (OneBlue) Aug 18, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: This can be skipped now that we never write the last byte

request.InterfaceUp = ifRequest.ifr_ifru.ifru_flags & IFF_UP;
const auto& reply = hvSocketChannel->Transaction(request);

Expand All @@ -533,4 +532,4 @@ int RunPortTracker(int Argc, char** Argv)
}

return 1;
}
}
12 changes: 7 additions & 5 deletions src/windows/common/relay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ void wsl::windows::common::relay::BidirectionalRelay(_In_ HANDLE LeftHandle, _In

bool leftReadPending = false;
bool rightReadPending = false;
bool leftReadClosed = (LeftHandle == nullptr);
bool rightReadClosed = (RightHandle == nullptr);
auto cancelReads = wil::scope_exit_log(WI_DIAGNOSTICS_INFO, [&] {
DWORD bytes;
if (leftReadPending)
Expand All @@ -316,13 +318,13 @@ void wsl::windows::common::relay::BidirectionalRelay(_In_ HANDLE LeftHandle, _In
const HANDLE waitObjects[] = {leftOverlapped.hEvent, rightOverlapped.hEvent};
for (;;)
{
if ((LeftHandle == nullptr) || (RightHandle == nullptr))
if (leftReadClosed && rightReadClosed)
{
break;
}

DWORD leftBytesRead = 0;
if (!leftReadPending && LeftHandle)
if (!leftReadPending && !leftReadClosed && LeftHandle)
{
if (!ReadFile(LeftHandle, leftReadSpan.data(), gsl::narrow_cast<DWORD>(leftReadSpan.size()), &leftBytesRead, &leftOverlapped))
{
Expand All @@ -333,7 +335,7 @@ void wsl::windows::common::relay::BidirectionalRelay(_In_ HANDLE LeftHandle, _In
}

DWORD rightBytesRead = 0;
if (!rightReadPending && RightHandle)
if (!rightReadPending && !rightReadClosed && RightHandle)
{
if (!ReadFile(RightHandle, rightReadSpan.data(), gsl::narrow_cast<DWORD>(rightReadSpan.size()), &rightBytesRead, &rightOverlapped))
{
Expand All @@ -352,7 +354,7 @@ void wsl::windows::common::relay::BidirectionalRelay(_In_ HANDLE LeftHandle, _In
leftReadPending = false;
if (leftBytesRead == 0)
{
LeftHandle = nullptr;
leftReadClosed = true;
if (WI_IsFlagSet(Flags, RelayFlags::RightIsSocket))
{
LOG_LAST_ERROR_IF(shutdown(reinterpret_cast<SOCKET>(RightHandle), SD_SEND) == SOCKET_ERROR);
Expand Down Expand Up @@ -380,7 +382,7 @@ void wsl::windows::common::relay::BidirectionalRelay(_In_ HANDLE LeftHandle, _In
rightReadPending = false;
if (rightBytesRead == 0)
{
RightHandle = nullptr;
rightReadClosed = true;
if (WI_IsFlagSet(Flags, RelayFlags::LeftIsSocket))
{
LOG_LAST_ERROR_IF(shutdown(reinterpret_cast<SOCKET>(LeftHandle), SD_SEND) == SOCKET_ERROR);
Expand Down