Commit 47c68eb1 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Namhyung Kim
Browse files

perf header: Sanity check HEADER_HYBRID_TOPOLOGY 



Add upper bound check on nr_nodes in process_hybrid_topology() to
harden against malformed perf.data files (reuses MAX_PMU_MAPPINGS,
4096).

Cc: Ian Rogers <irogers@google.com>
Assisted-by: Claude Code:claude-opus-4-6
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent 110a6617

tools/perf/util/header.c

+12 −0
Original line number Diff line number Diff line
@@ -3450,6 +3450,18 @@ static int process_hybrid_topology(struct feat_fd *ff, 
	if (do_read_u32(ff, &nr))

		return -1;



	if (nr > MAX_PMU_MAPPINGS) {

		pr_err("Invalid HEADER_HYBRID_TOPOLOGY: nr_nodes (%u) > %u\n",

		       nr, MAX_PMU_MAPPINGS);

		return -1;

	}



	if (ff->size < sizeof(u32) + nr * 2 * sizeof(u32)) {

		pr_err("Invalid HEADER_HYBRID_TOPOLOGY: section too small (%zu) for %u nodes\n",

		       ff->size, nr);

		return -1;

	}



	nodes = calloc(nr, sizeof(*nodes));

	if (!nodes)

		return -ENOMEM;