From 5f94bffeff62f4b767a311a4505d6d40d86279d9 Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Thu, 9 Mar 2023 13:54:27 +0000
Subject: [PATCH] Replace `SafeLocalAllocHandle` in
 `System.Diagnostics.PerformanceCounter` (#82456)

* Replace `SafeLocalAllocHandle` in `Diagnostics.PerformanceCounter`

* Update SharedPerformanceCounter.cs

* Update System.Diagnostics.PerformanceCounter.csproj
---
 ...tringSecurityDescriptorToSecurityDescriptor.cs |  6 +++---
 .../Kernel32/Interop.SECURITY_ATTRIBUTES.cs       |  2 +-
 .../IO/FileSystem.DirectoryCreation.Windows.cs    |  2 +-
 .../System.Diagnostics.PerformanceCounter.csproj  |  2 --
 .../Diagnostics/SharedPerformanceCounter.cs       | 15 ++++++++++-----
 .../src/System/IO/FileSystemAclExtensions.cs      |  2 +-
 .../src/System/IO/Pipes/PipeStream.Windows.cs     |  2 +-
 .../src/System/IO/FileSystem.Windows.cs           |  2 +-
 .../src/System/Threading/EventWaitHandleAcl.cs    |  2 +-
 .../src/System/Threading/MutexAcl.cs              |  2 +-
 .../src/System/Threading/SemaphoreAcl.cs          |  2 +-
 11 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs
index 120fc0e89caff6..f16510718dd6e0 100644
--- a/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs
+++ b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs
@@ -11,10 +11,10 @@ internal static partial class Advapi32
     {
         [LibraryImport(Interop.Libraries.Advapi32, EntryPoint = "ConvertStringSecurityDescriptorToSecurityDescriptorW", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
         [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool ConvertStringSecurityDescriptorToSecurityDescriptor(
+        internal static unsafe partial bool ConvertStringSecurityDescriptorToSecurityDescriptor(
             string StringSecurityDescriptor,
             int StringSDRevision,
-            out SafeLocalAllocHandle pSecurityDescriptor,
-            IntPtr SecurityDescriptorSize);
+            out void* pSecurityDescriptor,
+            uint* SecurityDescriptorSize);
     }
 }
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SECURITY_ATTRIBUTES.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SECURITY_ATTRIBUTES.cs
index 3849f88d85886f..f390490f3a5848 100644
--- a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SECURITY_ATTRIBUTES.cs
+++ b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SECURITY_ATTRIBUTES.cs
@@ -12,7 +12,7 @@ internal static partial class Kernel32
         internal struct SECURITY_ATTRIBUTES
         {
             internal uint nLength;
-            internal IntPtr lpSecurityDescriptor;
+            internal unsafe void* lpSecurityDescriptor;
             internal BOOL bInheritHandle;
         }
     }
diff --git a/src/libraries/Common/src/System/IO/FileSystem.DirectoryCreation.Windows.cs b/src/libraries/Common/src/System/IO/FileSystem.DirectoryCreation.Windows.cs
index 5962bb702d3472..dbce84a8676ed6 100644
--- a/src/libraries/Common/src/System/IO/FileSystem.DirectoryCreation.Windows.cs
+++ b/src/libraries/Common/src/System/IO/FileSystem.DirectoryCreation.Windows.cs
@@ -80,7 +80,7 @@ public static unsafe void CreateDirectory(string fullPath, byte[]? securityDescr
                 Interop.Kernel32.SECURITY_ATTRIBUTES secAttrs = new Interop.Kernel32.SECURITY_ATTRIBUTES
                 {
                     nLength = (uint)sizeof(Interop.Kernel32.SECURITY_ATTRIBUTES),
-                    lpSecurityDescriptor = (IntPtr)pSecurityDescriptor
+                    lpSecurityDescriptor = pSecurityDescriptor
                 };
 
                 while (stackDir.Count > 0)
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
index c3677d6ed38615..abda27a9d20888 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
@@ -119,8 +119,6 @@ System.Diagnostics.PerformanceCounter</PackageDescription>
              Link="Common\Interop\Windows\Pdh\Interop.PdhFormatFromRawValue.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\PerfCounter\Interop.PerformanceData.cs"
              Link="Common\Interop\Windows\PerfCounter\Interop.PerformanceData.cs" />
-    <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs"
-             Link="Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs" />
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafePerfProviderHandle.cs"
              Link="Common\Microsoft\Win32\SafeHandles\SafePerfProviderHandle.cs" />
     <Compile Include="$(CommonPath)System\Diagnostics\NetFrameworkUtils.cs"
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/SharedPerformanceCounter.cs b/src/libraries/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/SharedPerformanceCounter.cs
index b36a7215fd8d75..8ec76b90960077 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/SharedPerformanceCounter.cs
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/SharedPerformanceCounter.cs
@@ -1669,7 +1669,7 @@ private unsafe void Initialize(string fileMappingName, int fileMappingSize, int
             {
                 string mappingName = fileMappingName;
 
-                SafeLocalAllocHandle securityDescriptorPointer = null;
+                void* pSecurityDescriptor = null;
                 try
                 {
                     // The sddl string consists of these parts:
@@ -1681,12 +1681,17 @@ private unsafe void Initialize(string fileMappingName, int fileMappingSize, int
                     // ;S-1-5-33)   the same permission granted to AU is also granted to restricted services
                     string sddlString = "D:(A;OICI;FRFWGRGW;;;AU)(A;OICI;FRFWGRGW;;;S-1-5-33)";
 
-                    if (!Interop.Advapi32.ConvertStringSecurityDescriptorToSecurityDescriptor(sddlString, Interop.Kernel32.PerformanceCounterOptions.SDDL_REVISION_1,
-                                                                                                    out securityDescriptorPointer, IntPtr.Zero))
+                    if (!Interop.Advapi32.ConvertStringSecurityDescriptorToSecurityDescriptor(
+                        sddlString,
+                        Interop.Kernel32.PerformanceCounterOptions.SDDL_REVISION_1,
+                        out pSecurityDescriptor,
+                        null))
+                    {
                         throw new InvalidOperationException(SR.SetSecurityDescriptorFailed);
+                    }
 
                     Interop.Kernel32.SECURITY_ATTRIBUTES securityAttributes = default;
-                    securityAttributes.lpSecurityDescriptor = securityDescriptorPointer.DangerousGetHandle();
+                    securityAttributes.lpSecurityDescriptor = pSecurityDescriptor;
                     securityAttributes.bInheritHandle = Interop.BOOL.FALSE;
 
                     //
@@ -1756,7 +1761,7 @@ private unsafe void Initialize(string fileMappingName, int fileMappingSize, int
                 }
                 finally
                 {
-                    securityDescriptorPointer?.Close();
+                    Marshal.FreeHGlobal((IntPtr)pSecurityDescriptor);
                 }
 
                 Interlocked.CompareExchange(ref *(int*)_fileViewAddress.DangerousGetHandle().ToPointer(), initialOffset, 0);
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System/IO/FileSystemAclExtensions.cs b/src/libraries/System.IO.FileSystem.AccessControl/src/System/IO/FileSystemAclExtensions.cs
index dc3bf1e1d29d03..cecec0f38bbb68 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/src/System/IO/FileSystemAclExtensions.cs
+++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System/IO/FileSystemAclExtensions.cs
@@ -279,7 +279,7 @@ private static unsafe SafeFileHandle CreateFileHandle(string fullPath, FileMode
             {
                 fixed (byte* pSecurityDescriptor = security.GetSecurityDescriptorBinaryForm())
                 {
-                    secAttrs.lpSecurityDescriptor = (IntPtr)pSecurityDescriptor;
+                    secAttrs.lpSecurityDescriptor = pSecurityDescriptor;
                     handle = CreateFileHandleInternal(fullPath, mode, rights, share, flagsAndAttributes, &secAttrs);
                 }
             }
diff --git a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs
index aed30e5595bc49..453fe1153bd4be 100644
--- a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs
+++ b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs
@@ -586,7 +586,7 @@ internal static unsafe Interop.Kernel32.SECURITY_ATTRIBUTES GetSecAttrs(HandleIn
                 pinningHandle = GCHandle.Alloc(securityDescriptor, GCHandleType.Pinned);
                 fixed (byte* pSecurityDescriptor = securityDescriptor)
                 {
-                    secAttrs.lpSecurityDescriptor = (IntPtr)pSecurityDescriptor;
+                    secAttrs.lpSecurityDescriptor = pSecurityDescriptor;
                 }
             }
 
diff --git a/src/libraries/System.Private.CoreLib/src/System/IO/FileSystem.Windows.cs b/src/libraries/System.Private.CoreLib/src/System/IO/FileSystem.Windows.cs
index bda87313fd5f15..fc063209e36fce 100644
--- a/src/libraries/System.Private.CoreLib/src/System/IO/FileSystem.Windows.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/IO/FileSystem.Windows.cs
@@ -765,7 +765,7 @@ private static unsafe SafeFileHandle OpenSafeFileHandle(string path, int flags)
                 path,
                 dwDesiredAccess: 0,
                 FileShare.ReadWrite | FileShare.Delete,
-                lpSecurityAttributes: (Interop.Kernel32.SECURITY_ATTRIBUTES*)IntPtr.Zero,
+                lpSecurityAttributes: null,
                 FileMode.Open,
                 dwFlagsAndAttributes: flags,
                 hTemplateFile: IntPtr.Zero);
diff --git a/src/libraries/System.Threading.AccessControl/src/System/Threading/EventWaitHandleAcl.cs b/src/libraries/System.Threading.AccessControl/src/System/Threading/EventWaitHandleAcl.cs
index 02ae784246b4ed..7db2afe4e8f804 100644
--- a/src/libraries/System.Threading.AccessControl/src/System/Threading/EventWaitHandleAcl.cs
+++ b/src/libraries/System.Threading.AccessControl/src/System/Threading/EventWaitHandleAcl.cs
@@ -49,7 +49,7 @@ public static unsafe EventWaitHandle Create(bool initialState, EventResetMode mo
                 var secAttrs = new Interop.Kernel32.SECURITY_ATTRIBUTES
                 {
                     nLength = (uint)sizeof(Interop.Kernel32.SECURITY_ATTRIBUTES),
-                    lpSecurityDescriptor = (IntPtr)pSecurityDescriptor
+                    lpSecurityDescriptor = pSecurityDescriptor
                 };
 
                 SafeWaitHandle handle = Interop.Kernel32.CreateEventEx(
diff --git a/src/libraries/System.Threading.AccessControl/src/System/Threading/MutexAcl.cs b/src/libraries/System.Threading.AccessControl/src/System/Threading/MutexAcl.cs
index 68ea586619ea31..4185c032b1421a 100644
--- a/src/libraries/System.Threading.AccessControl/src/System/Threading/MutexAcl.cs
+++ b/src/libraries/System.Threading.AccessControl/src/System/Threading/MutexAcl.cs
@@ -34,7 +34,7 @@ public static unsafe Mutex Create(bool initiallyOwned, string? name, out bool cr
                 var secAttrs = new Interop.Kernel32.SECURITY_ATTRIBUTES
                 {
                     nLength = (uint)sizeof(Interop.Kernel32.SECURITY_ATTRIBUTES),
-                    lpSecurityDescriptor = (IntPtr)pSecurityDescriptor
+                    lpSecurityDescriptor = pSecurityDescriptor
                 };
 
                 SafeWaitHandle handle = Interop.Kernel32.CreateMutexEx(
diff --git a/src/libraries/System.Threading.AccessControl/src/System/Threading/SemaphoreAcl.cs b/src/libraries/System.Threading.AccessControl/src/System/Threading/SemaphoreAcl.cs
index e6d3de0e88e517..1235e6594a72d1 100644
--- a/src/libraries/System.Threading.AccessControl/src/System/Threading/SemaphoreAcl.cs
+++ b/src/libraries/System.Threading.AccessControl/src/System/Threading/SemaphoreAcl.cs
@@ -51,7 +51,7 @@ public static unsafe Semaphore Create(int initialCount, int maximumCount, string
                 var secAttrs = new Interop.Kernel32.SECURITY_ATTRIBUTES
                 {
                     nLength = (uint)sizeof(Interop.Kernel32.SECURITY_ATTRIBUTES),
-                    lpSecurityDescriptor = (IntPtr)pSecurityDescriptor
+                    lpSecurityDescriptor = pSecurityDescriptor
                 };
 
                 SafeWaitHandle handle = Interop.Kernel32.CreateSemaphoreEx(