diff mbox series

[wrynose] python3-pytest: Fix CVE-2025-71176

Message ID 20261120115628.2245283-1-asparmar@cisco.com
State New
Headers show
Series [wrynose] python3-pytest: Fix CVE-2025-71176 | expand

Commit Message

From: Ashishkumar Parmar <asparmar@cisco.com>

This patch applies the upstream fix referenced in [2], using the commit
shown in [1].

[1] https://github.com/pytest-dev/pytest/commit/ddee02a578da30dd43aedc39c1c1f1aaadfcee95
[2] https://github.com/advisories/GHSA-6w46-j5rx-g56g

Signed-off-by: Ashishkumar Parmar <asparmar@cisco.com>
---
 .../python3-pytest/CVE-2025-71176.patch       | 127 ++++++++++++++++++
 .../python/python3-pytest_9.0.2.bb            |   2 +
 2 files changed, 129 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-pytest/CVE-2025-71176.patch
diff mbox series

Patch

diff --git a/meta/recipes-devtools/python/python3-pytest/CVE-2025-71176.patch b/meta/recipes-devtools/python/python3-pytest/CVE-2025-71176.patch
new file mode 100644
index 0000000000..9caf85a9ee
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pytest/CVE-2025-71176.patch
@@ -0,0 +1,127 @@ 
+From 263b38a2172b4171be69ded95e5d46958ecf8766 Mon Sep 17 00:00:00 2001
+From: Ran Benita <ran@unusedvar.com>
+Date: Tue, 7 Apr 2026 17:43:09 +0300
+Subject: [PATCH] Merge pull request #14343 from bluetech/cve-2025-71176-simple
+
+tmpdir: fix insecure temporary directory vulnerability (CVE-2025-71176)
+(cherry picked from commit 95d8423bd24992deea5b9df32555fa1741679e2c)
+
+CVE: CVE-2025-71176
+Upstream-Status: Backport [https://github.com/pytest-dev/pytest/commit/ddee02a578da30dd43aedc39c1c1f1aaadfcee95]
+
+Signed-off-by: Ashishkumar Parmar <asparmar@cisco.com>
+---
+ changelog/14343.bugfix.rst |  1 +
+ src/_pytest/tmpdir.py      | 26 ++++++++++++++++++++++++--
+ testing/test_tmpdir.py     | 31 +++++++++++++++++++++++++++++++
+ 3 files changed, 56 insertions(+), 2 deletions(-)
+ create mode 100644 changelog/14343.bugfix.rst
+
+diff --git a/changelog/14343.bugfix.rst b/changelog/14343.bugfix.rst
+new file mode 100644
+index 000000000..a52028d9f
+--- /dev/null
++++ b/changelog/14343.bugfix.rst
+@@ -0,0 +1 @@
++Fixed use of insecure temporary directory (CVE-2025-71176).
+diff --git a/src/_pytest/tmpdir.py b/src/_pytest/tmpdir.py
+index 855ad273e..66ca9f190 100644
+--- a/src/_pytest/tmpdir.py
++++ b/src/_pytest/tmpdir.py
+@@ -9,6 +9,7 @@ import os
+ from pathlib import Path
+ import re
+ from shutil import rmtree
++import stat
+ import tempfile
+ from typing import Any
+ from typing import final
+@@ -170,16 +171,37 @@ class TempPathFactory:
+             # Also, to keep things private, fixup any world-readable temp
+             # rootdir's permissions. Historically 0o755 was used, so we can't
+             # just error out on this, at least for a while.
++            # Don't follow symlinks, otherwise we're open to symlink-swapping
++            # TOCTOU vulnerability.
++            # This check makes us vulnerable to a DoS - a user can `mkdir
++            # /tmp/pytest-of-otheruser` and then `otheruser` will fail this
++            # check. For now we don't consider it a real problem. otheruser can
++            # change their TMPDIR or --basetemp, and maybe give the prankster a
++            # good scolding.
+             uid = get_user_id()
+             if uid is not None:
+-                rootdir_stat = rootdir.stat()
++                stat_follow_symlinks = (
++                    False if os.stat in os.supports_follow_symlinks else True
++                )
++                rootdir_stat = rootdir.stat(follow_symlinks=stat_follow_symlinks)
++                if stat.S_ISLNK(rootdir_stat.st_mode):
++                    raise OSError(
++                        f"The temporary directory {rootdir} is a symbolic link. "
++                        "Fix this and try again."
++                    )
+                 if rootdir_stat.st_uid != uid:
+                     raise OSError(
+                         f"The temporary directory {rootdir} is not owned by the current user. "
+                         "Fix this and try again."
+                     )
+                 if (rootdir_stat.st_mode & 0o077) != 0:
+-                    os.chmod(rootdir, rootdir_stat.st_mode & ~0o077)
++                    chmod_follow_symlinks = (
++                        False if os.chmod in os.supports_follow_symlinks else True
++                    )
++                    rootdir.chmod(
++                        rootdir_stat.st_mode & ~0o077,
++                        follow_symlinks=chmod_follow_symlinks,
++                    )
+             keep = self._retention_count
+             if self._retention_policy == "none":
+                 keep = 0
+diff --git a/testing/test_tmpdir.py b/testing/test_tmpdir.py
+index 363172110..789e80051 100644
+--- a/testing/test_tmpdir.py
++++ b/testing/test_tmpdir.py
+@@ -5,6 +5,7 @@ from collections.abc import Callable
+ import dataclasses
+ import os
+ from pathlib import Path
++import shutil
+ import stat
+ import sys
+ from typing import cast
+@@ -619,3 +620,33 @@ def test_tmp_path_factory_fixes_up_world_readable_permissions(
+ 
+     # After - fixed.
+     assert (basetemp.parent.stat().st_mode & 0o077) == 0
++
++
++@pytest.mark.skipif(
++    not hasattr(os, "getuid") or os.stat not in os.supports_follow_symlinks,
++    reason="checks unix permissions and symlinks",
++)
++def test_tmp_path_factory_doesnt_follow_symlinks(
++    tmp_path: Path, monkeypatch: MonkeyPatch
++) -> None:
++    """Verify that if a /tmp/pytest-of-foo directory is a symbolic link,
++    it is rejected (#13669, CVE-2025-71176)."""
++    attacker_controlled = tmp_path / "attacker_controlled"
++    attacker_controlled.mkdir()
++
++    # Use the test's tmp_path as the system temproot (/tmp).
++    monkeypatch.setenv("PYTEST_DEBUG_TEMPROOT", str(tmp_path))
++
++    # First just get the pytest-of-user path.
++    tmp_factory = TempPathFactory(None, 3, "all", lambda *args: None, _ispytest=True)
++    pytest_of_user = tmp_factory.getbasetemp().parent
++    # Just for safety in the test, before we nuke it.
++    assert "pytest-of-" in str(pytest_of_user)
++    shutil.rmtree(pytest_of_user)
++
++    pytest_of_user.symlink_to(attacker_controlled)
++
++    # This now tries to use the directory when it's a symlink.
++    tmp_factory = TempPathFactory(None, 3, "all", lambda *args: None, _ispytest=True)
++    with pytest.raises(OSError, match=r"temporary directory .* is a symbolic link"):
++        tmp_factory.getbasetemp()
+-- 
+2.35.6
+
diff --git a/meta/recipes-devtools/python/python3-pytest_9.0.2.bb b/meta/recipes-devtools/python/python3-pytest_9.0.2.bb
index 007db2e732..031a63f3d4 100644
--- a/meta/recipes-devtools/python/python3-pytest_9.0.2.bb
+++ b/meta/recipes-devtools/python/python3-pytest_9.0.2.bb
@@ -5,6 +5,8 @@  DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c"
 
+SRC_URI += "file://CVE-2025-71176.patch"
+
 SRC_URI[sha256sum] = "75186651a92bd89611d1d9fc20f0b4345fd827c41ccd5c299a868a05d70edf11"
 
 DEPENDS += "python3-setuptools-scm-native"