From 7dfac1d08ebf4619d12b15507042c7b5889001e6 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 18 Sep 2025 14:35:14 -0700 Subject: [PATCH 1/3] Enable spectre mitigations for ANCM binaries --- .../AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj | 2 +- .../Windows/AspNetCoreModule-Setup/build/settings/common.props | 2 +- .../IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj | 2 +- .../InProcessRequestHandler/InProcessRequestHandler.vcxproj | 2 +- .../OutOfProcessRequestHandler.vcxproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj index ec30e8b311ac..9b6ce27765ba 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj @@ -63,7 +63,7 @@ true $(AdditionalIncludeDirectories) true - /guard:cf + /guard:cf /Qspectre httpapi.lib;shlwapi.lib;ahadmin.lib;xmllite.lib;msi.lib;Version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props index e826eb6b3e95..615736764578 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props +++ b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props @@ -27,7 +27,7 @@ Level4 $(TreatSpecificWarningsAsErrors);4018;4055;4146;4242;4244;4267;4302;4308;4509;4510;4532;4533;4610;4611;4700;4701;4703;4789;4995;4996 - /guard:cf + /guard:cf /Qspectre diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 66900a39b1ad..11a048962cde 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -16,7 +16,7 @@ _USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) ..\IISLib;.\Inc;..\CommonLib;$(LibNetHostPath) - /guard:cf + /guard:cf /Qspectre kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;libnethost.lib diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index f6cfbb517878..f37bd6a5685b 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -16,7 +16,7 @@ REQUESTHANDLER_EXPORTS;_USRDLL;%(PreprocessorDefinitions) ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - /guard:cf + /guard:cf /Qspectre kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;$(LibNetHostPath)\libnethost.lib diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index c3d321ff0411..42d7048c4af2 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -16,7 +16,7 @@ REQUESTHANDLER_EXPORTS;_USRDLL;%(PreprocessorDefinitions) ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - /guard:cf + /guard:cf /Qspectre kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib From b573d8a4728ece3fa0bdc8e5f5f40f66ad59ee72 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 18 Sep 2025 14:56:35 -0700 Subject: [PATCH 2/3] Set property as well --- .../AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj | 1 + .../Windows/AspNetCoreModule-Setup/build/settings/common.props | 1 + src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj | 1 + .../InProcessRequestHandler/InProcessRequestHandler.vcxproj | 1 + .../OutOfProcessRequestHandler.vcxproj | 1 + 5 files changed, 5 insertions(+) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj index 9b6ce27765ba..47ded3edb7d1 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj @@ -4,6 +4,7 @@ $(MSBuildThisFileDirectory)..\ false + Spectre diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props index 615736764578..218c0745ec14 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props +++ b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props @@ -15,6 +15,7 @@ Unicode + Spectre