Skip to content

Commit 585b97a

Browse files
StanFromIrelandmiss-islington
authored andcommitted
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 82e023f commit 585b97a

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
@@ -2719,6 +2719,9 @@ def makelink_with_filter(self, tarinfo, targetpath,
27192719
"makelink_with_filter: if filter_function is not None, "
27202720
+ "extraction_root must also not be None")
27212721
try:
2722+
filter_function(
2723+
unfiltered.replace(name=tarinfo.name, deep=False),
2724+
extraction_root)
27222725
filtered = filter_function(unfiltered, extraction_root)
27232726
except _FILTER_ERRORS as cause:
27242727
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
@@ -4311,6 +4311,30 @@ def test_sneaky_hardlink_fallback(self):
43114311
self.expect_file("boom", symlink_to='../../link_here')
43124312
self.expect_file("c", symlink_to='b')
43134313

4314+
@symlink_test
4315+
def test_sneaky_hardlink_fallback_deep(self):
4316+
# (CVE-2026-11940)
4317+
with ArchiveMaker() as arc:
4318+
arc.add("a/b/s", symlink_to=os.path.join("..", "escape"))
4319+
arc.add("s", hardlink_to=os.path.join("a", "b", "s"))
4320+
4321+
with self.check_context(arc.open(), 'data'):
4322+
e = self.expect_exception(
4323+
tarfile.LinkFallbackError,
4324+
"link 's' would be extracted as a copy of "
4325+
+ "'a/b/s', which was rejected")
4326+
self.assertIsInstance(e.__cause__,
4327+
tarfile.LinkOutsideDestinationError)
4328+
4329+
for filter in 'tar', 'fully_trusted':
4330+
with self.subTest(filter), self.check_context(arc.open(), filter):
4331+
if not os_helper.can_symlink():
4332+
self.expect_file("a/")
4333+
self.expect_file("a/b/")
4334+
else:
4335+
self.expect_file("a/b/s", symlink_to=os.path.join('..', 'escape'))
4336+
self.expect_file("s", symlink_to=os.path.join('..', 'escape'))
4337+
43144338
@symlink_test
43154339
def test_exfiltration_via_symlink(self):
43164340
# (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)