Commit 92f1e8ad authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf arm-spe: Avoid potential buffer overrun 



SPE extended headers are > 1 byte so ensure the buffer contains at least
this before reading. This issue was detected by fuzzing.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andre Przywara <andre.przywara@arm.com>
Cc: Dave Martin <dave.martin@arm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Will Deacon <will@kernel.org>
Link: http://lore.kernel.org/lkml/20210407153955.317215-1-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f2013278

tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c

+3 −1
Original line number Diff line number Diff line
@@ -210,8 +210,10 @@ static int arm_spe_do_get_packet(const unsigned char *buf, size_t len, 


	if ((hdr & SPE_HEADER0_MASK2) == SPE_HEADER0_EXTENDED) {

		/* 16-bit extended format header */

		ext_hdr = 1;

		if (len == 1)

			return ARM_SPE_BAD_PACKET;



		ext_hdr = 1;

		hdr = buf[1];

		if (hdr == SPE_HEADER1_ALIGNMENT)

			return arm_spe_get_alignment(buf, len, packet);