Skip to content

Fix: delay plan9 registration after OOBE #40977

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
chemwolf6922 wants to merge 2 commits into
base: master
Choose a base branch
from
+33 −0
Open

Fix: delay plan9 registration after OOBE #40977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2b9cac
delay plan 9 registration after OOBE
chemwolf6922 Jul 2, 2026
d22e508
apply fix to wsl1
chemwolf6922 Jul 3, 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
8 changes: 8 additions & 0 deletions src/windows/service/exe/LxssInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,12 @@ void LxssInstance::Stop()

void LxssInstance::RegisterPlan9ConnectionTarget(_In_ HANDLE userToken)
{
// m_defaultUid is not set before OOBE is complete.
if (m_configuration.RunOOBE)
{
return;
}

const auto path = m_configuration.BasePath / LXSS_PLAN9_UNIX_SOCKET;
using unique_unicode_string = wil::unique_struct<UNICODE_STRING, decltype(RtlFreeUnicodeString), RtlFreeUnicodeString>;
unique_unicode_string socketPath;
Expand Down Expand Up @@ -577,6 +583,8 @@ wil::unique_handle LxssInstance::_CreateLxProcess(
registration.Write(wsl::windows::service::Property::DefaultUid, static_cast<int>(OobeResult->DefaultUid));
m_defaultUid = static_cast<int>(OobeResult->DefaultUid);
}

RegisterPlan9ConnectionTarget(m_userToken.get());
}
}
CATCH_LOG()
Expand Down
8 changes: 8 additions & 0 deletions src/windows/service/exe/WslCoreInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,8 @@ void WslCoreInstance::ReadOOBEResult(wil::unique_socket&& Socket, wsl::windows::
registration.Write(wsl::windows::service::Property::DefaultUid, static_cast<int>(oobeResult->DefaultUid));
m_defaultUid = static_cast<int>(oobeResult->DefaultUid);
}

RegisterPlan9ConnectionTarget(m_userToken.get());
Comment thread
chemwolf6922 marked this conversation as resolved.
}
}

Expand Down Expand Up @@ -530,6 +532,12 @@ void WslCoreInstance::Stop()

void WslCoreInstance::RegisterPlan9ConnectionTarget(_In_ HANDLE userToken)
{
// m_defaultUid is not set before OOBE is complete.
if (m_configuration.RunOOBE)
{
return;
}
Comment thread
chemwolf6922 marked this conversation as resolved.

// If Plan 9 is running, add a connection target to the P9Rdr driver.
if (m_plan9Port != LX_INIT_UTILITY_VM_INVALID_PORT)
{
Expand Down
17 changes: 17 additions & 0 deletions test/windows/UnitTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4441,12 +4441,29 @@ VERSION_ID="Invalid|Format"

TerminateDistribution();

// The distro's files should not be exposed via \\wsl.localhost before OOBE is completed.
const std::wstring testFilePathLinux = L"/tmp/oobe_file_test";
const std::wstring testFilePathWindows = L"\\\\wsl.localhost\\" LXSS_DISTRO_NAME_TEST_L L"\\tmp\\oobe_file_test";
{
const wil::unique_hfile file(CreateFile(
testFilePathWindows.c_str(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr));
VERIFY_IS_FALSE(file.is_valid());
}

validateOutput(nullptr, L"OOBE\n");
VERIFY_ARE_EQUAL(runOOBE.Get(), 0);

// Validate that DefaultUid was set
validateOutput(L"id -u", L"1010\n");
VERIFY_ARE_EQUAL(defaultUid.Get(), 1010);

// The distro's files should now be exposed. And new file should be created with the correct uid.
{
const wil::unique_hfile file(CreateFile(
testFilePathWindows.c_str(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr));
VERIFY_IS_TRUE(file.is_valid());
validateOutput(std::format(L"stat -c %u {}", testFilePathLinux).c_str(), L"1010\n");
}
}

// Verify that the default UID isn't changed if it's not present in wsl-distribution.conf.
Expand Down