corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1964668: Stop troubleshoot/safe mode from blocking win32k lockdown. r=handyman

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D248084
This commit is contained in:
Bob Owen
2025-05-13 09:49:58 +00:00
committed by bobowencode@gmail.com
parent 2074f9312a
commit aee2267d7f
4 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
security/sandbox/common/SandboxSettings.cpp
View File

@@ -57,9 +57,6 @@ const char* ContentWin32kLockdownStateToString(
case nsIXULRuntime::ContentWin32kLockdownState::DisabledByEnvVar: case nsIXULRuntime::ContentWin32kLockdownState::DisabledByEnvVar:
return "Win32k Lockdown disabled -- MOZ_ENABLE_WIN32K is set"; return "Win32k Lockdown disabled -- MOZ_ENABLE_WIN32K is set";
case nsIXULRuntime::ContentWin32kLockdownState::DisabledBySafeMode:
return "Win32k Lockdown disabled -- Running in Safe Mode";
case nsIXULRuntime::ContentWin32kLockdownState::DisabledByE10S: case nsIXULRuntime::ContentWin32kLockdownState::DisabledByE10S:
return "Win32k Lockdown disabled -- E10S is disabled"; return "Win32k Lockdown disabled -- E10S is disabled";

2
toolkit/components/telemetry/docs/data/environment.rst
View File

@@ -492,7 +492,7 @@ Specific keys are:
- MissingRemoteWebGL = 5 - MissingRemoteWebGL = 5
- MissingNonNativeTheming = 6 - MissingNonNativeTheming = 6
- DisabledByEnvVar = 7 - MOZ_ENABLE_WIN32K is set - DisabledByEnvVar = 7 - MOZ_ENABLE_WIN32K is set
- DisabledBySafeMode = 8 - DisabledBySafeMode = 8 - From Firefox 140 onwards, this value will no longer appear in Telemetry.
- DisabledByE10S = 9 - E10S is disabled for whatever reason - DisabledByE10S = 9 - E10S is disabled for whatever reason
- DisabledByUserPref = 10 - The user manually set security.sandbox.content.win32k-disable to false - DisabledByUserPref = 10 - The user manually set security.sandbox.content.win32k-disable to false
- EnabledByUserPref = 11 - The user manually set security.sandbox.content.win32k-disable to true - EnabledByUserPref = 11 - The user manually set security.sandbox.content.win32k-disable to true

4
toolkit/xre/nsAppRunner.cpp
View File

@@ -755,10 +755,6 @@ nsIXULRuntime::ContentWin32kLockdownState GetLiveWin32kLockdownState() {
mozilla::EnsureWin32kInitialized(); mozilla::EnsureWin32kInitialized();
gfxPlatform::GetPlatform(); gfxPlatform::GetPlatform();
if (gSafeMode) {
return nsIXULRuntime::ContentWin32kLockdownState::DisabledBySafeMode;
}
if (EnvHasValue("MOZ_ENABLE_WIN32K")) { if (EnvHasValue("MOZ_ENABLE_WIN32K")) {
return nsIXULRuntime::ContentWin32kLockdownState::DisabledByEnvVar; return nsIXULRuntime::ContentWin32kLockdownState::DisabledByEnvVar;
} }

2
xpcom/system/nsIXULRuntime.idl
View File

@@ -88,7 +88,7 @@ interface nsIXULRuntime : nsISupports
MissingRemoteWebGL = 5, MissingRemoteWebGL = 5,
MissingNonNativeTheming = 6, MissingNonNativeTheming = 6,
DisabledByEnvVar = 7, // - MOZ_ENABLE_WIN32K is set DisabledByEnvVar = 7, // - MOZ_ENABLE_WIN32K is set
DisabledBySafeMode = 8, //DisabledBySafeMode = 8,
DisabledByE10S = 9, // - E10S is disabled for whatever reason DisabledByE10S = 9, // - E10S is disabled for whatever reason
DisabledByUserPref = 10, // - The user manually set DisabledByUserPref = 10, // - The user manually set
// security.sandbox.content.win32k-disable to false // security.sandbox.content.win32k-disable to false