| From 487e8d6cfccb31f6a31771ee2c57b40ae24ae99e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 15 Jul 2021 18:07:06 +0200 |
| Subject: perf inject: Fix dso->nsinfo refcounting |
| |
| From: Riccardo Mancini <rickyman7@gmail.com> |
| |
| [ Upstream commit 0967ebffe098157180a0bbd180ac90348c6e07d7 ] |
| |
| ASan reports a memory leak of nsinfo during the execution of: |
| |
| # perf test "31: Lookup mmap thread" |
| |
| The leak is caused by a refcounted variable being replaced without |
| dropping the refcount. |
| |
| This patch makes sure that the refcnt of nsinfo is decreased when a |
| refcounted variable is replaced with a new value. |
| |
| Signed-off-by: Riccardo Mancini <rickyman7@gmail.com> |
| Fixes: 27c9c3424fc217da ("perf inject: Add --buildid-all option") |
| Cc: Ian Rogers <irogers@google.com> |
| Cc: Jiri Olsa <jolsa@redhat.com> |
| Cc: Mark Rutland <mark.rutland@arm.com> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Link: http://lore.kernel.org/lkml/55223bc8821b34ccb01f92ef1401c02b6a32e61f.1626343282.git.rickyman7@gmail.com |
| [ Split from a larger patch ] |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/perf/builtin-inject.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c |
| index ddccc0eb7390..614e428e4ac5 100644 |
| --- a/tools/perf/builtin-inject.c |
| +++ b/tools/perf/builtin-inject.c |
| @@ -358,9 +358,10 @@ static struct dso *findnew_dso(int pid, int tid, const char *filename, |
| dso = machine__findnew_dso_id(machine, filename, id); |
| } |
| |
| - if (dso) |
| + if (dso) { |
| + nsinfo__put(dso->nsinfo); |
| dso->nsinfo = nsi; |
| - else |
| + } else |
| nsinfo__put(nsi); |
| |
| thread__put(thread); |
| -- |
| 2.30.2 |
| |