Patch "perf maps: Fix use after free in __maps__fixup_overlap_and_insert" has been added to the 6.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    perf maps: Fix use after free in __maps__fixup_overlap_and_insert

to the 6.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     perf-maps-fix-use-after-free-in-__maps__fixup_overla.patch
and it can be found in the queue-6.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit a25f1068faea52dc37236e532ded26ac457c93ff
Author: Ian Rogers <irogers@xxxxxxxxxx>
Date:   Tue May 21 09:51:07 2024 -0700

    perf maps: Fix use after free in __maps__fixup_overlap_and_insert
    
    [ Upstream commit 0b90dfda222e38b7ca8dad6e098e36f5186f0b94 ]
    
    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: 659ad3492b91 ("perf maps: Switch from rbtree to lazily sorted array for addresses")
    Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
    Reviewed-by: James Clark <james.clark@xxxxxxx>
    Cc: Steinar H . Gunderson <sesse@xxxxxxxxxx>
    Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20240521165109.708593-2-irogers@xxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c
index 16b39db594f4c..eaada3e0f5b4e 100644
--- a/tools/perf/util/maps.c
+++ b/tools/perf/util/maps.c
@@ -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 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)
 	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 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)
 			/* 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 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)
 		check_invariants(maps);
 	}
 	/* Add the map. */
-	__maps__insert(maps, new);
+	err = __maps__insert(maps, new);
 out_err:
 	return err;
 }