| From 902b249e761ac06778d97ea01e29d49a36141dce Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 15 Jul 2021 18:07:06 +0200 |
| Subject: perf map: Fix dso->nsinfo refcounting |
| |
| From: Riccardo Mancini <rickyman7@gmail.com> |
| |
| [ Upstream commit 2d6b74baa7147251c30a46c4996e8cc224aa2dc5 ] |
| |
| 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 whenever a |
| refcounted variable is replaced with a new value. |
| |
| Signed-off-by: Riccardo Mancini <rickyman7@gmail.com> |
| Fixes: bf2e710b3cb8445c ("perf maps: Lookup maps in both intitial mountns and inner mountns.") |
| Cc: Ian Rogers <irogers@google.com> |
| Cc: Jiri Olsa <jolsa@redhat.com> |
| Cc: Krister Johansen <kjlx@templeofstupid.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/util/map.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c |
| index 8af693d9678c..72e7f3616157 100644 |
| --- a/tools/perf/util/map.c |
| +++ b/tools/perf/util/map.c |
| @@ -192,6 +192,8 @@ struct map *map__new(struct machine *machine, u64 start, u64 len, |
| if (!(prot & PROT_EXEC)) |
| dso__set_loaded(dso); |
| } |
| + |
| + nsinfo__put(dso->nsinfo); |
| dso->nsinfo = nsi; |
| |
| if (build_id__is_defined(bid)) |
| -- |
| 2.30.2 |
| |