korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf maps: Fix use after free in __maps__fixup_overlap_and_insert

Browse Source 
[ Upstream commit 0b90dfda22 ]

In the case 'before' and 'after' are broken out from pos,
maps_by_address may be changed by __maps__insert, as such it needs
re-reading.

Don't ignore the return value from __maps_insert.

Fixes: 659ad3492b ("perf maps: Switch from rbtree to lazily sorted array for addresses")
Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: James Clark <james.clark@arm.com>
Cc: Steinar H . Gunderson <sesse@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240521165109.708593-2-irogers@google.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ian Rogers 2024-05-21 09:51:07 -07:00 committed by Greg Kroah-Hartman
parent e1d86efd46
commit a590885770
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/perf/util/maps.c
View File

@ -741,7 +741,6 @@ static unsigned int first_ending_after(struct maps *maps, const struct map *map)
*/
static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)
{
struct map **maps_by_address;
int err = 0;
FILE *fp = debug_file();
@ -749,12 +748,12 @@ sort_again:
if (!maps__maps_by_address_sorted(maps))
__maps__sort_by_address(maps);
maps_by_address = maps__maps_by_address(maps);
/*
* Iterate through entries where the end of the existing entry is
* greater-than the new map's start.
*/
for (unsigned int i = first_ending_after(maps, new); i < maps__nr_maps(maps); ) {
struct map **maps_by_address = maps__maps_by_address(maps);
struct map *pos = maps_by_address[i];
struct map *before = NULL, *after = NULL;
@ -821,8 +820,10 @@ sort_again:
/* Maps are still ordered, go to next one. */
i++;
if (after) {
__maps__insert(maps, after);
err = __maps__insert(maps, after);
map__put(after);
if (err)
goto out_err;
if (!maps__maps_by_address_sorted(maps)) {
/*
* Sorting broken so invariants don't
@ -851,7 +852,7 @@ sort_again:
check_invariants(maps);
}
/* Add the map. */
__maps__insert(maps, new);
err = __maps__insert(maps, new);
out_err:
return err;
}