]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
perf python: Decrement the refcount of just created event on failure
authorArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 12 Mar 2025 20:31:39 +0000 (17:31 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:30:58 +0000 (14:30 +0200)
[ Upstream commit 3de5a2bf5b4847f7a59a184568f969f8fe05d57f ]

To avoid a leak if we have the python object but then something happens
and we need to return the operation, decrement the offset of the newly
created object.

Fixes: 377f698db12150a1 ("perf python: Add struct evsel into struct pyrf_event")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Reviewed-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20250312203141.285263-5-acme@kernel.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/perf/util/python.c

index 51679d8d40b1bd8d27a519e39043fd111fbe7579..ab3a444b4b8680b74d48564e286553502db883ef 100644 (file)
@@ -1057,6 +1057,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
 
                evsel = perf_evlist__event2evsel(evlist, event);
                if (!evsel) {
+                       Py_DECREF(pyevent);
                        Py_INCREF(Py_None);
                        return Py_None;
                }
@@ -1068,9 +1069,12 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
                /* Consume the even only after we parsed it out. */
                perf_mmap__consume(&md->core);
 
-               if (err)
+               if (err) {
+                       Py_DECREF(pyevent);
                        return PyErr_Format(PyExc_OSError,
                                            "perf: can't parse sample, err=%d", err);
+               }
+
                return pyevent;
        }
 end: