]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
perf python: Set index error for invalid thread/cpu map items
authorIan Rogers <irogers@google.com>
Thu, 10 Jul 2025 23:51:26 +0000 (16:51 -0700)
committerNamhyung Kim <namhyung@kernel.org>
Fri, 11 Jul 2025 19:36:40 +0000 (12:36 -0700)
Returning NULL for out of bound CPU or thread map items causes
internal errors. Fix by correctly setting the error to be an index
error.

Signed-off-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20250710235126.1086011-14-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
tools/perf/util/python.c

index 1d9fa33d377a0043992c22f38025c1befd232e6b..2f28f71325a87a2dc377631af871fc25ab0b9820 100644 (file)
@@ -529,8 +529,10 @@ static PyObject *pyrf_cpu_map__item(PyObject *obj, Py_ssize_t i)
 {
        struct pyrf_cpu_map *pcpus = (void *)obj;
 
-       if (i >= perf_cpu_map__nr(pcpus->cpus))
+       if (i >= perf_cpu_map__nr(pcpus->cpus)) {
+               PyErr_SetString(PyExc_IndexError, "Index out of range");
                return NULL;
+       }
 
        return Py_BuildValue("i", perf_cpu_map__cpu(pcpus->cpus, i).cpu);
 }
@@ -598,8 +600,10 @@ static PyObject *pyrf_thread_map__item(PyObject *obj, Py_ssize_t i)
 {
        struct pyrf_thread_map *pthreads = (void *)obj;
 
-       if (i >= perf_thread_map__nr(pthreads->threads))
+       if (i >= perf_thread_map__nr(pthreads->threads)) {
+               PyErr_SetString(PyExc_IndexError, "Index out of range");
                return NULL;
+       }
 
        return Py_BuildValue("i", perf_thread_map__pid(pthreads->threads, i));
 }