Skip to content

Merging internal commits for release/8.0 - #129195

Merged
hoyosjs merged 15 commits into
dotnet:release/8.0from
vseanreesermsft:internal-merge-8.0-2026-06-09-1512
Jun 11, 2026
Merged

Merging internal commits for release/8.0#129195
hoyosjs merged 15 commits into
dotnet:release/8.0from
vseanreesermsft:internal-merge-8.0-2026-06-09-1512

Conversation

@vseanreesermsft

@vseanreesermsftvseanreesermsft commented Jun 9, 2026

Copy link
Copy Markdown

No description provided.

alinpahontu2912and others added 13 commits April 30, 2026 11:51
@alinpahontu2912
Solve symlinks before extraction to avoid possible traversals
f1d743e
@alinpahontu2912
solve copilot comments
ad2953d
@alinpahontu2912
allow UnauthorizedException to bubble out and update test assertion
06eb769
@alinpahontu2912
fix ambiguous calls
50179ce
@alinpahontu2912
address comments
84d9ee3
@alinpahontu2912
add missing using
bdf9959
Mirroring
Merge commit 'ebcc0f8c4f76c1a1027ccba2bfe79ac8b209784e'
091982e
@elinor-fung
Merged PR 59958: [release/8.0] Fix NativeAOT possible out-of-bounds w…
ff140ff
…rite for ByValTStr
Fix NativeAOT possible out-of-bounds write for ByValTStr
StringToByValAnsiString truncated the input string based on Unicode
character count only, then called PInvokeMarshal.StringToAnsiString
which computed the full ANSI/UTF-8 byte count and wrote it all to the
fixed-size native buffer.
Add an optional maxByteCount parameter to StringToAnsiString.
When set, the byte length is clamped before performing the conversion.
For ASCII-only strings, this truncates. For non-ASCII, on Unix, this
results in an ArgumentException when the buffer is too small for the
encoded bytes and on Windows, this truncates. This matches coreclr.
8.0 version of https://dnceng.visualstudio.com/internal/_git/dotnet-runtime/pullrequest/59956
Mirroring
Merge commit '90cf489db8836d7530a5d50e02adabee8b5065ff'
d1e47f8
Mirroring
Merge commit 'a2270915c77365f1b84165844e06f2f35588c2d9'
aa0e373
@alinpahontu2912
Merged PR 60646: Fix tar symlink resolution - NET 8
e77fe84
Solve symlinks before extraction to avoid possible traversals
----
#### AI description (iteration 1)
#### PR Classification
Security fix to prevent directory traversal attacks via malicious symlinks in tar archives.
#### PR Summary
This PR fixes a security vulnerability where malicious tar archives could use symlinks to write files outside the intended extraction directory. The fix adds symlink resolution logic that validates paths at each component level during extraction.
- `TarEntry.cs`: Added `FilePathEscapesDirectory()`, `ResolveSymlink()`, and `ResolveFullPath()` methods to recursively resolve symlinks and detect directory traversal attempts
- `TarEntry.cs`: Enhanced extraction validation to check if file paths and link targets escape the destination directory using the new symlink resolution logic
- `TarFile.ExtractToDirectory.File.Tests.cs`: Added tests for nested symlink directory traversal and chained symlink attacks to verify the fix prevents malicious extraction
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
Mirroring
Merge commit '18c85f96f6c4e8609247235f6486d5807a2f42af'
46295af
@vseanreesermsft
Merge commit '46295af5828b062bbbf93a9cef50fd8cb9fbcb09' into internal…
5c83ff8
…-merge-8.0-2026-06-09-1512
CopilotAI review requested due to automatic review settings June 9, 2026 22:13
CopilotAI reviewed Jun 9, 2026
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR merges internal release/8.0 changes that strengthen safety and correctness in two areas: (1) fixed-size ANSI string marshalling for ByValTStr (including NativeAOT), and (2) tar extraction path validation to prevent directory traversal via symlinks. It also adds regression tests to validate the intended behavior.

Changes:

  • Add regression tests for Marshal.StructureToPtr with ByValTStr to verify multibyte overflow behavior on Unix and ASCII truncation behavior.
  • Harden System.Formats.Tar extraction by detecting paths that escape the destination directory when intermediate components are symlinks.
  • Update NativeAOT StringToAnsiString to respect a bounded output buffer size for ByValTStr scenarios.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 5 comments.

Show a summary per file
FileDescription
src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System/Runtime/InteropServices/Marshal/StructureToPtrTests.csAdds tests covering ByValTStr overflow (Unix UTF-8 multibyte) and ASCII truncation behavior.
src/libraries/System.Formats.Tar/tests/TarFile/TarFile.ExtractToDirectory.File.Tests.csAdds tar extraction tests intended to cover symlink-based traversal cases.
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarEntry.csAdds traversal detection that resolves symlinks component-by-component when extracting entries.
src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/PInvokeMarshal.csAdds bounded-buffer support for ANSI marshalling to prevent overwriting fixed buffers.
src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerHelpers/InteropHelpers.csRoutes ByValTStr ANSI marshalling through the new bounded-buffer behavior.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadsrc/libraries/System.Formats.Tar/src/System/Formats/Tar/TarEntry.cs
Comment threadsrc/libraries/System.Formats.Tar/src/System/Formats/Tar/TarEntry.cs
Comment thread...oreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/PInvokeMarshal.cs
Comment threadsrc/libraries/System.Formats.Tar/tests/TarFile/TarFile.ExtractToDirectory.File.Tests.cs
Comment threadsrc/libraries/System.Formats.Tar/tests/TarFile/TarFile.ExtractToDirectory.File.Tests.cs
This was referenced Jun 10, 2026
Closed
Open
Open
Closed
This was referenced Jun 10, 2026
Closed
Open
CopilotAI review requested due to automatic review settings June 10, 2026 15:55
@build-analysisbuild-analysisBot mentioned this pull request Jun 10, 2026
Open
3 tasks
CopilotAI reviewed Jun 10, 2026
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 5 comments.

Comment threadsrc/libraries/System.Formats.Tar/src/System/Formats/Tar/TarEntry.cs
Comment threadsrc/libraries/System.Formats.Tar/tests/TarFile/TarFile.ExtractToDirectory.File.Tests.cs
Comment threadsrc/libraries/System.Formats.Tar/tests/TarFile/TarFile.ExtractToDirectory.File.Tests.cs
Comment threadsrc/libraries/System.Formats.Tar/tests/TarFile/TarFile.ExtractToDirectory.File.Tests.cs
Comment threadsrc/libraries/System.Formats.Tar/src/System/Formats/Tar/TarEntry.cs
This was referenced Jun 10, 2026
Open
Open
This was referenced Jun 10, 2026
Open
Open
@hoyosjs
hoyosjs enabled auto-merge June 10, 2026 17:13
@hoyosjshoyosjs added Servicing-approved Approved for servicing release and removed area-System.Runtime.InteropServices labels Jun 10, 2026
@hoyosjshoyosjs closed this Jun 10, 2026
auto-merge was automatically disabled June 10, 2026 17:53

Pull request was closed

@hoyosjshoyosjs reopened this Jun 10, 2026
@hoyosjs
hoyosjs enabled auto-merge June 10, 2026 18:02
@build-analysisbuild-analysisBot mentioned this pull request Jun 11, 2026
Open
@svick

svick commented Jun 11, 2026

Copy link
Copy Markdown
Member

/ba-g failures are #128772 (which is fixed in staging) and known errors

@hoyosjs
hoyosjs merged commit 22b5392 into dotnet:release/8.0Jun 11, 2026
176 of 183 checks passed
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jul 12, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@steveisoksteveisoksteveisok approved these changes
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky is a code owner

Assignees

No one assigned

Labels

area-System.Formats.TarServicing-approvedApproved for servicing release

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@vseanreesermsft@svick@steveisok@hoyosjs@alinpahontu2912@elinor-fung