Skip to content

Commit 79c06bd

Browse files
[3.14] gh-151558: Fix symlink escape via tarfile hardlink-extraction fallback (GH-151559)
(cherry picked from commit 27dd970) Co-authored-by: Stan Ulbrych <stan@python.org>
1 parent eaa3fac commit 79c06bd

3 files changed

Lines changed: 30 additions & 0 deletions

File tree

Lib/tarfile.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2784,6 +2784,9 @@ def makelink_with_filter(self, tarinfo, targetpath,
27842784
"makelink_with_filter: if filter_function is not None, "
27852785
+ "extraction_root must also not be None")
27862786
try:
2787+
filter_function(
2788+
unfiltered.replace(name=tarinfo.name, deep=False),
2789+
extraction_root)
27872790
filtered = filter_function(unfiltered, extraction_root)
27882791
except _FILTER_ERRORS as cause:
27892792
raise LinkFallbackError(tarinfo, unfiltered.name) from cause

Lib/test/test_tarfile.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4344,6 +4344,30 @@ def test_sneaky_hardlink_fallback(self):
43444344
self.expect_file("boom", symlink_to='../../link_here')
43454345
self.expect_file("c", symlink_to='b')
43464346

4347+
@symlink_test
4348+
def test_sneaky_hardlink_fallback_deep(self):
4349+
# (CVE-2026-11940)
4350+
with ArchiveMaker() as arc:
4351+
arc.add("a/b/s", symlink_to=os.path.join("..", "escape"))
4352+
arc.add("s", hardlink_to=os.path.join("a", "b", "s"))
4353+
4354+
with self.check_context(arc.open(), 'data'):
4355+
e = self.expect_exception(
4356+
tarfile.LinkFallbackError,
4357+
"link 's' would be extracted as a copy of "
4358+
+ "'a/b/s', which was rejected")
4359+
self.assertIsInstance(e.__cause__,
4360+
tarfile.LinkOutsideDestinationError)
4361+
4362+
for filter in 'tar', 'fully_trusted':
4363+
with self.subTest(filter), self.check_context(arc.open(), filter):
4364+
if not os_helper.can_symlink():
4365+
self.expect_file("a/")
4366+
self.expect_file("a/b/")
4367+
else:
4368+
self.expect_file("a/b/s", symlink_to=os.path.join('..', 'escape'))
4369+
self.expect_file("s", symlink_to=os.path.join('..', 'escape'))
4370+
43474371
@symlink_test
43484372
def test_exfiltration_via_symlink(self):
43494373
# (CVE-2025-4138)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fixed an vulnerability in the :mod:`tarfile` ``data`` and ``tar`` extraction
2+
filters where crafted archives could create a symlink pointing outside the
3+
destination directory. This was a bypass of :cve:`2025-4330`.

0 commit comments

Comments
 (0)