Skip to content

[2.0-stable] Cherry-pick: Fix AppInstance process handle validation (#6733) #6735

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

Merged
Scott Jones (Scottj1s) merged 6 commits into from
Sep 10, 2026
Merged

[2.0-stable] Cherry-pick: Fix AppInstance process handle validation (#6733) #6735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
040857c
Fix AppInstance process handle validation
Scottj1s Sep 1, 2026
2693562
Potential fix for pull request finding
Scottj1s Sep 1, 2026
f545821
Normalize AppInstance line endings
Scottj1s Sep 1, 2026
96921f2
Contain GetInstances process handle fix
Scottj1s Sep 1, 2026
507d2f9
Keep GetInstances containment local
Scottj1s Sep 1, 2026
8d05fc3
Fix AppInstance access mask narrowing conversion
Scottj1s Sep 9, 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
40 changes: 35 additions & 5 deletions dev/AppLifecycle/AppInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
#include "PushNotificationManager.h"
#include "AppNotificationManager.h"

#include <FrameworkUdk/Containment.h>

// 63876312: Prevent AppInstance::GetInstances from registering an invalid process handle.
#define WINAPPSDK_CHANGEID_63876312 63876312

using namespace winrt;
using namespace winrt::Windows::Foundation;
using namespace winrt::Windows::Foundation::Collections;
Expand Down Expand Up @@ -96,7 +101,13 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
return { kind, data };
}

AppInstance::AppInstance(uint32_t processId)
AppInstance::AppInstance() :
AppInstance(GetCurrentProcessId(), {})
{
}

AppInstance::AppInstance(uint32_t processId, wil::unique_handle processHandle) :
m_instanceHandle(std::move(processHandle))
{
m_processId = processId;
m_isCurrent = (GetCurrentProcessId() == processId);
Expand Down Expand Up @@ -146,7 +157,15 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
}
else
{
m_instanceHandle.reset(OpenProcess(SYNCHRONIZE, FALSE, processId));
if (!m_instanceHandle)
{
m_instanceHandle.reset(OpenProcess(SYNCHRONIZE, FALSE, processId));
}

if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_63876312>())
{
THROW_HR_IF(E_INVALIDARG, !m_instanceHandle);
}

// Create a monitor thread to handle cleaning up this instance if the backing process terminates.
auto onInstanceTerminated = [](_In_ void* context, _In_ BOOLEAN /*reason*/) -> void
Expand Down Expand Up @@ -277,7 +296,7 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
{
auto initInstance = []
{
s_current = winrt::make_self<AppInstance>(GetCurrentProcessId());
s_current = winrt::make_self<AppInstance>();
};

wil::init_once(s_initOnce, initInstance);
Expand All @@ -290,6 +309,9 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
// Force the singleton init.
GetCurrent();

const bool processHandleFixEnabled{
WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_63876312>() };

IVector<Microsoft::Windows::AppLifecycle::AppInstance> instances{ winrt::single_threaded_vector<Microsoft::Windows::AppLifecycle::AppInstance>() };

// Grab the list of processes while under the lock, and then drop it since we'll be calling out to other code.
Expand Down Expand Up @@ -318,10 +340,18 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
}
else
{
wil::unique_handle process(::OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, pid));
const DWORD desiredAccess{
processHandleFixEnabled ? static_cast<DWORD>(SYNCHRONIZE) :
static_cast<DWORD>(PROCESS_QUERY_LIMITED_INFORMATION) };
wil::unique_handle process(::OpenProcess(desiredAccess, FALSE, pid));
if (process != nullptr)
{
instances.Append(make<AppInstance>(pid));
wil::unique_handle instanceHandle;
if (processHandleFixEnabled)
{
instanceHandle = std::move(process);
}
instances.Append(make<AppInstance>(pid, std::move(instanceHandle)));
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion dev/AppLifecycle/AppInstance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
struct AppInstance : AppInstanceT<AppInstance>
{
// No interface public methods.
AppInstance(uint32_t processId);
AppInstance();
AppInstance(uint32_t processId, wil::unique_handle processHandle);
~AppInstance()
{
if (m_terminationWatcherWaitHandle)
Expand Down