Skip to content

Add CET Shadow stack compatibility (#5496)#5508

Merged
guhetier merged 1 commit intorelease/2.4from
guhetier/binskim_dotnet_fix_cp_2.4
Oct 10, 2025
Merged

Add CET Shadow stack compatibility (#5496)#5508
guhetier merged 1 commit intorelease/2.4from
guhetier/binskim_dotnet_fix_cp_2.4

Conversation

@guhetier
Copy link
Collaborator

@guhetier guhetier commented Oct 9, 2025

Description

Fixes #5495 by adding the linker flag /CETCOMPAT, to advertise CET Shadow stacks supports.
Cherry-pick of #5496.

Testing

CI

Documentation

N/A

@guhetier guhetier requested a review from a team as a code owner October 9, 2025 18:11
@codecov
Copy link

codecov bot commented Oct 9, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 85.93%. Comparing base (1d9464a) to head (3135866).
⚠️ Report is 2 commits behind head on release/2.4.

Additional details and impacted files
@@               Coverage Diff               @@
##           release/2.4    #5508      +/-   ##
===============================================
- Coverage        86.55%   85.93%   -0.62%     
===============================================
  Files               56       56              
  Lines            17338    17338              
===============================================
- Hits             15007    14900     -107     
- Misses            2331     2438     +107     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@guhetier guhetier enabled auto-merge (squash) October 10, 2025 20:48
${SYSTEM_PROCESSOR} STREQUAL "x86" OR
${SYSTEM_PROCESSOR} STREQUAL "win32")

string(APPEND MSQUIC_LINK_FLAGS " /CETCOMPAT")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should have caught this on the original PR, but why is this doing string appending? I think CMAKE supports make the link flags a list of items and then seamlessly making it a string when setting the link flags.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It follows the pattern introduced in #5454 (you see it in this diff because of a merge conflict).

@guhetier guhetier merged commit 769f3a4 into release/2.4 Oct 10, 2025
327 of 353 checks passed
@guhetier guhetier deleted the guhetier/binskim_dotnet_fix_cp_2.4 branch October 10, 2025 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants