[3.12] gh-103295: fix stack overwrite on 32-bit in perf map test harness (GH-104811) (#104823)

miss-islington · carljm · web-flow · commit 22c45c49bbdc · 2023-05-23T22:34:50.000Z
gh-103295: fix stack overwrite on 32-bit in perf map test harness (GH-104811) (cherry picked from commit e0b3078) Co-authored-by: Carl Meyer <carl@oddbird.net>
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
@@ -762,19 +762,24 @@ clear_extension(PyObject *self, PyObject *args)
 static PyObject *
 write_perf_map_entry(PyObject *self, PyObject *args)
 {
+    PyObject *code_addr_v;
     const void *code_addr;
     unsigned int code_size;
     const char *entry_name;
 
-    if (!PyArg_ParseTuple(args, "KIs", &code_addr, &code_size, &entry_name))
+    if (!PyArg_ParseTuple(args, "OIs", &code_addr_v, &code_size, &entry_name))
         return NULL;
+    code_addr = PyLong_AsVoidPtr(code_addr_v);
+    if (code_addr == NULL) {
+        return NULL;
+    }
 
     int ret = PyUnstable_WritePerfMapEntry(code_addr, code_size, entry_name);
-    if (ret == -1) {
-        PyErr_SetString(PyExc_OSError, "Failed to write performance map entry");
+    if (ret < 0) {
+        PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
-    return Py_BuildValue("i", ret);
+    return PyLong_FromLong(ret);
 }
 
 static PyObject *
