[3.13] gh-142557: fix UAF in `bytearray.__mod__` when object is mutated while formatt...

(cherry picked from commit 61ee04834b096be00678c6819b4957f3f4413a5e)

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 3e948f3577977f67cc42e1e905d8effab663c6f2..91687a90a2c0733216a77746564cf90ca4668ce7 100644 (file)
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -1349,6 +1349,18 @@ class ByteArrayTest(BaseBytesTest, unittest.TestCase):
             except OSError:
                 pass
 
+    def test_mod_concurrent_mutation(self):
+        # Prevent crash in __mod__ when formatting mutates the bytearray.
+        # Regression test for https://github.com/python/cpython/issues/142557.
+        fmt = bytearray(b"%a end")
+
+        class S:
+            def __repr__(self):
+                fmt.clear()
+                return "E"
+
+        self.assertRaises(BufferError, fmt.__mod__, S())
+
     def test_reverse(self):
         b = bytearray(b'hello')
         self.assertEqual(b.reverse(), None)

diff --git a/Misc/NEWS.d/next/Core and Builtins/2025-12-27-12-25-06.gh-issue-142557.KWOc8b.rst b/Misc/NEWS.d/next/Core and Builtins/2025-12-27-12-25-06.gh-issue-142557.KWOc8b.rst
new file mode 100644 (file)
index 0000000..b7f7a58
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2025-12-27-12-25-06.gh-issue-142557.KWOc8b.rst
@@ -0,0 +1,3 @@
+Fix a use-after-free crash in :ref:`bytearray.__mod__ <bytes-formatting>` when
+the :class:`!bytearray` is mutated while formatting the ``%``-style arguments.
+Patch by Bénédikt Tran.

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index f4e4e2885d80bcd7e6e3357c46d2efd534203378..5e29dd8e69d10e41aec3c147e0d92c8acbbe0754 100644 (file)
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -2401,7 +2401,15 @@ bytearray_mod(PyObject *v, PyObject *w)
 {
     if (!PyByteArray_Check(v))
         Py_RETURN_NOTIMPLEMENTED;
-    return _PyBytes_FormatEx(PyByteArray_AS_STRING(v), PyByteArray_GET_SIZE(v), w, 1);
+
+    PyByteArrayObject *self = _PyByteArray_CAST(v);
+    /* Increase exports to prevent bytearray storage from changing during op. */
+    self->ob_exports++;
+    PyObject *res = _PyBytes_FormatEx(
+        PyByteArray_AS_STRING(v), PyByteArray_GET_SIZE(v), w, 1
+    );
+    self->ob_exports--;
+    return res;
 }
 
 static PyNumberMethods bytearray_as_number = {