[Python-checkins] gh-103295: fix stack overwrite on 32-bit in perf map test harness (#104811)
carljm
webhook-mailer at python.org
Tue May 23 18:04:52 EDT 2023
https://github.com/python/cpython/commit/e0b3078705b271ff278dfbc788c2b061c92a9aa3
commit: e0b3078705b271ff278dfbc788c2b061c92a9aa3
branch: main
author: Carl Meyer <carl at oddbird.net>
committer: carljm <carl at oddbird.net>
date: 2023-05-23T16:04:31-06:00
summary:
gh-103295: fix stack overwrite on 32-bit in perf map test harness (#104811)
files:
M Modules/_testinternalcapi.c
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
index b91f7b620fdb..8267dbf67790 100644
--- 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 *
More information about the Python-checkins
mailing list