From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A94DE2D23A4; Thu, 21 May 2026 01:10:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325847; cv=none; b=a/ON9WbmDqniDb5xXcZBkFzl+dF0H29m4fXWHLY8VkUAcaCSHHUUMWAHUZg2HwWOTcHmJ8+bBbsoGrHrvmnLKZNdCpvF1Ru080RaGUErK6K07ufLDcRRtvHro2jTOt3wKEhep4j53p/NsQgIkhtY6J/ZQS7pFOkicnZO06ZADO4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325847; c=relaxed/simple; bh=O5IvhDWeshfYqrZNQSc2tjwOxaXwOEenQJ2/KjprrcE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fp/GOK1RY4jE+BzMe1Pqq43zB0ASuB86eryR4Ema1NWN/joBx1B3VrVGarl2EWRIAcNr1BM1w7pncYQpGrlhVouS/SQ8Cvb7Aeaj06p2ms8CopsPyOR0PqF0nHHgUfVYhBBskYOSjjAY4LJq10W3ITnA0gQvSOAo41jHVZ8kCxc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H4fIWdOQ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H4fIWdOQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDF221F00A3B; Thu, 21 May 2026 01:10:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325845; bh=x2DiS5dQlfQkeOmqcRc7h8ztM2zJtuDKwavYaOLjDaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=H4fIWdOQ4mFtpfG/EYAPLXfT5/7NSl3iwg90sbqs4wqPO3nHRPHfxFdNU00qP5ePm FSeaS/B3dSx+RWcVZv+wH39CoVyydJ04SVzdFBOJrgnsfPHJIds/4YDQh5kgrYTE1a ghXkl30iyLwl67sCTc6XuiAtyzXa16zPyLHB0UcHf3ot2/DD/syGeLNRgH0EYy5crV tm2AsVUh7i6gA35YnmYXkxxu/bN8qq/XbybVgBwRKfwdBLC29bwW1odknK7ZPkVxG1 aOEhOmOEMpke2mpyKH45jsrtoQ4cRfwtBn7JJx9zcUMIGKKaQyAHI3F664h1ATWyOO 3QaOiYLr83eDg== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 01/27] perf session: Add minimum event size and alignment validation Date: Wed, 20 May 2026 22:09:46 -0300 Message-ID: <20260521011027.622268-2-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo Add a per-type minimum size table (perf_event__min_size[]) and enforce it before swap and processing, so that both cross-endian and native-endian paths are protected from accessing fields past the event boundary. The table uses offsetof() for types with trailing variable-length fields (filenames, strings, msg arrays) and sizeof() for fixed-size types. Zero entries mean no minimum beyond the 8-byte header already enforced by the reader. Undersized events are skipped with a warning in process_event and rejected in peek_event =E2=80=94 both checked before the swap handler runs, preventing OOB access on crafted event fields. Also reject events whose header.size is not 8-byte aligned. The kernel aligns all event sizes to sizeof(u64) =E2=80=94 see perf_event_comm_event() (ALIGN), perf_event_mmap_event(), perf_event_cgroup(), perf_event_ksymbol() (IS_ALIGNED loops), and perf_event_text_poke() (ALIGN) in kernel/events/core.c. An unaligned size means the file is corrupted or crafted; reject early so downstream code that divides by sizeof(u64) to compute array element counts gets exact results. Also guard event_swap() against crafted event types >=3D PERF_RECORD_HEADER_MAX to prevent OOB reads on the perf_event__swap_ops[] array. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 204 ++++++++++++++++++++++++++++++++------ 1 file changed, 173 insertions(+), 31 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 1e25892963b7857a..82ab29525a4b07e5 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1759,11 +1759,102 @@ int perf_session__deliver_synth_attr_event(struct = perf_session *session, return perf_session__deliver_synth_event(session, &ev.ev, NULL); } =20 -static void event_swap(union perf_event *event, bool sample_id_all) +/* + * Minimum event sizes indexed by type. Checked before swap and + * processing so that both cross-endian and native-endian paths + * are protected from accessing fields past the event boundary. + * Zero means no minimum beyond the 8-byte header (already + * enforced by the reader). + */ +static const u32 perf_event__min_size[PERF_RECORD_HEADER_MAX] =3D { + /* + * offsetof() + 1 for types with a trailing variable-length + * string (filename, comm, path, name, msg): the +1 ensures + * room for at least a null terminator. Full null-termination + * within the event boundary is checked separately. + * + * PERF_RECORD_SAMPLE is omitted: all64_swap is bounded by + * header.size, and the internal layout varies by sample_type + * so a fixed minimum is not meaningful. + */ + [PERF_RECORD_MMAP] =3D offsetof(struct perf_record_mmap, filename) + 1, + [PERF_RECORD_LOST] =3D sizeof(struct perf_record_lost), + [PERF_RECORD_COMM] =3D offsetof(struct perf_record_comm, comm) + 1, + [PERF_RECORD_EXIT] =3D sizeof(struct perf_record_fork), + [PERF_RECORD_THROTTLE] =3D sizeof(struct perf_record_throttle), + [PERF_RECORD_UNTHROTTLE] =3D sizeof(struct perf_record_throttle), + [PERF_RECORD_FORK] =3D sizeof(struct perf_record_fork), + /* + * The kernel dynamically sizes PERF_RECORD_READ based on + * attr.read_format =E2=80=94 the minimum has just pid + tid + value. + */ + [PERF_RECORD_READ] =3D offsetof(struct perf_record_read, time_enabled), + [PERF_RECORD_MMAP2] =3D offsetof(struct perf_record_mmap2, filename) += 1, + [PERF_RECORD_LOST_SAMPLES] =3D sizeof(struct perf_record_lost_samples), + [PERF_RECORD_AUX] =3D sizeof(struct perf_record_aux), + [PERF_RECORD_ITRACE_START] =3D sizeof(struct perf_record_itrace_start), + [PERF_RECORD_SWITCH] =3D sizeof(struct perf_event_header), + [PERF_RECORD_SWITCH_CPU_WIDE] =3D sizeof(struct perf_record_switch), + [PERF_RECORD_NAMESPACES] =3D sizeof(struct perf_record_namespaces), + [PERF_RECORD_CGROUP] =3D offsetof(struct perf_record_cgroup, path) + 1, + [PERF_RECORD_TEXT_POKE] =3D sizeof(struct perf_record_text_poke_event), + [PERF_RECORD_KSYMBOL] =3D offsetof(struct perf_record_ksymbol, name) += 1, + [PERF_RECORD_BPF_EVENT] =3D sizeof(struct perf_record_bpf_event), + [PERF_RECORD_HEADER_ATTR] =3D sizeof(struct perf_event_header) + PERF_A= TTR_SIZE_VER0, + [PERF_RECORD_HEADER_EVENT_TYPE] =3D sizeof(struct perf_record_header_ev= ent_type), + [PERF_RECORD_HEADER_TRACING_DATA] =3D sizeof(struct perf_record_header_tr= acing_data), + [PERF_RECORD_AUX_OUTPUT_HW_ID] =3D sizeof(struct perf_record_aux_output= _hw_id), + [PERF_RECORD_AUXTRACE_INFO] =3D sizeof(struct perf_record_auxtrace_info= ), + [PERF_RECORD_AUXTRACE] =3D sizeof(struct perf_record_auxtrace), + [PERF_RECORD_AUXTRACE_ERROR] =3D offsetof(struct perf_record_auxtrace_e= rror, msg) + 1, + [PERF_RECORD_THREAD_MAP] =3D sizeof(struct perf_record_thread_map), + /* Smallest valid variant is RANGE_CPUS: header(8) + type(2) + range(6) */ + [PERF_RECORD_CPU_MAP] =3D sizeof(struct perf_event_header) + + sizeof(__u16) + + sizeof(struct perf_record_range_cpu_map), + [PERF_RECORD_STAT_CONFIG] =3D sizeof(struct perf_record_stat_config), + [PERF_RECORD_STAT] =3D sizeof(struct perf_record_stat), + [PERF_RECORD_STAT_ROUND] =3D sizeof(struct perf_record_stat_round), + /* Union inflates sizeof; use fixed header fields as minimum */ + [PERF_RECORD_EVENT_UPDATE] =3D offsetof(struct perf_record_event_update= , scale), + [PERF_RECORD_TIME_CONV] =3D offsetof(struct perf_record_time_conv, tim= e_cycles), + [PERF_RECORD_ID_INDEX] =3D sizeof(struct perf_record_id_index), + [PERF_RECORD_HEADER_BUILD_ID] =3D sizeof(struct perf_record_header_buil= d_id), + [PERF_RECORD_HEADER_FEATURE] =3D sizeof(struct perf_record_header_featu= re), + [PERF_RECORD_COMPRESSED2] =3D sizeof(struct perf_record_compressed2), + [PERF_RECORD_BPF_METADATA] =3D sizeof(struct perf_record_bpf_metadata), + [PERF_RECORD_CALLCHAIN_DEFERRED] =3D sizeof(struct perf_event_header) + = sizeof(__u64), + /* + * SCHEDSTAT events have a version-dependent union after the + * fixed header fields; the minimum is the base (pre-union) + * portion so old and new versions both pass. + */ + [PERF_RECORD_SCHEDSTAT_CPU] =3D offsetof(struct perf_record_schedstat_c= pu, v15), + [PERF_RECORD_SCHEDSTAT_DOMAIN] =3D offsetof(struct perf_record_schedsta= t_domain, v15), +}; + +/* + * Return true if the event is too small for its declared type. + * Caller must ensure event->header.type < PERF_RECORD_HEADER_MAX. + * If min is non-NULL, stores the required minimum on failure. + */ +static bool perf_event__too_small(const union perf_event *event, u32 *min) { - perf_event__swap_op swap; + u32 min_sz =3D perf_event__min_size[event->header.type]; =20 - swap =3D perf_event__swap_ops[event->header.type]; + if (min_sz && event->header.size < min_sz) { + if (min) + *min =3D min_sz; + return true; + } + + return false; +} + +/* Caller must ensure event->header.type < PERF_RECORD_HEADER_MAX */ +static void event_swap(union perf_event *event, bool sample_id_all) +{ + perf_event__swap_op swap =3D perf_event__swap_ops[event->header.type]; if (swap) swap(event, sample_id_all); } @@ -1775,52 +1866,76 @@ int perf_session__peek_event(struct perf_session *s= ession, off_t file_offset, { union perf_event *event; size_t hdr_sz, rest; + u32 min_sz; int fd; =20 if (session->one_mmap && !session->header.needs_swap) { event =3D file_offset - session->one_mmap_offset + session->one_mmap_addr; - goto out_parse_sample; - } =20 - if (perf_data__is_pipe(session->data)) - return -1; + /* Every event must at least contain its own header */ + if (event->header.size < sizeof(struct perf_event_header)) + return -1; + } else { + if (perf_data__is_pipe(session->data)) + return -1; =20 - fd =3D perf_data__fd(session->data); - hdr_sz =3D sizeof(struct perf_event_header); + fd =3D perf_data__fd(session->data); + hdr_sz =3D sizeof(struct perf_event_header); =20 - if (buf_sz < hdr_sz) - return -1; + if (buf_sz < hdr_sz) + return -1; =20 - if (lseek(fd, file_offset, SEEK_SET) =3D=3D (off_t)-1 || - readn(fd, buf, hdr_sz) !=3D (ssize_t)hdr_sz) - return -1; + if (lseek(fd, file_offset, SEEK_SET) =3D=3D (off_t)-1 || + readn(fd, buf, hdr_sz) !=3D (ssize_t)hdr_sz) + return -1; =20 - event =3D (union perf_event *)buf; + event =3D (union perf_event *)buf; =20 - if (session->header.needs_swap) - perf_event_header__bswap(&event->header); + if (session->header.needs_swap) + perf_event_header__bswap(&event->header); =20 - if (event->header.size < hdr_sz || event->header.size > buf_sz) + if (event->header.size < hdr_sz || event->header.size > buf_sz) + return -1; + + buf +=3D hdr_sz; + rest =3D event->header.size - hdr_sz; + + if (readn(fd, buf, rest) !=3D (ssize_t)rest) + return -1; + } + + /* Event data is fully loaded =E2=80=94 expose so callers can advance */ + *event_ptr =3D event; + + if (event->header.type >=3D PERF_RECORD_HEADER_MAX) { + pr_warning("WARNING: peek_event: invalid event type %u\n", + event->header.type); return -1; + } =20 - buf +=3D hdr_sz; - rest =3D event->header.size - hdr_sz; + if (perf_event__too_small(event, &min_sz)) { + pr_warning("WARNING: peek_event: %s event size %u too small (min %u)\n", + perf_event__name(event->header.type), + event->header.size, min_sz); + return -1; + } =20 - if (readn(fd, buf, rest) !=3D (ssize_t)rest) + /* Kernel aligns all events to sizeof(u64); see process_event */ + if (event->header.size % sizeof(u64)) { + pr_warning("WARNING: peek_event: %s event size %u not aligned to %zu\n", + perf_event__name(event->header.type), + event->header.size, sizeof(u64)); return -1; + } =20 if (session->header.needs_swap) event_swap(event, evlist__sample_id_all(session->evlist)); =20 -out_parse_sample: - if (sample && event->header.type < PERF_RECORD_USER_TYPE_START && evlist__parse_sample(session->evlist, event, sample)) return -1; =20 - *event_ptr =3D event; - return 0; } =20 @@ -1858,16 +1973,29 @@ static s64 perf_session__process_event(struct perf_= session *session, { struct evlist *evlist =3D session->evlist; const struct perf_tool *tool =3D session->tool; + u32 min_sz; int ret; =20 - if (session->header.needs_swap) - event_swap(event, evlist__sample_id_all(evlist)); + /* + * The kernel aligns all event sizes to sizeof(u64) =E2=80=94 see + * perf_event_comm_event() (ALIGN), perf_event_mmap_event(), + * perf_event_cgroup(), perf_event_ksymbol() (IS_ALIGNED loops), + * and perf_event_text_poke() (ALIGN) in kernel/events/core.c. + * + * An unaligned size means the file is corrupted or crafted. + * Abort: there is no point continuing to read unaligned records + * because the caller advances rd->head by event->header.size, + * so every subsequent read would start at a misaligned offset, + * producing garbage headers for the rest of the file. + */ + if (event->header.size % sizeof(u64)) { + pr_err("ERROR: %s event size %u is not 8-byte aligned, aborting\n", + perf_event__name(event->header.type), + event->header.size); + return -EINVAL; + } =20 if (event->header.type >=3D PERF_RECORD_HEADER_MAX) { - /* perf should not support unaligned event, stop here. */ - if (event->header.size % sizeof(u64)) - return -EINVAL; - /* This perf is outdated and does not support the latest event type. */ ui__warning("Unsupported header type %u, please consider updating perf.\= n", event->header.type); @@ -1875,6 +2003,20 @@ static s64 perf_session__process_event(struct perf_s= ession *session, return event->header.size; } =20 + /* + * Skip rather than abort: a too-small-but-aligned event + * can be safely stepped over without misaligning the stream. + */ + if (perf_event__too_small(event, &min_sz)) { + pr_warning("WARNING: %s event size %u too small (min %u), skipping\n", + perf_event__name(event->header.type), + event->header.size, min_sz); + return 0; + } + + if (session->header.needs_swap) + event_swap(event, evlist__sample_id_all(evlist)); + events_stats__inc(&evlist->stats, event->header.type); =20 if (event->header.type >=3D PERF_RECORD_USER_TYPE_START) --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B63C2C15BE; Thu, 21 May 2026 01:10:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325850; cv=none; b=NtWsoZZlxcPe/48cyi8ClTLIDPXd6NZDzl7wOrttd9YzRU1eyn+Dobb98JC3Ui86LZRefONfR4XkMNocWzmU8/goWMtu1tmmuVhRe1YC43nmHi60uUl3LlVRVy6Y/KJsqGqyQ2dgdPeqrBIZUCIrxaYShpLy9XRaTBwmsIccuu0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325850; c=relaxed/simple; bh=OnqVr/x0PCFIuS9QoBjoftnmuBSOE+xs0TbXevOcqd4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uyuRe+rAMFyDcMsy6Ijmp/AyDVcpGqBfUD+xi8HK1sndVBgi6IxKcAqckWfjqyr0BlP5+mwz7JJamCFIcs7Pfsoeuyhco0R7JQ9c58Tfm0uyv1GVDC8ce0MHvWF9+4cKMfof4MO0+jFbFtFnP2z9NzKLqV/P5+8DLbHHZ4gjh/k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DZo1uLJu; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DZo1uLJu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E24AB1F000E9; Thu, 21 May 2026 01:10:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325849; bh=XbGi1j8FII0Y0rwll19PJjGMweR7zPiMUsJf/hVVrWg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DZo1uLJulVGu/6fTe8lY5d8ync2guGW/la03eWbg9S+yPk1cMpJNbFQt0O5cUUlkO rjIbp1wi1dQSQAa2qyF0J6uRup8MksSi20LV34/FSqKo1q9RQTGdyQxX6kBwOPD/hG b6ooOlzWVl/LFAowZEr0hJBi/14axpjisoGQ+VU4szfhfF2zCPM516Z26pS3twj05N QR8bWsOufI5Y9jG4lhs8SY74Sl+t4KslTE79Qh9a9IVLZC2n3WkpLaIR5eoqYWVgKG Zn6RHdTj8h+fLteKR2m8C2G/MmAAjGV56wGEzEX1yzKM8WF9pdNvRPKr4EWUQ+9BH+ IL/hCE7HxuYaw== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 02/27] perf tools: Fix event_contains() macro to verify full field extent Date: Wed, 20 May 2026 22:09:47 -0300 Message-ID: <20260521011027.622268-3-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo event_contains() checked whether a field's start offset was within the event (header.size > offsetof), but not whether the full field fit. A crafted event with header.size =3D offsetof(field) + 1 would pass the check, but an 8-byte access (bswap_64, direct read) would overrun the event boundary by up to 7 bytes. Fix the macro to verify the complete field: header.size >=3D offsetof(field) + sizeof(field) Also update all callers that check event_contains(time_cycles) but access later fields (time_mask, cap_user_time_zero, cap_user_time_short) to check for cap_user_time_short =E2=80=94 the last field accessed =E2=80=94 so the entire extended block is verified: tsc.c, arm-spe.c, cs-etm.c, jitdump.c. Note: session.c's perf_event__time_conv_swap() also guards on time_cycles but accesses time_mask =E2=80=94 a pre-existing issue not introduced by this macro change. It is fixed by a later patch in this series ("perf session: Add validated swap infrastructure with null-termination checks"), which decouples time_cycles and time_mask into independent per-field event_contains() checks. The struct assignment overread (session->time_conv =3D event->time_conv copies sizeof on a potentially shorter event) is separately fixed by "perf session: Use bounded copy for PERF_RECORD_TIME_CONV". Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/perf/include/perf/event.h | 9 ++++++++- tools/perf/util/arm-spe.c | 2 +- tools/perf/util/cs-etm.c | 2 +- tools/perf/util/jitdump.c | 2 +- tools/perf/util/tsc.c | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/lib/perf/include/perf/event.h b/tools/lib/perf/include/p= erf/event.h index 9043dc72b5d68d58..fdced574c889e503 100644 --- a/tools/lib/perf/include/perf/event.h +++ b/tools/lib/perf/include/perf/event.h @@ -8,7 +8,14 @@ #include #include /* pid_t */ =20 -#define event_contains(obj, mem) ((obj).header.size > offsetof(typeof(obj)= , mem)) +/* + * Verify the full field fits within the event, not just its start offset. + * Only valid for fixed-size scalar fields =E2=80=94 for trailing arrays l= ike + * filename[PATH_MAX], sizeof() evaluates to the declared maximum, not + * the actual string length, so this would spuriously return false. + */ +#define event_contains(obj, mem) \ + ((obj).header.size >=3D offsetof(typeof(obj), mem) + sizeof((obj).mem)) =20 struct perf_record_mmap { struct perf_event_header header; diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c index 31f05f46781092c1..552f063f126e6769 100644 --- a/tools/perf/util/arm-spe.c +++ b/tools/perf/util/arm-spe.c @@ -2002,7 +2002,7 @@ int arm_spe_process_auxtrace_info(union perf_event *e= vent, spe->tc.time_mult =3D tc->time_mult; spe->tc.time_zero =3D tc->time_zero; =20 - if (event_contains(*tc, time_cycles)) { + if (event_contains(*tc, cap_user_time_short)) { spe->tc.time_cycles =3D tc->time_cycles; spe->tc.time_mask =3D tc->time_mask; spe->tc.cap_user_time_zero =3D tc->cap_user_time_zero; diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 6ec48de29441012f..40c6ddfa8c8d91b6 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -3514,7 +3514,7 @@ int cs_etm__process_auxtrace_info_full(union perf_eve= nt *event, etm->tc.time_shift =3D tc->time_shift; etm->tc.time_mult =3D tc->time_mult; etm->tc.time_zero =3D tc->time_zero; - if (event_contains(*tc, time_cycles)) { + if (event_contains(*tc, cap_user_time_short)) { etm->tc.time_cycles =3D tc->time_cycles; etm->tc.time_mask =3D tc->time_mask; etm->tc.cap_user_time_zero =3D tc->cap_user_time_zero; diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c index 52e6ffac2b3e1039..18fd84a82153c2ab 100644 --- a/tools/perf/util/jitdump.c +++ b/tools/perf/util/jitdump.c @@ -409,7 +409,7 @@ static uint64_t convert_timestamp(struct jit_buf_desc *= jd, uint64_t timestamp) * checks the event size and assigns these extended fields if these * fields are contained in the event. */ - if (event_contains(*time_conv, time_cycles)) { + if (event_contains(*time_conv, cap_user_time_short)) { tc.time_cycles =3D time_conv->time_cycles; tc.time_mask =3D time_conv->time_mask; tc.cap_user_time_zero =3D time_conv->cap_user_time_zero; diff --git a/tools/perf/util/tsc.c b/tools/perf/util/tsc.c index 511a517ce613dff1..ebf289bf6b9d9add 100644 --- a/tools/perf/util/tsc.c +++ b/tools/perf/util/tsc.c @@ -127,7 +127,7 @@ size_t perf_event__fprintf_time_conv(union perf_event *= event, FILE *fp) * when supported cap_user_time_short, for backward compatibility, * prints the extended fields only if they are contained in the event. */ - if (event_contains(*tc, time_cycles)) { + if (event_contains(*tc, cap_user_time_short)) { ret +=3D fprintf(fp, "... Time Cycles %" PRI_lu64 "\n", tc->time_cycles); ret +=3D fprintf(fp, "... Time Mask %#" PRI_lx64 "\n", --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 307132D47F1; Thu, 21 May 2026 01:10:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325854; cv=none; b=XI1AjJ94fiPn1uE35yLax6SxhMzYKWqDvB1Kxmm41XooL2wHS+iz5nBf7ZvnmsNcwASRtyKTuaS5CAaVBTVUeVf+mJikuyW3cPhiCcAeLxJG5FOcPgZZJA3BUEmxQCwVAgvO4lTOWbgJxE/fw5Q7Qow5zzh6mg0Ov+9C6/i+dec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325854; c=relaxed/simple; bh=+FrKb/aPODbOMn4tQ14jFX4fEXNRcobwejc6zdUYsII=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GVDfHgjmeC5eLaIukK+rjq/Qd//19vr5S4Svaem88t2pE+op9VeBlF3Kl1frqyXyg+QhunAdDd5/fLHj8vujBAc3VE53IVQnKJffUhV1YD/CEGaL0gy3brOd32bkRvBEuwC+dgpaRnqnsVnr/yU8nKftoQxWSjOX5udhys7/QHk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hl9szDMm; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hl9szDMm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1E571F00A3B; Thu, 21 May 2026 01:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325852; bh=k+eYrXi6ugs6c61M2VwpDukIgVhLCh3dx5xvKu/yrMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hl9szDMmlg50THA7ydEQI6kui5KdkzOxd3hz6swEzCuT2BerCCOFYLxKcNOUYWpeN KhXueAZ0xzKE6KWPcYugU49aNuJU3wMk07Qjx1pnHhvMAXOCSQtvWFYuQBIh7VJIld ovWVCqbgj7t/U8209lhFxjEUY5lYBbFexhHDb5gsmgTMBPb+B/1qk+a2a8AxxXGLtj qIgbyoJHUqonRHFhj664f6Fads+YnU92l7hVYtI1hqn6FPtYnWrrzgs37xtuCy12KX fj1gM4mZd0bFPZOro0+ooUa9dQXkKw/ICvB2IfSAlglZjrBocRuYsn1jCGhEkZ6/ar gpRadf+gRGGUQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 03/27] perf zstd: Fix compression error path in zstd_compress_stream_to_records() Date: Wed, 20 May 2026 22:09:48 -0300 Message-ID: <20260521011027.622268-4-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo The error fallback does memcpy(dst, src, src_size) intending to store uncompressed data when compression fails, but this has three bugs: 1. dst has been advanced past the record header (and potentially past earlier compressed records), so the copy writes to the wrong offset in the output buffer. 2. src still points to the start of the input, not to the remaining uncompressed data at src + input.pos. On a second or later iteration, previously compressed data would be duplicated. 3. No check that dst_size >=3D src_size =E2=80=94 if the remaining output space is smaller, this is an out-of-bounds write. Replace with return -1 after resetting the ZSTD compression context via ZSTD_initCStream(). The -1 propagates through zstd_compress() -> record__pushfn() -> perf_mmap__push() to the recording loop, which breaks out and terminates recording. Add an out_child_no_flush label in __cmd_record() so the mmap-read failure path skips the final record__mmap_read_all() flush =E2=80=94 retrying the same read that just failed would just fail again, and the flush is only useful when the mmap data is intact but the control path (auxtrace, switch_output) had an error. Consolidate all error paths through a single 'reset' label to ensure the compression context is always reset on failure =E2=80=94 including the output-buffer-full path, where a bare return without resetting would leave stale stream state that corrupts output if the caller retries. Also guard against process_header() writing the event header before the buffer-full check: add a sizeof(perf_event_header) pre-check so the callback never writes past the output buffer. Guard against ZSTD making no progress: if output.pos is zero after ZSTD_compressStream(), calling process_header(record, 0) would re-trigger header initialization, double-subtracting the header size from dst_size and underflowing the unsigned counter. Also fix two pre-existing issues in the same function: - Add a dst_size guard before subtracting the record header size: if the output buffer is nearly full, the unsigned dst_size -=3D size underflows to a huge value, causing ZSTD_compressStream to write past the buffer boundary. - Check the ZSTD_initCStream() return value and log an error if the context reset itself fails. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 6 +++++- tools/perf/util/zstd.c | 27 +++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index cc601796b2c8ae60..f1877bac815d76b2 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -2743,7 +2743,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) trigger_error(&auxtrace_snapshot_trigger); trigger_error(&switch_output_trigger); err =3D -1; - goto out_child; + goto out_child_no_flush; } =20 if (auxtrace_record__snapshot_started) { @@ -2890,6 +2890,10 @@ static int __cmd_record(struct record *rec, int argc= , const char **argv) out_child: record__stop_threads(rec); record__mmap_read_all(rec, true); + goto out_free_threads; +out_child_no_flush: + /* mmap read already failed =E2=80=94 retrying would just fail again */ + record__stop_threads(rec); out_free_threads: record__free_thread_data(rec); evlist__finalize_ctlfd(rec->evlist); diff --git a/tools/perf/util/zstd.c b/tools/perf/util/zstd.c index 57027e0ac7b658a8..ecda9deb53b738fa 100644 --- a/tools/perf/util/zstd.c +++ b/tools/perf/util/zstd.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 =20 #include +#include =20 #include "util/compress.h" #include "util/debug.h" @@ -54,7 +55,13 @@ ssize_t zstd_compress_stream_to_records(struct zstd_data= *data, void *dst, size_ =20 while (input.pos < input.size) { record =3D dst; + /* process_header writes the event header into record */ + if (dst_size < sizeof(struct perf_event_header)) + goto reset; size =3D process_header(record, 0); + /* Output buffer full =E2=80=94 cannot fit even the record header */ + if (size > dst_size) + goto reset; compressed +=3D size; dst +=3D size; dst_size -=3D size; @@ -65,10 +72,18 @@ ssize_t zstd_compress_stream_to_records(struct zstd_dat= a *data, void *dst, size_ if (ZSTD_isError(ret)) { pr_err("failed to compress %ld bytes: %s\n", (long)src_size, ZSTD_getErrorName(ret)); - memcpy(dst, src, src_size); - return src_size; + goto reset; } size =3D output.pos; + /* + * No progress: ZSTD couldn't emit any bytes into the + * remaining output buffer. Calling process_header + * with size=3D0 would re-trigger header initialization, + * double-subtracting the header size from dst_size and + * underflowing the unsigned counter. + */ + if (size =3D=3D 0) + goto reset; size =3D process_header(record, size); compressed +=3D size; dst +=3D size; @@ -76,6 +91,14 @@ ssize_t zstd_compress_stream_to_records(struct zstd_data= *data, void *dst, size_ } =20 return compressed; + +reset: + /* Reset so the context is usable if the caller retries */ + ret =3D ZSTD_initCStream(data->cstream, data->comp_level); + if (ZSTD_isError(ret)) + pr_err("failed to reset compression context: %s\n", + ZSTD_getErrorName(ret)); + return -1; } =20 size_t zstd_decompress_stream(struct zstd_data *data, void *src, size_t sr= c_size, --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F42282DB7A9; Thu, 21 May 2026 01:10:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325858; cv=none; b=ffViOdkEu5tmul+31Yb/80g1fVBFVxyVv2wZzTeLA4XbGmQicfzfIJVbhO9FMsf3uqf0qeG9cQd+aKFOlG89e2h+/8rJpaDVn2b5T+4dY847WRhGp7u15adqOfA6sROHC4aDNys+WiYbzXgHn0WOnbSnMuVu7N4JK977oE7lc74= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325858; c=relaxed/simple; bh=t4MWiZOVnbvgN1FLY3y20WYpEcIeoyhE5ptaJr2ZZp4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=s98091/nWrHhdK2C+7CPzmZDbSq9VY/lidMghRRQemheTqOubbEF7a6oOn/8NU1nO43fkZjU4MZ0g8AyenKGQnlTOUlMsg5K5o1goqRnmDHkYFh4m2zce6hS1L0XGXyNOsBm89cxfWRy7ORVMNuyH1IiK3zFgM2dV4mfTXQnZmk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Q4DotYRv; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Q4DotYRv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 608641F000E9; Thu, 21 May 2026 01:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325856; bh=J8t0BS/K7fNTh75SuO9HWTTq8JhLusrqBgf02oogCjw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Q4DotYRvxvfau93jyhq5eJettLpITGjLghCVTZhl+3nXIeocaBPj2KYAQJ/I49EZj z0peXFxO2+I8JHCCISH2Cqdwzm4+mJNkDEcq2lJPqX1NLQqsmqhwhHt4it4PDmIE/I 6Mf31Wju1moHyTZazpG6anKOJaqZ0jaWDz726qmncoxN1rBeIqWdGGruqB9GZ3y8DG kdzdAjscvPTAF7tguXCZdCFSw4nEr2tzwoEGyv5Z60cWb/PTGP/5eXEdh3ohkmL9Tn to3FrXhauz7DYJs/dnSyxMTRxJi81jy621bDxWRuXWIqMwYiw6jqD4RlyPX+wEioJB JQVHLtky/5yqg== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 04/27] perf zstd: Fix multi-iteration decompression and error handling Date: Wed, 20 May 2026 22:09:49 -0300 Message-ID: <20260521011027.622268-5-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo zstd_decompress_stream() has two bugs in its multi-iteration loop: 1. After each ZSTD_decompressStream() call, the code advances output.dst by output.pos but doesn't reset output.pos to 0. ZSTD interprets output.pos relative to output.dst, so the next iteration writes at (dst + pos) + pos =3D dst + 2*pos, skipping a gap and potentially writing out of bounds. 2. On ZSTD_decompressStream() error, the loop executes break and returns output.pos (which is > 0 if some bytes were decompressed before the error). The caller checks !decomp_size and skips the error, silently accepting truncated or corrupted data. Fix both by removing the output buffer adjustment =E2=80=94 ZSTD correctly accumulates output.pos across calls without it. Return 0 on decompression error so the caller detects it. Add a no-progress guard to prevent infinite loops if the output buffer fills before all input is consumed. Note: the compressed event data_size is validated against header.size by a subsequent patch in this series ("perf tools: Harden compressed event processing"). Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/zstd.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/zstd.c b/tools/perf/util/zstd.c index ecda9deb53b738fa..21a0eb58597c21f9 100644 --- a/tools/perf/util/zstd.c +++ b/tools/perf/util/zstd.c @@ -123,14 +123,26 @@ size_t zstd_decompress_stream(struct zstd_data *data,= void *src, size_t src_size } } while (input.pos < input.size) { + size_t prev_in =3D input.pos; + size_t prev_out =3D output.pos; + ret =3D ZSTD_decompressStream(data->dstream, &output, &input); if (ZSTD_isError(ret)) { pr_err("failed to decompress (B): %zd -> %zd, dst_size %zd : %s\n", - src_size, output.size, dst_size, ZSTD_getErrorName(ret)); - break; + src_size, output.pos, dst_size, ZSTD_getErrorName(ret)); + return 0; } - output.dst =3D dst + output.pos; - output.size =3D dst_size - output.pos; + /* + * Neither stream advanced =E2=80=94 decompression is stuck. + * Return 0 (error) rather than partial output: perf + * uses ZSTD_flushStream (not ZSTD_endStream), so the + * stream is continuous across compressed events. + * Discarding unconsumed input would desynchronize the + * decompressor, causing the next call to produce + * garbage that could be misinterpreted as valid events. + */ + if (input.pos =3D=3D prev_in && output.pos =3D=3D prev_out) + return 0; } =20 return output.pos; --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 785C22D77F7; Thu, 21 May 2026 01:11:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325861; cv=none; b=Yf/q8IJW9ssx6a2Jxdpg0rPsN60i5RYwtEXq3ImmVv3nErMWXuYSpBZjAzPcjDGEWXyrJC8mVfRVv4FsThTD9E16/rXuoMoD2K+XvhFLAQnqzEvwH1Y6xX0gcR6Pg0MbgUXeL7R9rQ9bGUDU80I+HXnhfkW1xIsTp1HUVWXMl0o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325861; c=relaxed/simple; bh=+Edn1W5D1lH3mkv/wNnAzNI8XUDdDqW4IdCE5fIqW3g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r8lL7/b5J2So+8gZiB6Mgmghz6VUGPrqIqJdkwYtiALggfCMCOIkzO/7H+ErwiWQyqKnJqnzNW2hbIaVwbPpuCCQ7XDbyfRhyVtVejsjgGiwFuffcux/5cD09jHRrg8UNjSeDRYvh3ruAxkoR7C71mlgOsYk1T2a1vEXEzsu3A4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Vaj13XG7; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Vaj13XG7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 201B21F00A3B; Thu, 21 May 2026 01:10:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325860; bh=8aEgEHClTwj637dxSQmr23LP5M7sCrrXvlG5+XKfntU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Vaj13XG7NJ1TxybJtiAH02nwDMcSpzsaCz0Dr3xV2F9fwsPGKVLfxSTLnqL8FPfxU j7Rkp1V0+3qHTxXhyhJ7eWfJfnAK4HZKc9zi2EquhYk9v6Temg0sXZYW2E5GjDtEMF ucNmavHzZ2En6+Rw44JVvZBiqjA2wTYebpjMsO2Vv/uEsAeAorSHHtnJ3vRtaLmy2N djqjekS8SJUUkLCC5dlEdDQfan8iVnOmnBWFpbW0ctkl1m+ykCVphZumVGPLGimLgK NFvsoD70aptAzzFwtgQxxlt3Mr9sZ6of4j4yk7j/y8ik+ZsdwE1hd2RvXG6XtXL5aW grDUoEkxrbiVA== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , "Claude Opus 4.6 (1M context)" Subject: [PATCH 05/27] perf session: Fix PERF_RECORD_READ swap and dump for variable-length events Date: Wed, 20 May 2026 22:09:50 -0300 Message-ID: <20260521011027.622268-6-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo The kernel dynamically sizes PERF_RECORD_READ based on attr.read_format: only the fields enabled by PERF_FORMAT_TOTAL_TIME_ENABLED, PERF_FORMAT_TOTAL_TIME_RUNNING, PERF_FORMAT_ID, and PERF_FORMAT_LOST are emitted, packed with no gaps. perf_event__read_swap() unconditionally byte-swapped time_enabled, time_running, and id at their fixed struct offsets, causing out-of-bounds access on smaller events and swapping the wrong bytes when not all format fields are present. It also swapped sample_id_all at a fixed offset past the full struct, which is wrong for shorter events. Replace the individual field swaps with a single mem_bswap_64() over the entire tail from value onward. Since every field after pid/tid is u64 regardless of which combination is present, this correctly handles any read_format combination and any trailing sample_id_all fields. Similarly, dump_read() accessed optional fields via fixed struct offsets, displaying values from wrong positions when not all format bits are set. Walk the packed u64 array sequentially instead, with bounds checks against event->header.size. Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 58 +++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 82ab29525a4b07e5..08fbd6a248ea949c 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -354,17 +354,21 @@ static void perf_event__task_swap(union perf_event *e= vent, bool sample_id_all) swap_sample_id_all(event, &event->fork + 1); } =20 -static void perf_event__read_swap(union perf_event *event, bool sample_id_= all) +static void perf_event__read_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { + size_t tail; + event->read.pid =3D bswap_32(event->read.pid); event->read.tid =3D bswap_32(event->read.tid); - event->read.value =3D bswap_64(event->read.value); - event->read.time_enabled =3D bswap_64(event->read.time_enabled); - event->read.time_running =3D bswap_64(event->read.time_running); - event->read.id =3D bswap_64(event->read.id); - - if (sample_id_all) - swap_sample_id_all(event, &event->read + 1); + /* + * Everything after pid/tid is u64: the read values (variable + * set determined by attr.read_format, which we don't have + * here) optionally followed by sample_id_all fields. + * Since all are u64, swap the entire remaining tail at once. + */ + tail =3D event->header.size - offsetof(struct perf_record_read, value); + mem_bswap_64(&event->read.value, tail); } =20 static void perf_event__aux_swap(union perf_event *event, bool sample_id_a= ll) @@ -1200,8 +1204,9 @@ static void dump_deferred_callchain(union perf_event = *event, struct perf_sample =20 static void dump_read(struct evsel *evsel, union perf_event *event) { - struct perf_record_read *read_event =3D &event->read; u64 read_format; + __u64 *array; + void *end; =20 if (!dump_trace) return; @@ -1213,18 +1218,37 @@ static void dump_read(struct evsel *evsel, union pe= rf_event *event) return; =20 read_format =3D evsel->core.attr.read_format; + /* + * The kernel packs only the enabled read_format fields + * after value, with no gaps. Walk the packed array + * instead of using fixed struct offsets. + */ + array =3D &event->read.value + 1; + end =3D (void *)event + event->header.size; =20 - if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) - printf("... time enabled : %" PRI_lu64 "\n", read_event->time_enabled); + if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) { + if ((void *)(array + 1) > end) + return; + printf("... time enabled : %" PRI_lu64 "\n", *array++); + } =20 - if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) - printf("... time running : %" PRI_lu64 "\n", read_event->time_running); + if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) { + if ((void *)(array + 1) > end) + return; + printf("... time running : %" PRI_lu64 "\n", *array++); + } =20 - if (read_format & PERF_FORMAT_ID) - printf("... id : %" PRI_lu64 "\n", read_event->id); + if (read_format & PERF_FORMAT_ID) { + if ((void *)(array + 1) > end) + return; + printf("... id : %" PRI_lu64 "\n", *array++); + } =20 - if (read_format & PERF_FORMAT_LOST) - printf("... lost : %" PRI_lu64 "\n", read_event->lost); + if (read_format & PERF_FORMAT_LOST) { + if ((void *)(array + 1) > end) + return; + printf("... lost : %" PRI_lu64 "\n", *array++); + } } =20 static struct machine *machines__find_for_cpumode(struct machines *machine= s, --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 476582E6CA8; Thu, 21 May 2026 01:11:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325865; cv=none; b=PwEe3AiFTkUN4wnzZWwaXA3ta0+oLdFJ79CfQOUcoEoyrsOwox90fpM2wRQm6pH6W7d92NLF50JtGTkasFjeFcd1EiY1YmLc53ofca5XfXiuam2EgFHZJO0vw/8wh4dLsKeGPFneb8am4FQxoSQXNXJvio4kfBoSD9FJS83TWhc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325865; c=relaxed/simple; bh=t+idU042Cx5ws/JW6K+HOlTGwWpBBhFprs8kNyeP2Do=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cRkShrosWlwGxmiFG6OGKavItW14VP7+llHP/RwTQ3QMGvm68ErTSYjpCvUBqI5hsZvO+bpmX6BFDMpM5ABKusvFB9MbgiX0vFysUAnsI+3V8XbC3Xwy6pRpEo3e6S55aOke5Pbof9N4qbKOgdA3euR/2HW/UUUnw5+G8abNPIM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WY2zM+aO; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WY2zM+aO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A143D1F000E9; Thu, 21 May 2026 01:11:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325863; bh=NCbYq53wCHBkxej+rb4q12NWrKbzq9frKq5i/xmjX0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WY2zM+aOvdsjej3wYVA7BNRX3TF5d+uWKqVfN6DBfWscoxBGWTi8RcwRZNY52qgQ4 JVQBb7vIVMiA/0IxgyYtl1KQyKQ63uEolzfllc2jU/D6a4bGu0BjXD9Fk6Pfh/6m3B gBjn4Sa6F27szTDcHc5W8EnPuOE78aOdZ+MpDms2KztkPjFX5fGd+KqEg45V2iQr0p w+K1CP/vY1aUiVysRiOnerfFIhx98cdgjKQrpY2Js/koFR48cSWj8a+GYc6yQkpych m+LBZvRZkmYuusfDQws+qH4mdxaE3V725Lw/s2FbNAWbIztrLwgwLCj8RId9jWrUi+ RjMvqOB44doQA== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 06/27] perf session: Fix swap_sample_id_all() crash on crafted events Date: Wed, 20 May 2026 22:09:51 -0300 Message-ID: <20260521011027.622268-7-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo swap_sample_id_all() calls BUG_ON(size % sizeof(u64)) which kills perf on any event where the sample_id_all tail is not 8-byte aligned. A crafted perf.data can trigger this trivially. Replace BUG_ON with a bounds check: skip the swap if the data pointer is past the end of the event, and only swap when there are bytes remaining. Note: the strlen calls in string-field swap handlers (comm, mmap, mmap2, cgroup) are replaced with bounded strnlen by the next patch in this series ("perf session: Add validated swap infrastructure with null-termination checks"). Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 08fbd6a248ea949c..415693a3450a7138 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -276,10 +276,14 @@ void perf_session__delete(struct perf_session *sessio= n) static void swap_sample_id_all(union perf_event *event, void *data) { void *end =3D (void *) event + event->header.size; - int size =3D end - data; + int size; =20 - BUG_ON(size % sizeof(u64)); - mem_bswap_64(data, size); + if (data >=3D end) + return; + + size =3D end - data; + if (size > 0) + mem_bswap_64(data, size); } =20 static void perf_event__all64_swap(union perf_event *event, --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2ED82ED860; Thu, 21 May 2026 01:11:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325870; cv=none; b=U5QG3ZKZp56Ydia3zChbRZYQ42WEXy8mQdTvZOrH1CFAeSn1XL2RxDz8j7l3xg6f0OGtyMgC34nBCMibeVLXcimePBONpjZb4RRT5gyePk5+prNDsCY5tsYieqRynBlQxUUP3xYJwadnPxF6fNBlxA1hphriB/TYmJyhNcRbCUw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325870; c=relaxed/simple; bh=GkXEu7YCfzkuEEUmDf+aECIQzdnSKfyzIbK1DgiL7Bw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RHY0K9wwUTlwZMIoMdWR3hFoRGUeDuR3k+zVgGCWr6UVlTpP9etLYr8+GeAShEOlT5BcUp3PQR/4iCuS4A8Xrkylf6k6O0H7aIB4oi/hS37RXmVeW00720xyZ/0uzenLrffE18aPQOHJML8CO2dbytUj0vHAf4vTOPKf+TOR+i8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=f9Rh/rKu; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="f9Rh/rKu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 611551F00A3B; Thu, 21 May 2026 01:11:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325867; bh=YCdn1X0ClheJiE3+BbVIBf/67D2rccH+absKQ8IENCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=f9Rh/rKuRDF7KeinCSNSU/NEwDYexK+ZrA8dDfXB8yvQb5dqRvh+YyTFmZi+XOhq+ +fXKAgAdAFKiC3Zje7tB/jLYl5zQB9m1MGbo/U74d11ZnKvn+rQOupM33jTDZiNeZk dzgVqyFb+nt2gp83H8zB+7sZS405sPmf/IGVtjodXSov5/yLoJngHx57xjTfSydUqz rxr7nOs5nzMtMqUEzzNIBUMXNVb4W7GJ9Etpy/OHOcMQdcaTsi1k3ubnpv9z6vn8un ZpJIEo3kJIqUoeaYSctkxK6aNJP/SjhPyXmP4GeUJUGtpRGAl9oXtCQ1NybuTO5ZRw XGwcy+K3t0EEw== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 07/27] perf session: Add validated swap infrastructure with null-termination checks Date: Wed, 20 May 2026 22:09:52 -0300 Message-ID: <20260521011027.622268-8-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo Change swap callbacks from void to int return so handlers can propagate errors. All 28 existing handlers are converted to return 0 on success, -1 on error. Three new handlers (KSYMBOL, BPF_EVENT, HEADER_FEATURE) are added returning int from the start, with sample_id_all handling for the kernel event types. event_swap() propagates the return to its callers (process_event and peek_event), which skip events that fail to swap. Add perf_event__check_nul() for null-termination enforcement on the common event delivery path for MMAP, MMAP2, COMM, CGROUP, and KSYMBOL events. Events with unterminated strings are skipped =E2=80=94 native-endian files are mapped read-only, so writing a NUL byte in place would segfault. Swap handler hardening: - Use strnlen bounded by event size (instead of strlen) in COMM/MMAP/MMAP2/CGROUP swap handlers, returning -1 on unterminated strings. - Bounds check text_poke old_len+new_len before computing the sample_id offset, returning -1 on overflow. Use offsetof() for the native-path check in machines__deliver_event() since sizeof() includes struct padding past the flexible array. - Fix PERF_RECORD_SWITCH sample_id_all: non-CPU_WIDE SWITCH events have sample_id immediately after the 8-byte header, not at sizeof(struct perf_record_switch) which is the CPU_WIDE variant size. - Fix perf_event__time_conv_swap(): decouple time_cycles and time_mask into independent per-field event_contains() checks, so each field is only swapped when the event is large enough to contain it. The original code guarded both fields under a single time_cycles check, which would swap time_mask on a short event that contains time_cycles but not time_mask. - Handle ABI0 (attr.size =3D=3D 0) in perf_event__attr_swap() by substituting PERF_ATTR_SIZE_VER0, so bswap_safe() correctly swaps VER0 fields instead of skipping everything. - peek_events: on swap failure, advance past the malformed entry instead of aborting the loop. Note: the nr-field bounds checks for namespaces, thread_map, cpu_map, and stat_config arrays are added by a subsequent patch ("perf session: Validate nr fields against event size on both swap and common paths"). The HEADER_ATTR attr.size validation is added by ("perf session: Validate HEADER_ATTR attr.size before swapping"). By establishing the int-returning swap infrastructure first, all subsequent hardening patches can use direct error returns from day one =E2=80=94 no poison values, no workarounds for void return. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 389 ++++++++++++++++++++++++++++++-------- 1 file changed, 309 insertions(+), 80 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 415693a3450a7138..8c5b3323d0ee0823 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -286,28 +286,41 @@ static void swap_sample_id_all(union perf_event *even= t, void *data) mem_bswap_64(data, size); } =20 -static void perf_event__all64_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__all64_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { struct perf_event_header *hdr =3D &event->header; - mem_bswap_64(hdr + 1, event->header.size - sizeof(*hdr)); + size_t size =3D event->header.size - sizeof(*hdr); + + mem_bswap_64(hdr + 1, size); + return 0; } =20 -static void perf_event__comm_swap(union perf_event *event, bool sample_id_= all) +static int perf_event__comm_swap(union perf_event *event, bool sample_id_a= ll) { event->comm.pid =3D bswap_32(event->comm.pid); event->comm.tid =3D bswap_32(event->comm.tid); =20 if (sample_id_all) { void *data =3D &event->comm.comm; + void *end =3D (void *)event + event->header.size; + size_t len =3D strnlen(data, end - data); =20 - data +=3D PERF_ALIGN(strlen(data) + 1, sizeof(u64)); + /* + * No NUL within the event boundary =E2=80=94 can't locate where + * sample_id_all starts. Reject so the event is skipped + * rather than swapping garbage. + */ + if (len =3D=3D (size_t)(end - data)) + return -1; + data +=3D PERF_ALIGN(len + 1, sizeof(u64)); swap_sample_id_all(event, data); } + return 0; } =20 -static void perf_event__mmap_swap(union perf_event *event, - bool sample_id_all) +static int perf_event__mmap_swap(union perf_event *event, + bool sample_id_all) { event->mmap.pid =3D bswap_32(event->mmap.pid); event->mmap.tid =3D bswap_32(event->mmap.tid); @@ -317,13 +330,19 @@ static void perf_event__mmap_swap(union perf_event *e= vent, =20 if (sample_id_all) { void *data =3D &event->mmap.filename; + void *end =3D (void *)event + event->header.size; + size_t len =3D strnlen(data, end - data); =20 - data +=3D PERF_ALIGN(strlen(data) + 1, sizeof(u64)); + /* See comment in perf_event__comm_swap() */ + if (len =3D=3D (size_t)(end - data)) + return -1; + data +=3D PERF_ALIGN(len + 1, sizeof(u64)); swap_sample_id_all(event, data); } + return 0; } =20 -static void perf_event__mmap2_swap(union perf_event *event, +static int perf_event__mmap2_swap(union perf_event *event, bool sample_id_all) { event->mmap2.pid =3D bswap_32(event->mmap2.pid); @@ -341,12 +360,19 @@ static void perf_event__mmap2_swap(union perf_event *= event, =20 if (sample_id_all) { void *data =3D &event->mmap2.filename; + void *end =3D (void *)event + event->header.size; + size_t len =3D strnlen(data, end - data); =20 - data +=3D PERF_ALIGN(strlen(data) + 1, sizeof(u64)); + /* See comment in perf_event__comm_swap() */ + if (len =3D=3D (size_t)(end - data)) + return -1; + data +=3D PERF_ALIGN(len + 1, sizeof(u64)); swap_sample_id_all(event, data); } + return 0; } -static void perf_event__task_swap(union perf_event *event, bool sample_id_= all) + +static int perf_event__task_swap(union perf_event *event, bool sample_id_a= ll) { event->fork.pid =3D bswap_32(event->fork.pid); event->fork.tid =3D bswap_32(event->fork.tid); @@ -356,10 +382,11 @@ static void perf_event__task_swap(union perf_event *e= vent, bool sample_id_all) =20 if (sample_id_all) swap_sample_id_all(event, &event->fork + 1); + return 0; } =20 -static void perf_event__read_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__read_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { size_t tail; =20 @@ -373,9 +400,10 @@ static void perf_event__read_swap(union perf_event *ev= ent, */ tail =3D event->header.size - offsetof(struct perf_record_read, value); mem_bswap_64(&event->read.value, tail); + return 0; } =20 -static void perf_event__aux_swap(union perf_event *event, bool sample_id_a= ll) +static int perf_event__aux_swap(union perf_event *event, bool sample_id_al= l) { event->aux.aux_offset =3D bswap_64(event->aux.aux_offset); event->aux.aux_size =3D bswap_64(event->aux.aux_size); @@ -383,19 +411,21 @@ static void perf_event__aux_swap(union perf_event *ev= ent, bool sample_id_all) =20 if (sample_id_all) swap_sample_id_all(event, &event->aux + 1); + return 0; } =20 -static void perf_event__itrace_start_swap(union perf_event *event, - bool sample_id_all) +static int perf_event__itrace_start_swap(union perf_event *event, + bool sample_id_all) { event->itrace_start.pid =3D bswap_32(event->itrace_start.pid); event->itrace_start.tid =3D bswap_32(event->itrace_start.tid); =20 if (sample_id_all) swap_sample_id_all(event, &event->itrace_start + 1); + return 0; } =20 -static void perf_event__switch_swap(union perf_event *event, bool sample_i= d_all) +static int perf_event__switch_swap(union perf_event *event, bool sample_id= _all) { if (event->header.type =3D=3D PERF_RECORD_SWITCH_CPU_WIDE) { event->context_switch.next_prev_pid =3D @@ -404,30 +434,45 @@ static void perf_event__switch_swap(union perf_event = *event, bool sample_id_all) bswap_32(event->context_switch.next_prev_tid); } =20 - if (sample_id_all) - swap_sample_id_all(event, &event->context_switch + 1); + if (sample_id_all) { + /* + * PERF_RECORD_SWITCH has no fields beyond the header; + * SWITCH_CPU_WIDE adds pid/tid. Use the right offset + * so sample_id starts at the correct position. + */ + if (event->header.type =3D=3D PERF_RECORD_SWITCH) + swap_sample_id_all(event, (void *)event + sizeof(event->header)); + else + swap_sample_id_all(event, &event->context_switch + 1); + } + return 0; } =20 -static void perf_event__text_poke_swap(union perf_event *event, bool sampl= e_id_all) +static int perf_event__text_poke_swap(union perf_event *event, bool sample= _id_all) { event->text_poke.addr =3D bswap_64(event->text_poke.addr); event->text_poke.old_len =3D bswap_16(event->text_poke.old_len); event->text_poke.new_len =3D bswap_16(event->text_poke.new_len); =20 if (sample_id_all) { + void *data =3D &event->text_poke.old_len; + void *end =3D (void *)event + event->header.size; size_t len =3D sizeof(event->text_poke.old_len) + sizeof(event->text_poke.new_len) + event->text_poke.old_len + event->text_poke.new_len; - void *data =3D &event->text_poke.old_len; =20 + /* old_len + new_len exceeds event =E2=80=94 can't find sample_id_all */ + if (data + len > end) + return -1; data +=3D PERF_ALIGN(len, sizeof(u64)); swap_sample_id_all(event, data); } + return 0; } =20 -static void perf_event__throttle_swap(union perf_event *event, - bool sample_id_all) +static int perf_event__throttle_swap(union perf_event *event, + bool sample_id_all) { event->throttle.time =3D bswap_64(event->throttle.time); event->throttle.id =3D bswap_64(event->throttle.id); @@ -435,10 +480,11 @@ static void perf_event__throttle_swap(union perf_even= t *event, =20 if (sample_id_all) swap_sample_id_all(event, &event->throttle + 1); + return 0; } =20 -static void perf_event__namespaces_swap(union perf_event *event, - bool sample_id_all) +static int perf_event__namespaces_swap(union perf_event *event, + bool sample_id_all) { u64 i; =20 @@ -455,18 +501,25 @@ static void perf_event__namespaces_swap(union perf_ev= ent *event, =20 if (sample_id_all) swap_sample_id_all(event, &event->namespaces.link_info[i]); + return 0; } =20 -static void perf_event__cgroup_swap(union perf_event *event, bool sample_i= d_all) +static int perf_event__cgroup_swap(union perf_event *event, bool sample_id= _all) { event->cgroup.id =3D bswap_64(event->cgroup.id); =20 if (sample_id_all) { void *data =3D &event->cgroup.path; + void *end =3D (void *)event + event->header.size; + size_t len =3D strnlen(data, end - data); =20 - data +=3D PERF_ALIGN(strlen(data) + 1, sizeof(u64)); + /* See comment in perf_event__comm_swap() */ + if (len =3D=3D (size_t)(end - data)) + return -1; + data +=3D PERF_ALIGN(len + 1, sizeof(u64)); swap_sample_id_all(event, data); } + return 0; } =20 static u8 revbyte(u8 b) @@ -507,9 +560,19 @@ void perf_event__attr_swap(struct perf_event_attr *att= r) attr->type =3D bswap_32(attr->type); attr->size =3D bswap_32(attr->size); =20 -#define bswap_safe(f, n) \ - (attr->size > (offsetof(struct perf_event_attr, f) + \ - sizeof(attr->f) * (n))) + /* + * ABI0: size =3D=3D 0 means the producer didn't set it. + * Assume PERF_ATTR_SIZE_VER0 so bswap_safe() below + * correctly swaps the VER0 fields instead of skipping + * everything. Same convention as read_attr(). + */ + if (!attr->size) + attr->size =3D PERF_ATTR_SIZE_VER0; + +/* Verify the full field extent fits, not just its start offset */ +#define bswap_safe(f, n) \ + (attr->size >=3D (offsetof(struct perf_event_attr, f) + \ + sizeof(attr->f) * ((n) + 1))) #define bswap_field(f, sz) \ do { \ if (bswap_safe(f, 0)) \ @@ -547,8 +610,8 @@ do { \ #undef bswap_safe } =20 -static void perf_event__hdr_attr_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__hdr_attr_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { size_t size; =20 @@ -557,30 +620,34 @@ static void perf_event__hdr_attr_swap(union perf_even= t *event, size =3D event->header.size; size -=3D perf_record_header_attr_id(event) - (void *)event; mem_bswap_64(perf_record_header_attr_id(event), size); + return 0; } =20 -static void perf_event__event_update_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__event_update_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { event->event_update.type =3D bswap_64(event->event_update.type); event->event_update.id =3D bswap_64(event->event_update.id); + return 0; } =20 -static void perf_event__event_type_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__event_type_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { event->event_type.event_type.event_id =3D bswap_64(event->event_type.event_type.event_id); + return 0; } =20 -static void perf_event__tracing_data_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__tracing_data_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { event->tracing_data.size =3D bswap_32(event->tracing_data.size); + return 0; } =20 -static void perf_event__auxtrace_info_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__auxtrace_info_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { size_t size; =20 @@ -589,10 +656,11 @@ static void perf_event__auxtrace_info_swap(union perf= _event *event, size =3D event->header.size; size -=3D (void *)&event->auxtrace_info.priv - (void *)event; mem_bswap_64(event->auxtrace_info.priv, size); + return 0; } =20 -static void perf_event__auxtrace_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__auxtrace_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { event->auxtrace.size =3D bswap_64(event->auxtrace.size); event->auxtrace.offset =3D bswap_64(event->auxtrace.offset); @@ -600,10 +668,11 @@ static void perf_event__auxtrace_swap(union perf_even= t *event, event->auxtrace.idx =3D bswap_32(event->auxtrace.idx); event->auxtrace.tid =3D bswap_32(event->auxtrace.tid); event->auxtrace.cpu =3D bswap_32(event->auxtrace.cpu); + return 0; } =20 -static void perf_event__auxtrace_error_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__auxtrace_error_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { event->auxtrace_error.type =3D bswap_32(event->auxtrace_error.type); event->auxtrace_error.code =3D bswap_32(event->auxtrace_error.code); @@ -618,10 +687,11 @@ static void perf_event__auxtrace_error_swap(union per= f_event *event, event->auxtrace_error.machine_pid =3D bswap_32(event->auxtrace_error.mac= hine_pid); event->auxtrace_error.vcpu =3D bswap_32(event->auxtrace_error.vcpu); } + return 0; } =20 -static void perf_event__thread_map_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__thread_map_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { unsigned i; =20 @@ -629,10 +699,11 @@ static void perf_event__thread_map_swap(union perf_ev= ent *event, =20 for (i =3D 0; i < event->thread_map.nr; i++) event->thread_map.entries[i].pid =3D bswap_64(event->thread_map.entries[= i].pid); + return 0; } =20 -static void perf_event__cpu_map_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__cpu_map_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { struct perf_record_cpu_map_data *data =3D &event->cpu_map.data; =20 @@ -670,20 +741,22 @@ static void perf_event__cpu_map_swap(union perf_event= *event, default: break; } + return 0; } =20 -static void perf_event__stat_config_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__stat_config_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { u64 size; =20 size =3D bswap_64(event->stat_config.nr) * sizeof(event->stat_config.dat= a[0]); size +=3D 1; /* nr item itself */ mem_bswap_64(&event->stat_config.nr, size); + return 0; } =20 -static void perf_event__stat_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__stat_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { event->stat.id =3D bswap_64(event->stat.id); event->stat.thread =3D bswap_32(event->stat.thread); @@ -691,44 +764,90 @@ static void perf_event__stat_swap(union perf_event *e= vent, event->stat.val =3D bswap_64(event->stat.val); event->stat.ena =3D bswap_64(event->stat.ena); event->stat.run =3D bswap_64(event->stat.run); + return 0; } =20 -static void perf_event__stat_round_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__stat_round_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { event->stat_round.type =3D bswap_64(event->stat_round.type); event->stat_round.time =3D bswap_64(event->stat_round.time); + return 0; } =20 -static void perf_event__time_conv_swap(union perf_event *event, - bool sample_id_all __maybe_unused) +static int perf_event__time_conv_swap(union perf_event *event, + bool sample_id_all __maybe_unused) { event->time_conv.time_shift =3D bswap_64(event->time_conv.time_shift); event->time_conv.time_mult =3D bswap_64(event->time_conv.time_mult); event->time_conv.time_zero =3D bswap_64(event->time_conv.time_zero); =20 - if (event_contains(event->time_conv, time_cycles)) { + if (event_contains(event->time_conv, time_cycles)) event->time_conv.time_cycles =3D bswap_64(event->time_conv.time_cycles); + if (event_contains(event->time_conv, time_mask)) event->time_conv.time_mask =3D bswap_64(event->time_conv.time_mask); - } + return 0; } =20 -static void +static int perf_event__schedstat_cpu_swap(union perf_event *event __maybe_unused, bool sample_id_all __maybe_unused) { /* FIXME */ + return 0; } =20 -static void +static int perf_event__schedstat_domain_swap(union perf_event *event __maybe_unused, bool sample_id_all __maybe_unused) { /* FIXME */ + return 0; +} + +static int perf_event__ksymbol_swap(union perf_event *event, + bool sample_id_all) +{ + event->ksymbol.addr =3D bswap_64(event->ksymbol.addr); + event->ksymbol.len =3D bswap_32(event->ksymbol.len); + event->ksymbol.ksym_type =3D bswap_16(event->ksymbol.ksym_type); + event->ksymbol.flags =3D bswap_16(event->ksymbol.flags); + + if (sample_id_all) { + void *data =3D &event->ksymbol.name; + void *end =3D (void *)event + event->header.size; + size_t len =3D strnlen(data, end - data); + + /* See comment in perf_event__comm_swap() */ + if (len =3D=3D (size_t)(end - data)) + return -1; + data +=3D PERF_ALIGN(len + 1, sizeof(u64)); + swap_sample_id_all(event, data); + } + return 0; } =20 -typedef void (*perf_event__swap_op)(union perf_event *event, - bool sample_id_all); +static int perf_event__bpf_event_swap(union perf_event *event, + bool sample_id_all) +{ + event->bpf.type =3D bswap_16(event->bpf.type); + event->bpf.flags =3D bswap_16(event->bpf.flags); + event->bpf.id =3D bswap_32(event->bpf.id); + + if (sample_id_all) + swap_sample_id_all(event, &event->bpf + 1); + return 0; +} + +static int perf_event__header_feature_swap(union perf_event *event, + bool sample_id_all __maybe_unused) +{ + event->feat.feat_id =3D bswap_64(event->feat.feat_id); + return 0; +} + +typedef int (*perf_event__swap_op)(union perf_event *event, + bool sample_id_all); =20 static perf_event__swap_op perf_event__swap_ops[] =3D { [PERF_RECORD_MMAP] =3D perf_event__mmap_swap, @@ -748,6 +867,8 @@ static perf_event__swap_op perf_event__swap_ops[] =3D { [PERF_RECORD_SWITCH_CPU_WIDE] =3D perf_event__switch_swap, [PERF_RECORD_NAMESPACES] =3D perf_event__namespaces_swap, [PERF_RECORD_CGROUP] =3D perf_event__cgroup_swap, + [PERF_RECORD_KSYMBOL] =3D perf_event__ksymbol_swap, + [PERF_RECORD_BPF_EVENT] =3D perf_event__bpf_event_swap, [PERF_RECORD_TEXT_POKE] =3D perf_event__text_poke_swap, [PERF_RECORD_AUX_OUTPUT_HW_ID] =3D perf_event__all64_swap, [PERF_RECORD_CALLCHAIN_DEFERRED] =3D perf_event__all64_swap, @@ -755,6 +876,7 @@ static perf_event__swap_op perf_event__swap_ops[] =3D { [PERF_RECORD_HEADER_EVENT_TYPE] =3D perf_event__event_type_swap, [PERF_RECORD_HEADER_TRACING_DATA] =3D perf_event__tracing_data_swap, [PERF_RECORD_HEADER_BUILD_ID] =3D NULL, + [PERF_RECORD_HEADER_FEATURE] =3D perf_event__header_feature_swap, [PERF_RECORD_ID_INDEX] =3D perf_event__all64_swap, [PERF_RECORD_AUXTRACE_INFO] =3D perf_event__auxtrace_info_swap, [PERF_RECORD_AUXTRACE] =3D perf_event__auxtrace_swap, @@ -1481,6 +1603,25 @@ static int session__flush_deferred_samples(struct pe= rf_session *session, return ret; } =20 +/* + * Return true if the string field is properly null-terminated + * within the event boundary. Native-endian files are mapped + * read-only (MAP_SHARED + PROT_READ) so we cannot write a + * null byte in place; skip the event instead. + */ +static bool perf_event__check_nul(const char *str, const void *end, const = char *event_name) +{ + size_t max_len =3D (const char *)end - str; + + if (max_len =3D=3D 0 || strnlen(str, max_len) =3D=3D max_len) { + pr_warning("WARNING: PERF_RECORD_%s: string not null-terminated, skippin= g event\n", + event_name); + return false; + } + + return true; +} + static int machines__deliver_event(struct machines *machines, struct evlist *evlist, union perf_event *event, @@ -1529,16 +1670,32 @@ static int machines__deliver_event(struct machines = *machines, } return evlist__deliver_sample(evlist, tool, event, sample, machine); case PERF_RECORD_MMAP: + if (!perf_event__check_nul(event->mmap.filename, + (void *)event + event->header.size, + "MMAP")) + return 0; return tool->mmap(tool, event, sample, machine); case PERF_RECORD_MMAP2: if (event->header.misc & PERF_RECORD_MISC_PROC_MAP_PARSE_TIMEOUT) ++evlist->stats.nr_proc_map_timeout; + if (!perf_event__check_nul(event->mmap2.filename, + (void *)event + event->header.size, + "MMAP2")) + return 0; return tool->mmap2(tool, event, sample, machine); case PERF_RECORD_COMM: + if (!perf_event__check_nul(event->comm.comm, + (void *)event + event->header.size, + "COMM")) + return 0; return tool->comm(tool, event, sample, machine); case PERF_RECORD_NAMESPACES: return tool->namespaces(tool, event, sample, machine); case PERF_RECORD_CGROUP: + if (!perf_event__check_nul(event->cgroup.path, + (void *)event + event->header.size, + "CGROUP")) + return 0; return tool->cgroup(tool, event, sample, machine); case PERF_RECORD_FORK: return tool->fork(tool, event, sample, machine); @@ -1577,11 +1734,25 @@ static int machines__deliver_event(struct machines = *machines, case PERF_RECORD_SWITCH_CPU_WIDE: return tool->context_switch(tool, event, sample, machine); case PERF_RECORD_KSYMBOL: + if (!perf_event__check_nul(event->ksymbol.name, + (void *)event + event->header.size, + "KSYMBOL")) + return 0; return tool->ksymbol(tool, event, sample, machine); case PERF_RECORD_BPF_EVENT: return tool->bpf(tool, event, sample, machine); - case PERF_RECORD_TEXT_POKE: + case PERF_RECORD_TEXT_POKE: { + /* offsetof(bytes), not sizeof =E2=80=94 sizeof includes padding past th= e flexible array */ + size_t text_poke_len =3D offsetof(struct perf_record_text_poke_event, by= tes) + + event->text_poke.old_len + + event->text_poke.new_len; + + if (event->header.size < text_poke_len) { + pr_warning("WARNING: PERF_RECORD_TEXT_POKE: old_len+new_len exceeds eve= nt, skipping\n"); + return 0; + } return tool->text_poke(tool, event, sample, machine); + } case PERF_RECORD_AUX_OUTPUT_HW_ID: return tool->aux_output_hw_id(tool, event, sample, machine); case PERF_RECORD_CALLCHAIN_DEFERRED: @@ -1787,12 +1958,28 @@ int perf_session__deliver_synth_attr_event(struct p= erf_session *session, return perf_session__deliver_synth_event(session, &ev.ev, NULL); } =20 +/* Caller must ensure event->header.type < PERF_RECORD_HEADER_MAX */ +static int event_swap(union perf_event *event, bool sample_id_all) +{ + perf_event__swap_op swap =3D perf_event__swap_ops[event->header.type]; + + if (swap) + return swap(event, sample_id_all); + return 0; +} + /* * Minimum event sizes indexed by type. Checked before swap and * processing so that both cross-endian and native-endian paths * are protected from accessing fields past the event boundary. * Zero means no minimum beyond the 8-byte header (already * enforced by the reader). + * + * These values represent the smallest event the kernel has ever + * emitted for each type, so they do not reject legitimate legacy + * perf.data files from older kernels. Variable-length events + * use offsetof() to the first variable field; the variable + * content is validated separately (e.g., perf_event__check_nul). */ static const u32 perf_event__min_size[PERF_RECORD_HEADER_MAX] =3D { /* @@ -1814,7 +2001,9 @@ static const u32 perf_event__min_size[PERF_RECORD_HEA= DER_MAX] =3D { [PERF_RECORD_FORK] =3D sizeof(struct perf_record_fork), /* * The kernel dynamically sizes PERF_RECORD_READ based on - * attr.read_format =E2=80=94 the minimum has just pid + tid + value. + * attr.read_format =E2=80=94 only the enabled fields are emitted, + * packed with no gaps. The minimum valid event has just + * pid + tid + one u64 value (no optional fields). */ [PERF_RECORD_READ] =3D offsetof(struct perf_record_read, time_enabled), [PERF_RECORD_MMAP2] =3D offsetof(struct perf_record_mmap2, filename) += 1, @@ -1836,14 +2025,25 @@ static const u32 perf_event__min_size[PERF_RECORD_H= EADER_MAX] =3D { [PERF_RECORD_AUXTRACE] =3D sizeof(struct perf_record_auxtrace), [PERF_RECORD_AUXTRACE_ERROR] =3D offsetof(struct perf_record_auxtrace_e= rror, msg) + 1, [PERF_RECORD_THREAD_MAP] =3D sizeof(struct perf_record_thread_map), - /* Smallest valid variant is RANGE_CPUS: header(8) + type(2) + range(6) */ + /* + * sizeof(perf_record_cpu_map) is 20 because the outer struct + * isn't packed and GCC adds 2 bytes of trailing padding. + * The smallest valid variant (RANGE_CPUS) is only 16 bytes: + * header(8) + type(2) + range_cpu_data(6). Per-variant + * bounds are checked in the swap handler via payload. + */ [PERF_RECORD_CPU_MAP] =3D sizeof(struct perf_event_header) + sizeof(__u16) + sizeof(struct perf_record_range_cpu_map), [PERF_RECORD_STAT_CONFIG] =3D sizeof(struct perf_record_stat_config), [PERF_RECORD_STAT] =3D sizeof(struct perf_record_stat), [PERF_RECORD_STAT_ROUND] =3D sizeof(struct perf_record_stat_round), - /* Union inflates sizeof; use fixed header fields as minimum */ + /* + * EVENT_UPDATE has a union whose largest member (cpus) + * inflates sizeof to 40, but SCALE events are only 32 + * and UNIT/NAME events can be even smaller. Use the + * fixed header fields (header + type + id) as minimum. + */ [PERF_RECORD_EVENT_UPDATE] =3D offsetof(struct perf_record_event_update= , scale), [PERF_RECORD_TIME_CONV] =3D offsetof(struct perf_record_time_conv, tim= e_cycles), [PERF_RECORD_ID_INDEX] =3D sizeof(struct perf_record_id_index), @@ -1879,14 +2079,6 @@ static bool perf_event__too_small(const union perf_e= vent *event, u32 *min) return false; } =20 -/* Caller must ensure event->header.type < PERF_RECORD_HEADER_MAX */ -static void event_swap(union perf_event *event, bool sample_id_all) -{ - perf_event__swap_op swap =3D perf_event__swap_ops[event->header.type]; - if (swap) - swap(event, sample_id_all); -} - int perf_session__peek_event(struct perf_session *session, off_t file_offs= et, void *buf, size_t buf_sz, union perf_event **event_ptr, @@ -1957,8 +2149,16 @@ int perf_session__peek_event(struct perf_session *se= ssion, off_t file_offset, return -1; } =20 - if (session->header.needs_swap) - event_swap(event, evlist__sample_id_all(session->evlist)); + if (session->header.needs_swap && + event_swap(event, evlist__sample_id_all(session->evlist))) { + /* + * The header was already swapped so header.size is + * valid =E2=80=94 expose the event so callers can advance + * past this malformed entry instead of aborting. + */ + *event_ptr =3D event; + return -1; + } =20 if (sample && event->header.type < PERF_RECORD_USER_TYPE_START && evlist__parse_sample(session->evlist, event, sample)) @@ -1976,11 +2176,25 @@ int perf_session__peek_events(struct perf_session *= session, u64 offset, int err; =20 do { + event =3D NULL; err =3D perf_session__peek_event(session, offset, buf, PERF_SAMPLE_MAX_SIZE, &event, NULL); - if (err) - return err; + if (err) { + /* + * peek_event sets event_ptr when it read enough + * to know the event size (min_sz and swap failures). + * If event is NULL or size is 0, we can't advance + * and must abort. Otherwise skip past this entry. + */ + if (event && event->header.size) { + offset +=3D event->header.size; + err =3D 0; + } else { + return err; + } + continue; + } =20 err =3D cb(session, event, offset, data); if (err) @@ -2042,8 +2256,12 @@ static s64 perf_session__process_event(struct perf_s= ession *session, return 0; } =20 - if (session->header.needs_swap) - event_swap(event, evlist__sample_id_all(evlist)); + if (session->header.needs_swap && + event_swap(event, evlist__sample_id_all(evlist))) { + pr_warning("WARNING: swap failed for %s event, skipping\n", + perf_event__name(event->header.type)); + return 0; + } =20 events_stats__inc(&evlist->stats, event->header.type); =20 @@ -2512,6 +2730,17 @@ reader__mmap(struct reader *rd, struct perf_session = *session) char *buf, **mmaps =3D rd->mmaps; u64 page_offset; =20 + /* + * Native-endian: MAP_SHARED + PROT_READ =E2=80=94 the kernel + * guarantees page-level coherence but a concurrent writer + * could modify the file between validation and use. This + * is a theoretical TOCTOU that affects the entire perf.data + * processing pipeline; fixing it would require copying each + * event to a private buffer before processing. + * + * Cross-endian: MAP_PRIVATE + PROT_WRITE =E2=80=94 swap handlers + * get a copy-on-write snapshot immune to concurrent writes. + */ mmap_prot =3D PROT_READ; mmap_flags =3D MAP_SHARED; =20 --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7DAC2D061C; Thu, 21 May 2026 01:11:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325873; cv=none; b=ite0vSCUBBM/6vKzopSAxIIbvlJKUgxf5V367vNa4WDsDN1e3/urPtTauholZfB09ZU3b4v7A64C8rcBwnRMHZgx79SIox0rEVxciET/FwXXJ/gPQLm1btt3032lO+lbHTG7PMMzIVjtlpKQ5BDWLlYEAQ/zSA5fCYC7p5oJXvE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325873; c=relaxed/simple; bh=bMb/y8mopZKJnCnZxdXlS2lptWBWt6mWs/0Zm+oNDzw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BljMRSz8zS/hM8GAMVX15bv+OCY3u51hDa8deGTHctzEey8hno5yIF+oiIQgpmv3pg6UEuK4jzE6wXfU6ZeNP/mDn12nIN+t9Lm9m21m9TDuYSoaRhmPy7IB4UIvz4lGUNfmX2OOnC+FmcL8jbdIqYzVuu8Tq/vCX3f+/kmzBRU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CpWFWbPl; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CpWFWbPl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 518D31F000E9; Thu, 21 May 2026 01:11:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325871; bh=Ql7lFw0ecD21nu8/w1VLWdfmz6yi+4QCdEXB++Y7Z8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CpWFWbPlaaZpl7fuC+cLIryf5A4bu35AjbpSrnPuof8WkEWBDMJgadd0qxpt9uJqo lX5qIy87Ej5+erPOhwScaA7MB7elo+UDt3MmRL1cYlnqdmZbsk7uRjp80hmvg0ZngB Tg2je2vKj8TIAbAfYQeBkjHYATQyxSpAQx0swMMeljlK5GcUwcrZGfkYYA5eMKJGN0 YJhVdKAeef45dr1E7SYeCCj0byNrEf8SiesU1Ro7wtGeY05CJ/rRvuxUh3PlMDLCe2 l9E78mDVo7JPxqcxrc9wUx1DbazLY10H7MvT6jDsZiao7YJpicyoPvbFozqFia+R0Q StodUannGn4Gw== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 08/27] perf session: Use bounded copy for PERF_RECORD_TIME_CONV Date: Wed, 20 May 2026 22:09:53 -0300 Message-ID: <20260521011027.622268-9-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo session->time_conv =3D event->time_conv copies sizeof(struct perf_record_time_conv) bytes unconditionally, but older kernels emit shorter TIME_CONV events without the time_cycles, time_mask, cap_user_time_zero, and cap_user_time_short fields. For a 32-byte event (the original format), this reads 24 bytes past the event boundary into adjacent mmap'd data. The garbage values end up in session->time_conv and can cause incorrect TSC conversion if cap_user_time_zero happens to be non-zero. Replace the struct assignment with a bounded memcpy capped at event->header.size, zeroing the remainder so extended fields default to off when absent. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 8c5b3323d0ee0823..d14d8055b2d10556 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1887,7 +1887,14 @@ static s64 perf_session__process_user_event(struct p= erf_session *session, err =3D tool->stat_round(tool, session, event); break; case PERF_RECORD_TIME_CONV: - session->time_conv =3D event->time_conv; + /* + * Bounded copy: older kernels emit a shorter struct + * without time_cycles/time_mask/cap_user_time_*. + * Zero the rest so extended fields default to off. + */ + memset(&session->time_conv, 0, sizeof(session->time_conv)); + memcpy(&session->time_conv, &event->time_conv, + min((size_t)event->header.size, sizeof(session->time_conv))); err =3D tool->time_conv(tool, session, event); break; case PERF_RECORD_HEADER_FEATURE: --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A90A42D73B5; Thu, 21 May 2026 01:11:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325877; cv=none; b=JmdzBoITky2kmzXS74av56wsawgkfze81FYDxiHoD9OIrILKfhbLvXPhsPrIWkAVFwM8ealWJCscHOnhSSHf714fIt9gb1pzl5jELLWO5MimIq+3AfkjUWU4ONavrzsbQS8NBE1mdN4Baif8+iivCE49MP6YTWYfBmjgM7fJTrE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325877; c=relaxed/simple; bh=dU3T8A9L6aiguGT1I1nH5t7SpakBxJwyw5ypxwLXfog=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TwmBZ6R63GW8DiiKRxpylC5l2ZcNa3fhHIU7lWxDNm+j0oCPuaImhZezfJIbSf5BEfVx1c+51/BMMXu9x2oQ12rfMgKiCaqATmBegN4R9OKk9OyLmuCA5Fg64k4NV8IBDK+MdDkFuOqBtjGdq6XcqB+hkrszU2rDHbpGnIbfrE4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=er+aCl9l; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="er+aCl9l" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 101111F00A3B; Thu, 21 May 2026 01:11:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325875; bh=kaDY3EVP+V/xqGD/fwjrZ6lJa4HKxJvH80O2UnQqbB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=er+aCl9lCjs8lCjPT/N413I5y9jTn5qYYcY8rvQ2HWLboLDb2ZaOAUQ4JNWdVHIU+ MGkELntnwCMcyZKWgpN0hDI0bZqQXEceuamW7r4Cbhj2G2X8DflS0CUkKGlb7HoYH/ yfh1OT70ymnlOD3w5hZcshnuCGAa4mJ7Iy8I7yipavbk+J4gL4ahVF8rzRrH1ZSmXK 198heHjWPRdFykaqR4YrhEEY8synHnS9Mf5ZYwNX/jmQ382qMNW0qJfPZ0RSoKwPoj 6pseTMh9gbBQDUuJF00P3ilMzyNfn40B6MUnsmtdBYQlcGCVkYVnqAywF71XPAIVfi l+qMCK4OEzOmQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 09/27] perf session: Validate HEADER_ATTR attr.size before swapping Date: Wed, 20 May 2026 22:09:54 -0300 Message-ID: <20260521011027.622268-10-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo Harden PERF_RECORD_HEADER_ATTR handling against crafted perf.data: - Validate attr.size: must be >=3D PERF_ATTR_SIZE_VER0, a multiple of sizeof(u64), and fit within the event payload. - Copy only min(attr.size, sizeof(struct perf_event_attr)) bytes into a local attr, zeroing the rest so legacy files don't leak adjacent event data into new fields. - Keep the original attr.size so perf_event__synthesize_attr() uses it for both allocation and ID-array placement. Fix perf_event__synthesize_attr() to use attr->size (not the compiled sizeof) for event allocation and layout, so perf inject correctly re-synthesizes attrs from files recorded by a different perf version. Without this, the ID array destination pointer (computed via perf_record_header_attr_id()) would be inconsistent with the allocation when attr->size differs from sizeof. Also fix the parse-no-sample-id-all test to set attr.size, which is now validated, and improve error handling in read_attr() for short reads and invalid attr sizes. Handle ABI0 pipe/inject events where attr.size is 0: use a local attr_size variable set to PERF_ATTR_SIZE_VER0 for both the bounded copy and ID array position, instead of writing back to the event. Native-endian files may be MAP_SHARED (read-only mmap), so writing to the event buffer would SIGSEGV. The swap path handles ABI0 in perf_event__attr_swap() which writes to the MAP_PRIVATE copy. header.size alignment is now validated centrally in perf_session__process_event() (see "Add minimum event size and alignment validation"). Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/parse-no-sample-id-all.c | 6 ++ tools/perf/util/header.c | 96 +++++++++++++++++++++-- tools/perf/util/session.c | 31 ++++++++ tools/perf/util/synthetic-events.c | 25 +++++- 4 files changed, 149 insertions(+), 9 deletions(-) diff --git a/tools/perf/tests/parse-no-sample-id-all.c b/tools/perf/tests/p= arse-no-sample-id-all.c index 50e68b7d43aad030..8ac862c94879f3a3 100644 --- a/tools/perf/tests/parse-no-sample-id-all.c +++ b/tools/perf/tests/parse-no-sample-id-all.c @@ -82,6 +82,9 @@ static int test__parse_no_sample_id_all(struct test_suite= *test __maybe_unused, .type =3D PERF_RECORD_HEADER_ATTR, .size =3D sizeof(struct test_attr_event), }, + .attr =3D { + .size =3D sizeof(struct perf_event_attr), + }, .id =3D 1, }; struct test_attr_event event2 =3D { @@ -89,6 +92,9 @@ static int test__parse_no_sample_id_all(struct test_suite= *test __maybe_unused, .type =3D PERF_RECORD_HEADER_ATTR, .size =3D sizeof(struct test_attr_event), }, + .attr =3D { + .size =3D sizeof(struct perf_event_attr), + }, .id =3D 2, }; struct perf_record_mmap event3 =3D { diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index f30e48eb3fc32da2..967c3d8ff12c8676 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -4770,9 +4770,15 @@ static int read_attr(int fd, struct perf_header *ph, if (sz =3D=3D 0) { /* assume ABI0 */ sz =3D PERF_ATTR_SIZE_VER0; + } else if (sz < PERF_ATTR_SIZE_VER0) { + pr_debug("bad attr size %zu, expected at least %d\n", + sz, PERF_ATTR_SIZE_VER0); + errno =3D EINVAL; + return -1; } else if (sz > our_sz) { pr_debug("file uses a more recent and unsupported ABI" " (%zu bytes extra)\n", sz - our_sz); + errno =3D EINVAL; return -1; } /* what we have not yet read and that we know about */ @@ -4782,11 +4788,21 @@ static int read_attr(int fd, struct perf_header *ph, ptr +=3D PERF_ATTR_SIZE_VER0; =20 ret =3D readn(fd, ptr, left); + if (ret <=3D 0) { + if (ret =3D=3D 0) + errno =3D EIO; + return -1; + } } /* read perf_file_section, ids are read in caller */ ret =3D readn(fd, &f_attr->ids, sizeof(f_attr->ids)); + if (ret <=3D 0) { + if (ret =3D=3D 0) + errno =3D EIO; + return -1; + } =20 - return ret <=3D 0 ? -1 : 0; + return 0; } =20 #ifdef HAVE_LIBTRACEEVENT @@ -5094,11 +5110,42 @@ int perf_event__process_attr(const struct perf_tool= *tool __maybe_unused, union perf_event *event, struct evlist **pevlist) { - u32 i, n_ids; + struct perf_event_attr attr; + u32 i, n_ids, raw_attr_size; u64 *ids; + size_t attr_size, copy_size; struct evsel *evsel; struct evlist *evlist =3D *pevlist; =20 + /* + * HEADER_ATTR event layout (pipe/inject mode): + * + * [header (8 bytes)] [attr (attr_size bytes)] [id0 id1 ... idN] + * |<------------------ header.size --------------------------->| + * + * attr_size varies across perf versions: VER0 =3D 64 bytes, + * current sizeof(struct perf_event_attr) =3D larger. A newer + * producer may emit a larger attr than we understand. + * + * attr.size =3D=3D 0 (ABI0) means the producer didn't set it + * (e.g., bench/inject-buildid, older perf). Treat as VER0. + * + * Require 8-byte alignment so the u64 ID array is aligned + * and attr.size fits cleanly within the payload. + * + * Read attr.size once =E2=80=94 the event may be on a shared mmap + * and re-reading could yield a different value. + */ + raw_attr_size =3D event->attr.attr.size; + if (event->header.size < sizeof(event->header) + PERF_ATTR_SIZE_VER0 || + (raw_attr_size && (raw_attr_size < PERF_ATTR_SIZE_VER0 || + raw_attr_size % sizeof(u64) || + raw_attr_size > event->header.size - sizeof(event->header)))) { + pr_err("PERF_RECORD_HEADER_ATTR: invalid attr.size %u (event size %u, mi= n %d)\n", + raw_attr_size, event->header.size, PERF_ATTR_SIZE_VER0); + return -EINVAL; + } + if (dump_trace) perf_event__fprintf_attr(event, stdout); =20 @@ -5108,13 +5155,46 @@ int perf_event__process_attr(const struct perf_tool= *tool __maybe_unused, return -ENOMEM; } =20 - evsel =3D evsel__new(&event->attr.attr); + /* + * attr_size =3D footprint of the attr in the event =E2=80=94 determines + * where the ID array starts. For ABI0, assume VER0 (64 bytes). + * + * copy_size =3D how much we copy into our local struct, capped at + * sizeof(attr) so a newer producer's larger attr doesn't + * overflow. Fields beyond copy_size are zeroed. + * + * Do NOT write attr_size back to the event =E2=80=94 native-endian + * files use MAP_SHARED (read-only), writing would SIGSEGV. + * The swap path handles ABI0 in perf_event__attr_swap() + * which writes to the writable MAP_PRIVATE copy instead. + */ + attr_size =3D raw_attr_size ?: PERF_ATTR_SIZE_VER0; + copy_size =3D min(attr_size, sizeof(attr)); + memcpy(&attr, &event->attr.attr, copy_size); + if (copy_size < sizeof(attr)) + memset((void *)&attr + copy_size, 0, sizeof(attr) - copy_size); + + /* + * Normalize ABI0: the swap path sets attr.size =3D VER0 on the + * event, but the native path leaves it as 0. Set it on the + * local copy so perf inject re-synthesizes with consistent + * layout regardless of endianness. + */ + attr.size =3D attr_size; + + evsel =3D evsel__new(&attr); if (evsel =3D=3D NULL) return -ENOMEM; =20 evlist__add(evlist, evsel); =20 - n_ids =3D event->header.size - sizeof(event->header) - event->attr.attr.s= ize; + /* + * IDs occupy the remainder after header + attr. Use attr_size + * (not copy_size) =E2=80=94 even if the producer's attr is larger than + * our struct, the IDs start after attr_size bytes in the event. + * Validation above guarantees attr_size <=3D payload size. + */ + n_ids =3D event->header.size - sizeof(event->header) - attr_size; n_ids =3D n_ids / sizeof(u64); /* * We don't have the cpu and thread maps on the header, so @@ -5124,7 +5204,13 @@ int perf_event__process_attr(const struct perf_tool = *tool __maybe_unused, if (perf_evsel__alloc_id(&evsel->core, 1, n_ids)) return -ENOMEM; =20 - ids =3D perf_record_header_attr_id(event); + /* + * Locate IDs at attr_size bytes past the attr start in the + * event. Cannot use perf_record_header_attr_id() =E2=80=94 that + * macro reads event->attr.attr.size, which is 0 for ABI0 + * on the native-endian path (no swap handler to fix it up). + */ + ids =3D (void *)&event->attr.attr + attr_size; for (i =3D 0; i < n_ids; i++) { perf_evlist__id_add(&evlist->core, &evsel->core, 0, i, ids[i]); } diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index d14d8055b2d10556..e45d51e898a8e0c9 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -613,8 +613,39 @@ do { \ static int perf_event__hdr_attr_swap(union perf_event *event, bool sample_id_all __maybe_unused) { + u32 attr_size, payload_size; size_t size; =20 + /* + * Validate attr.size (still foreign-endian) before calling + * perf_event__attr_swap(), which uses it via bswap_safe() + * to decide which fields to swap. A crafted attr.size + * larger than the event payload would swap past the event + * boundary and corrupt adjacent memory. + * + * header.size alignment is already validated by + * perf_session__process_event(). The min_size table + * guarantees header.size >=3D sizeof(header) + + * PERF_ATTR_SIZE_VER0, so attr.size is safe to access. + */ + attr_size =3D bswap_32(event->attr.attr.size); + /* + * ABI0: size field not set. This only happens in pipe/inject + * mode where HEADER_ATTR events carry their own attr. For + * regular perf.data files, read_attr() uses f_header.attr_size + * from the file header instead. Assume PERF_ATTR_SIZE_VER0. + */ + if (!attr_size) + attr_size =3D PERF_ATTR_SIZE_VER0; + payload_size =3D event->header.size - sizeof(event->header); + + if (attr_size < PERF_ATTR_SIZE_VER0 || attr_size % sizeof(u64) || + attr_size > payload_size) { + pr_err("PERF_RECORD_HEADER_ATTR: invalid attr.size %u (min: %d, max: %u,= 8-byte aligned)\n", + attr_size, PERF_ATTR_SIZE_VER0, payload_size); + return -1; + } + perf_event__attr_swap(&event->attr.attr); =20 size =3D event->header.size; diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index d665b0f94b321433..5307d707711d876c 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -2181,11 +2181,21 @@ int perf_event__synthesize_attr(const struct perf_t= ool *tool, struct perf_event_ u32 ids, u64 *id, perf_event__handler_t process) { union perf_event *ev; - size_t size; + size_t attr_size, size; int err; =20 - size =3D sizeof(struct perf_event_attr); - size =3D PERF_ALIGN(size, sizeof(u64)); + /* + * Use attr->size for the event layout, not the compiled + * sizeof(struct perf_event_attr), so that synthesized events + * match the source perf.data layout. This matters for perf + * inject, which re-synthesizes attrs from a file that may + * have been recorded by a different version of perf. + * perf_record_header_attr_id() locates the ID array at + * attr->size bytes past the attr. + */ + attr_size =3D attr->size ?: sizeof(struct perf_event_attr); + + size =3D PERF_ALIGN(attr_size, sizeof(u64)); size +=3D sizeof(struct perf_event_header); size +=3D ids * sizeof(u64); =20 @@ -2194,7 +2204,14 @@ int perf_event__synthesize_attr(const struct perf_to= ol *tool, struct perf_event_ if (ev =3D=3D NULL) return -ENOMEM; =20 - ev->attr.attr =3D *attr; + /* + * Copy only the bytes we understand; zalloc ensures that any + * extra bytes between sizeof(struct perf_event_attr) and + * attr_size are zero when the source file uses a newer, larger + * struct. + */ + memcpy(&ev->attr.attr, attr, min(sizeof(struct perf_event_attr), attr_siz= e)); + ev->attr.attr.size =3D attr_size; memcpy(perf_record_header_attr_id(ev), id, ids * sizeof(u64)); =20 ev->attr.header.type =3D PERF_RECORD_HEADER_ATTR; --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 225992D8376; Thu, 21 May 2026 01:11:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325881; cv=none; b=jzmEjhsQHKY6+Q3fGyuuYvc1NjFhN7RZBX8/jbTAkG0+Hpdyb3Qd1AIYOQFvjR7/ys3FEDRlHM51JmopMPzjJI+cvYrUS8eZa5hREp5+XlPXwAvThKpohZx911XqhzLYMKbtUQyjUVqOhSSuRapvx4l8qC/UZqGOWwbwcouSPFw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325881; c=relaxed/simple; bh=i0u7w/DliaH2mdf6uzE/r1GkyU5RkO3gJDoLynwBuXg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RJ42pM3W1uGpYCGxNCS0AhODjcsuAUxDvAXTuaE9tdCv4Y6LGf6phnY79Zms/9w8h9rEUUMrLRwh/zy4oFgtR4xqtIwR6718JrXriYimCk+JbTpFFBd98AxEGxtCI1cGjksHGerUUT85d6MnSMEaSTIJZzk6a69VYFs0/uKnDlk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=P8I4uGmt; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="P8I4uGmt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C34841F000E9; Thu, 21 May 2026 01:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325879; bh=GOx8pyk2LXA245ILmZCYOM0/EpD52foXNA0sm4+4SmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=P8I4uGmtl0VfVbOQ51lvKggAADnmt2b6xSAUQ0ydYvCWNOOgDulCknhn9Y9z8XmGd hNMQoWp8HzFbPrBBPHCTaELfKtMHiWEIh1Opjhi51EanRxpLebkPOnuuOvmVbb/ZAd uqb23W/5aCeyk6Sxb0Cd4NEPEPLiGuMWWq9W0OsRhNW0nPelU1uENqDqDWgD9e9IVn 4xyr1MfFvgQxJ+BJaL17ClVL0q3eJgtPy7IDtIQAID1eZ+HSsgBQIhq97+AfxvBF5s SmFbfnxm6F3+J+JM1lP514i3q8paIMiE6HLru/mnsrt/GoN+a7EY7lSJstTQWTp5DP JZjZt8xzWGk4Q== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 10/27] perf session: Validate nr fields against event size on both swap and common paths Date: Wed, 20 May 2026 22:09:55 -0300 Message-ID: <20260521011027.622268-11-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo Several event types use an nr field to control iteration over variable-length arrays. The swap handlers byte-swap and loop using these fields without bounds checks, and the native processing path trusts them as well. Add bounds checks on both paths for: - PERF_RECORD_THREAD_MAP: validate nr against payload, return -1 on the swap path. On the native path, reject with -EINVAL. - PERF_RECORD_NAMESPACES: clamp nr on the swap path (safe because each entry is indexed by type; missing entries just won't be resolved). Skip the event on the native path. - PERF_RECORD_CPU_MAP: clamp nr for CPUS and MASK sub-types on the swap path. Add bounds checks for mask64 which previously had no nr validation. Skip the event on the native path. - PERF_RECORD_STAT_CONFIG: clamp nr on the swap path (safe because each config entry is self-describing via its tag). Skip the event on the native path. The swap path (cross-endian, writable MAP_PRIVATE mapping) can safely clamp by writing back to the event. The native path (read-only MAP_SHARED mapping) must skip instead of clamping because writing to the mmap'd event would segfault. Also fix stat_config swap range: change size +=3D 1 to size +=3D sizeof(event->stat_config.nr) for clarity. The old +1 happened to work because mem_bswap_64 processes 8-byte chunks, but the intent is to include the 8-byte nr field in the swap range. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 243 +++++++++++++++++++++++++++++++++++--- 1 file changed, 224 insertions(+), 19 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index e45d51e898a8e0c9..be31634e7a83da67 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -486,13 +486,28 @@ static int perf_event__throttle_swap(union perf_event= *event, static int perf_event__namespaces_swap(union perf_event *event, bool sample_id_all) { - u64 i; + u64 i, nr, max_nr; =20 event->namespaces.pid =3D bswap_32(event->namespaces.pid); event->namespaces.tid =3D bswap_32(event->namespaces.tid); event->namespaces.nr_namespaces =3D bswap_64(event->namespaces.nr_namespa= ces); =20 - for (i =3D 0; i < event->namespaces.nr_namespaces; i++) { + nr =3D event->namespaces.nr_namespaces; + /* Cannot underflow: perf_event__min_size[] guarantees header.size >=3D s= izeof */ + max_nr =3D (event->header.size - sizeof(event->namespaces)) / + sizeof(event->namespaces.link_info[0]); + /* + * Safe to clamp: each namespace entry is indexed by type; + * missing entries just won't be resolved. + */ + if (nr > max_nr) { + pr_warning("WARNING: PERF_RECORD_NAMESPACES: nr_namespaces %" PRIu64 " e= xceeds payload (max %" PRIu64 "), clamping\n", + nr, max_nr); + nr =3D max_nr; + event->namespaces.nr_namespaces =3D nr; + } + + for (i =3D 0; i < nr; i++) { struct perf_ns_link_info *ns =3D &event->namespaces.link_info[i]; =20 ns->dev =3D bswap_64(ns->dev); @@ -724,11 +739,23 @@ static int perf_event__auxtrace_error_swap(union perf= _event *event, static int perf_event__thread_map_swap(union perf_event *event, bool sample_id_all __maybe_unused) { - unsigned i; + unsigned int i; + u64 nr; =20 event->thread_map.nr =3D bswap_64(event->thread_map.nr); =20 - for (i =3D 0; i < event->thread_map.nr; i++) + /* + * Reject rather than clamp: unlike namespaces (indexed by type) + * or stat_config (self-describing tags), a truncated thread map + * is structurally broken =E2=80=94 downstream would get a wrong map. + */ + /* Cannot underflow: perf_event__min_size[] guarantees header.size >=3D s= izeof */ + nr =3D event->thread_map.nr; + if (nr > (event->header.size - sizeof(event->thread_map)) / + sizeof(event->thread_map.entries[0])) + return -1; + + for (i =3D 0; i < nr; i++) event->thread_map.entries[i].pid =3D bswap_64(event->thread_map.entries[= i].pid); return 0; } @@ -737,32 +764,80 @@ static int perf_event__cpu_map_swap(union perf_event = *event, bool sample_id_all __maybe_unused) { struct perf_record_cpu_map_data *data =3D &event->cpu_map.data; + u32 payload =3D event->header.size - sizeof(event->header); =20 data->type =3D bswap_16(data->type); =20 + /* + * Safe to clamp: a shorter CPU map just means some CPUs + * are absent; tools process the CPUs that are present. + */ switch (data->type) { - case PERF_CPU_MAP__CPUS: - data->cpus_data.nr =3D bswap_16(data->cpus_data.nr); + case PERF_CPU_MAP__CPUS: { + u16 nr, max_nr; =20 - for (unsigned i =3D 0; i < data->cpus_data.nr; i++) + data->cpus_data.nr =3D bswap_16(data->cpus_data.nr); + nr =3D data->cpus_data.nr; + max_nr =3D (payload - offsetof(struct perf_record_cpu_map_data, + cpus_data.cpu)) / + sizeof(data->cpus_data.cpu[0]); + if (nr > max_nr) { + pr_warning("WARNING: PERF_RECORD_CPU_MAP: nr %u exceeds payload (max %u= ), clamping\n", + nr, max_nr); + nr =3D max_nr; + data->cpus_data.nr =3D nr; + } + for (unsigned int i =3D 0; i < nr; i++) data->cpus_data.cpu[i] =3D bswap_16(data->cpus_data.cpu[i]); break; + } case PERF_CPU_MAP__MASK: data->mask32_data.long_size =3D bswap_16(data->mask32_data.long_size); =20 switch (data->mask32_data.long_size) { - case 4: + case 4: { + u16 nr, max_nr; + data->mask32_data.nr =3D bswap_16(data->mask32_data.nr); - for (unsigned i =3D 0; i < data->mask32_data.nr; i++) + nr =3D data->mask32_data.nr; + max_nr =3D (payload - offsetof(struct perf_record_cpu_map_data, + mask32_data.mask)) / + sizeof(data->mask32_data.mask[0]); + if (nr > max_nr) { + pr_warning("WARNING: PERF_RECORD_CPU_MAP mask32: nr %u exceeds payload= (max %u), clamping\n", + nr, max_nr); + nr =3D max_nr; + data->mask32_data.nr =3D nr; + } + for (unsigned int i =3D 0; i < nr; i++) data->mask32_data.mask[i] =3D bswap_32(data->mask32_data.mask[i]); break; - case 8: + } + case 8: { + u16 nr, max_nr; + data->mask64_data.nr =3D bswap_16(data->mask64_data.nr); - for (unsigned i =3D 0; i < data->mask64_data.nr; i++) + nr =3D data->mask64_data.nr; + if (payload < offsetof(struct perf_record_cpu_map_data, mask64_data.mas= k)) { + data->mask64_data.nr =3D 0; + break; + } + max_nr =3D (payload - offsetof(struct perf_record_cpu_map_data, + mask64_data.mask)) / + sizeof(data->mask64_data.mask[0]); + if (nr > max_nr) { + pr_warning("WARNING: PERF_RECORD_CPU_MAP mask64: nr %u exceeds payload= (max %u), clamping\n", + nr, max_nr); + nr =3D max_nr; + data->mask64_data.nr =3D nr; + } + for (unsigned int i =3D 0; i < nr; i++) data->mask64_data.mask[i] =3D bswap_64(data->mask64_data.mask[i]); break; + } default: - pr_err("cpu_map swap: unsupported long size\n"); + pr_err("cpu_map swap: unsupported long size %u\n", + data->mask32_data.long_size); } break; case PERF_CPU_MAP__RANGE_CPUS: @@ -778,11 +853,27 @@ static int perf_event__cpu_map_swap(union perf_event = *event, static int perf_event__stat_config_swap(union perf_event *event, bool sample_id_all __maybe_unused) { - u64 size; + u64 nr, max_nr, size; =20 - size =3D bswap_64(event->stat_config.nr) * sizeof(event->stat_config.dat= a[0]); - size +=3D 1; /* nr item itself */ + nr =3D bswap_64(event->stat_config.nr); + /* Cannot underflow: perf_event__min_size[] guarantees header.size >=3D s= izeof */ + max_nr =3D (event->header.size - sizeof(event->stat_config)) / + sizeof(event->stat_config.data[0]); + /* + * Safe to clamp: each config entry is self-describing + * via its tag; missing entries keep their defaults. + */ + if (nr > max_nr) { + pr_warning("WARNING: PERF_RECORD_STAT_CONFIG: nr %" PRIu64 " exceeds pay= load (max %" PRIu64 "), clamping\n", + nr, max_nr); + nr =3D max_nr; + } + size =3D nr * sizeof(event->stat_config.data[0]); + /* The swap starts at &nr, so add its size to cover the full range */ + size +=3D sizeof(event->stat_config.nr); mem_bswap_64(&event->stat_config.nr, size); + /* Persist the clamped value in native byte order */ + event->stat_config.nr =3D nr; return 0; } =20 @@ -1720,8 +1811,24 @@ static int machines__deliver_event(struct machines *= machines, "COMM")) return 0; return tool->comm(tool, event, sample, machine); - case PERF_RECORD_NAMESPACES: + case PERF_RECORD_NAMESPACES: { + /* Cannot underflow: perf_event__min_size[] guarantees header.size >=3D = sizeof */ + u64 max_nr =3D (event->header.size - sizeof(event->namespaces)) / + sizeof(event->namespaces.link_info[0]); + + /* + * Native-endian events are mmap'd read-only, so we + * cannot clamp nr in place. Skip the event instead. + * The swap handler already clamps on the writable + * cross-endian path. + */ + if (event->namespaces.nr_namespaces > max_nr) { + pr_warning("WARNING: PERF_RECORD_NAMESPACES: nr_namespaces %" PRIu64 " = exceeds payload (max %" PRIu64 "), skipping\n", + (u64)event->namespaces.nr_namespaces, max_nr); + return 0; + } return tool->namespaces(tool, event, sample, machine); + } case PERF_RECORD_CGROUP: if (!perf_event__check_nul(event->cgroup.path, (void *)event + event->header.size, @@ -1902,15 +2009,112 @@ static s64 perf_session__process_user_event(struct= perf_session *session, perf_session__auxtrace_error_inc(session, event); err =3D tool->auxtrace_error(tool, session, event); break; - case PERF_RECORD_THREAD_MAP: + case PERF_RECORD_THREAD_MAP: { + u64 max_nr; + + if (event->header.size < sizeof(event->thread_map)) { + pr_err("PERF_RECORD_THREAD_MAP: header.size (%u) too small\n", + event->header.size); + err =3D -EINVAL; + break; + } + + max_nr =3D (event->header.size - sizeof(event->thread_map)) / + sizeof(event->thread_map.entries[0]); + if (event->thread_map.nr > max_nr) { + pr_err("PERF_RECORD_THREAD_MAP: nr %" PRIu64 " exceeds max %" PRIu64 "\= n", + (u64)event->thread_map.nr, max_nr); + err =3D -EINVAL; + break; + } + err =3D tool->thread_map(tool, session, event); break; - case PERF_RECORD_CPU_MAP: + } + case PERF_RECORD_CPU_MAP: { + struct perf_record_cpu_map_data *data =3D &event->cpu_map.data; + u32 payload =3D event->header.size - sizeof(event->header); + + /* + * Native-endian events are mmap'd read-only, so we + * cannot clamp nr fields in place. Skip the event + * if any variant overflows. + */ + switch (data->type) { + case PERF_CPU_MAP__CPUS: { + u16 max_nr =3D (payload - offsetof(struct perf_record_cpu_map_data, + cpus_data.cpu)) / + sizeof(data->cpus_data.cpu[0]); + + if (data->cpus_data.nr > max_nr) { + pr_warning("WARNING: PERF_RECORD_CPU_MAP: nr %u exceeds payload (max %= u), skipping\n", + data->cpus_data.nr, max_nr); + err =3D 0; + goto out; + } + break; + } + case PERF_CPU_MAP__MASK: + if (data->mask32_data.long_size =3D=3D 4) { + u16 max_nr =3D (payload - offsetof(struct perf_record_cpu_map_data, + mask32_data.mask)) / + sizeof(data->mask32_data.mask[0]); + + if (data->mask32_data.nr > max_nr) { + pr_warning("WARNING: PERF_RECORD_CPU_MAP mask32: nr %u exceeds payloa= d (max %u), skipping\n", + data->mask32_data.nr, max_nr); + err =3D 0; + goto out; + } + } else if (data->mask64_data.long_size =3D=3D 8) { + u16 max_nr; + + if (payload < offsetof(struct perf_record_cpu_map_data, mask64_data.ma= sk)) { + err =3D 0; + goto out; + } + max_nr =3D (payload - offsetof(struct perf_record_cpu_map_data, + mask64_data.mask)) / + sizeof(data->mask64_data.mask[0]); + if (data->mask64_data.nr > max_nr) { + pr_warning("WARNING: PERF_RECORD_CPU_MAP mask64: nr %u exceeds payloa= d (max %u), skipping\n", + data->mask64_data.nr, max_nr); + err =3D 0; + goto out; + } + } else { + pr_warning("WARNING: PERF_RECORD_CPU_MAP: unsupported long_size %u, sk= ipping\n", + data->mask32_data.long_size); + err =3D 0; + goto out; + } + break; + default: + break; + } + err =3D tool->cpu_map(tool, session, event); break; - case PERF_RECORD_STAT_CONFIG: + } + case PERF_RECORD_STAT_CONFIG: { + /* Cannot underflow: perf_event__min_size[] guarantees header.size >=3D = sizeof */ + u64 max_nr =3D (event->header.size - sizeof(event->stat_config)) / + sizeof(event->stat_config.data[0]); + + /* + * Native-endian events are mmap'd read-only, so we + * cannot clamp nr in place. Skip the event instead. + */ + if (event->stat_config.nr > max_nr) { + pr_warning("WARNING: PERF_RECORD_STAT_CONFIG: nr %" PRIu64 " exceeds pa= yload (max %" PRIu64 "), skipping\n", + (u64)event->stat_config.nr, max_nr); + err =3D 0; + goto out; + } + err =3D tool->stat_config(tool, session, event); break; + } case PERF_RECORD_STAT: err =3D tool->stat(tool, session, event); break; @@ -1953,6 +2157,7 @@ static s64 perf_session__process_user_event(struct pe= rf_session *session, err =3D -EINVAL; break; } +out: perf_sample__exit(&sample); return err; } --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF0C62FD7B1; Thu, 21 May 2026 01:11:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325885; cv=none; b=JpLrimbYSv3sdRTabonaZYtWFvYG2Xig5yBpJcZnGRLNchB3Gu3A0WPCR8yG5R3wPrmLkyf9b2KIcnjX98rhbDDa1vG33h5Dynn7PJWT29e2aQnUv1Var8pH26iZTBUm4odaV9m10PgaFEbGukcsGyyXk+7CwCiGJmf3ACzk54s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325885; c=relaxed/simple; bh=1SOJSwIX3t2JM9X64XValMipqj7cnobsY/vXuA+6gNM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oOvIZ81njPyXGmXDcRcQr4hlTSXu8xaxyfGUJatH5hInnlJKnTsMJBjbUiXghDpoZCJFXMimda5gwkRuoLpmn2Pvw2aptfL7bH0rj2Ea7gFee4K/WlOQLovCeAmyCnewcquO1nuZLS7UxYTdLROcQ0zjHX0V4SHhWaL8cW9yoIE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C51ptIin; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="C51ptIin" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 557E01F00A3B; Thu, 21 May 2026 01:11:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325883; bh=D6SMoKb3bqygMIT1ITAqmLnHrsjXk5ZwX0fxqPaGOT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=C51ptIin7I68Sqp2nwtRC3dEJSysYrugEbdsUkUlBCI5YHLtzz9z7kQqSIcQObwGP Q1J+qIDuFhCNFIn2IZ0sWEIo6DwstwYY/fdTatXsRWC0k0XrCZzqf6tK2f4Roh9PAD VZoiDQL8aCTSFjOH2RQe/ThdFGwc6HRLCN/hMVc7RI/DUh5yl30rp4bCOtZA2YJWkZ rsMN1pmUEbgv1+Dt3smfT9tgSLKA6v/iIkqX+kIIIVouR4+J7gYztdceUof0/YzDqW FJX/bn2dagJHgeK3HxlmGGfjLgUEPAsG5KAgUBvUwXsh8ZGWprJK2Eiv7HE3hr+rsU yg8DmyX5pxIhw== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 11/27] perf header: Byte-swap build ID event pid and bounds check section entries Date: Wed, 20 May 2026 22:09:56 -0300 Message-ID: <20260521011027.622268-12-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo perf_header__read_build_ids() swaps the event header fields for cross-endian perf.data files but not bev.pid. This causes perf_session__findnew_machine() to look up the wrong machine for guest VM build IDs, misattributing them. Swap bev.pid alongside the header fields. Also add a build_id_swap callback for stream-mode build ID events, and validate NUL-termination of build_id.filename on the native-endian delivery path (perf_session__process_user_event) =E2=80=94 events with unterminated filenames are skipped. Harden perf_header__read_build_ids() against crafted perf.data files: - Add overflow check on offset + size to prevent wrap past ULLONG_MAX. - Reject bev.header.size =3D=3D 0 which would loop forever. - Reject bev.header.size > remaining section to prevent reading past the section boundary. - Guard memcmp(filename, "nel.kallsyms]", 13) with len >=3D 13 to avoid reading uninitialized stack memory on short filenames. - Force NUL-termination of filename before passing it to functions like machine__findnew_dso() that use strlen/strcmp. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 50 +++++++++++++++++++++++++++++++++++---- tools/perf/util/session.c | 16 ++++++++++++- 2 files changed, 61 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 967c3d8ff12c8676..c0b5c99f462ad925 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include #include +#include #include "string2.h" #include #include @@ -2578,7 +2579,13 @@ static int perf_header__read_build_ids_abi_quirk(str= uct perf_header *header, } old_bev; struct perf_record_header_build_id bev; char filename[PATH_MAX]; - u64 limit =3D offset + size; + u64 limit; + + /* Prevent offset + size from wrapping past ULLONG_MAX */ + if (size > ULLONG_MAX - offset) + return -1; + + limit =3D offset + size; =20 while (offset < limit) { ssize_t len; @@ -2589,6 +2596,10 @@ static int perf_header__read_build_ids_abi_quirk(str= uct perf_header *header, if (header->needs_swap) perf_event_header__bswap(&old_bev.header); =20 + /* size =3D=3D 0 loops forever; size > remaining reads past section */ + if (old_bev.header.size =3D=3D 0 || old_bev.header.size > limit - offset) + return -1; + len =3D old_bev.header.size - sizeof(old_bev); if (len < 0 || len >=3D PATH_MAX) { pr_warning("invalid build_id filename length %zd\n", len); @@ -2597,6 +2608,13 @@ static int perf_header__read_build_ids_abi_quirk(str= uct perf_header *header, =20 if (readn(input, filename, len) !=3D len) return -1; + /* + * The file data may lack a null terminator, which could + * indicate a corrupt or crafted perf.data file. Ensure + * filename is always a valid C string before passing it + * to functions like machine__findnew_dso(). + */ + filename[len] =3D '\0'; =20 bev.header =3D old_bev.header; =20 @@ -2624,17 +2642,32 @@ static int perf_header__read_build_ids(struct perf_= header *header, struct perf_session *session =3D container_of(header, struct perf_session= , header); struct perf_record_header_build_id bev; char filename[PATH_MAX]; - u64 limit =3D offset + size, orig_offset =3D offset; + u64 limit, orig_offset =3D offset; int err =3D -1; =20 + /* Prevent offset + size from wrapping past ULLONG_MAX */ + if (size > ULLONG_MAX - offset) + return -1; + + limit =3D offset + size; + while (offset < limit) { ssize_t len; =20 if (readn(input, &bev, sizeof(bev)) !=3D sizeof(bev)) goto out; =20 - if (header->needs_swap) + if (header->needs_swap) { perf_event_header__bswap(&bev.header); + bev.pid =3D bswap_32(bev.pid); + } + + /* + * size =3D=3D 0 would loop forever (offset never advances); + * size > remaining would read past the section boundary. + */ + if (bev.header.size =3D=3D 0 || bev.header.size > limit - offset) + goto out; =20 len =3D bev.header.size - sizeof(bev); if (len < 0 || len >=3D PATH_MAX) { @@ -2644,6 +2677,13 @@ static int perf_header__read_build_ids(struct perf_h= eader *header, =20 if (readn(input, filename, len) !=3D len) goto out; + /* + * The file data may lack a null terminator, which could + * indicate a corrupt or crafted perf.data file. Ensure + * filename is always a valid C string before passing it + * to functions like machine__findnew_dso(). + */ + filename[len] =3D '\0'; /* * The a1645ce1 changeset: * @@ -2657,7 +2697,9 @@ static int perf_header__read_build_ids(struct perf_he= ader *header, * '[kernel.kallsyms]' string for the kernel build-id has the * first 4 characters chopped off (where the pid_t sits). */ - if (memcmp(filename, "nel.kallsyms]", 13) =3D=3D 0) { + /* Guard short filenames against memcmp reading past the buffer */ + if (len >=3D (ssize_t)sizeof("nel.kallsyms]") - 1 && + memcmp(filename, "nel.kallsyms]", sizeof("nel.kallsyms]") - 1) =3D= =3D 0) { if (lseek(input, orig_offset, SEEK_SET) =3D=3D (off_t)-1) return -1; return perf_header__read_build_ids_abi_quirk(header, input, offset, siz= e); diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index be31634e7a83da67..dad482d7e800984d 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -669,6 +669,14 @@ static int perf_event__hdr_attr_swap(union perf_event = *event, return 0; } =20 +static int perf_event__build_id_swap(union perf_event *event, + bool sample_id_all __maybe_unused) +{ + /* Only pid needs swapping =E2=80=94 build_id[] is a raw byte array */ + event->build_id.pid =3D bswap_32(event->build_id.pid); + return 0; +} + static int perf_event__event_update_swap(union perf_event *event, bool sample_id_all __maybe_unused) { @@ -997,7 +1005,7 @@ static perf_event__swap_op perf_event__swap_ops[] =3D { [PERF_RECORD_HEADER_ATTR] =3D perf_event__hdr_attr_swap, [PERF_RECORD_HEADER_EVENT_TYPE] =3D perf_event__event_type_swap, [PERF_RECORD_HEADER_TRACING_DATA] =3D perf_event__tracing_data_swap, - [PERF_RECORD_HEADER_BUILD_ID] =3D NULL, + [PERF_RECORD_HEADER_BUILD_ID] =3D perf_event__build_id_swap, [PERF_RECORD_HEADER_FEATURE] =3D perf_event__header_feature_swap, [PERF_RECORD_ID_INDEX] =3D perf_event__all64_swap, [PERF_RECORD_AUXTRACE_INFO] =3D perf_event__auxtrace_info_swap, @@ -1984,6 +1992,12 @@ static s64 perf_session__process_user_event(struct p= erf_session *session, err =3D tool->tracing_data(tool, session, event); break; case PERF_RECORD_HEADER_BUILD_ID: + if (!perf_event__check_nul(event->build_id.filename, + (void *)event + event->header.size, + "HEADER_BUILD_ID")) { + err =3D 0; + break; + } err =3D tool->build_id(tool, session, event); break; case PERF_RECORD_FINISHED_ROUND: --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D1C1306742; Thu, 21 May 2026 01:11:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325888; cv=none; b=NYs3l92yzrTwpIpOFkl/flwkcIAE7aR5aRIfUaUyGrBsvlEzZUwtQl8QsB4zF6QZbWnOmUWgsGxMbpZfnk/zgV+5aOVn1ypB2IsRUKGzDCP2VwDvBwj4y775JhHI1Nehp4+8TJEcBauLiWx17nQCWYFIXkREURWo7zJEK9wyObE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325888; c=relaxed/simple; bh=AisTe5aNqx5CvT1F82WxI0V4CfiyYNVG1u/onxrZmks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bl+8v8j6/MTDGdsR/Lbgfz1wWsckCt31JBjVftBlW5ujpyQiaXtHdTDkPo4g1jqGd0eE4Km88SSZjKdvajbnndlPHQNuWrUNuuXGIOD+VEtGWnHwZmHcqgnQ6MC/YYKmlv4N4AiXzqux7iJcorClma4u4pcrJ18nlVwAgV02vsw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dTzEM5vG; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dTzEM5vG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 145691F000E9; Thu, 21 May 2026 01:11:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325887; bh=s2fVRvE1DE0+S2DjkNwQCDdJdaMAXP10pP6s9pG8VJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dTzEM5vGF1tOK7JtIRDatQo/tjKa+gl5uMhZfChsvAgB+t2RIM0UfOZcLaF/r4Uhm kbxynuhykCc3ANLmbXbXV/wGKBBwXGPAvlfOFb375ZCNdpKSSjMaY6VhOYDJxnxo2E p5qaX8JIqGs1EyoxidUSPw3xBqDo8VIgkqhra9YzDQ9/r7XH8Jw9m2oItDuol0KafU 2nWwpJ3wC/NTd+3VTj+sA25uDEGsVEvR29iXKb7mdPNVy5nSfI1Fx/uj2FXIpzXMFi kwsMfNDaqpF/OfE6dsctkc/zbHiFyWRafFB+opdC4fIXCk/TSWDzdTzdG6e+j50gzx wCXBoy1SmehOw== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 12/27] perf cpumap: Reject RANGE_CPUS with start_cpu > end_cpu Date: Wed, 20 May 2026 22:09:57 -0300 Message-ID: <20260521011027.622268-13-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo cpu_map__from_range() computes nr_cpus as end_cpu - start_cpu + 1. When a crafted perf.data has start_cpu > end_cpu, this wraps to a huge value, causing perf_cpu_map__empty_new() to attempt a massive allocation. Return NULL when the range is inverted. Also clamp any_cpu to boolean (0 or 1) since it is added to the allocation count =E2=80=94 a crafted value > 1 would inflate the map size. Harden cpu_map__from_mask() to reject unsupported long_size values (anything other than 4 or 8), preventing misinterpretation of the mask data layout. Snapshot mmap'd fields via READ_ONCE() into locals to prevent TOCTOU re-reads =E2=80=94 the data pointer references MAP_SHARED mmap'd memory that could theoretically change between reads on a FUSE-backed file: - cpu_map__from_range(): snapshot start_cpu, end_cpu, any_cpu - cpu_map__from_entries(): snapshot nr and each cpu[i] element - cpu_map__from_mask(): snapshot long_size (before validation, closing the check-then-read gap), mask_nr - perf_record_cpu_map_data__read_one_mask(): add u16 long_size parameter so callers pass the validated copy instead of re-reading data->mask32_data.long_size from mmap'd memory Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/cpumap.c | 62 +++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c index 11922e1ded844a03..b1e5c29c6e3ec8df 100644 --- a/tools/perf/util/cpumap.c +++ b/tools/perf/util/cpumap.c @@ -10,6 +10,7 @@ #include #include "asm/bug.h" =20 +#include #include #include #include @@ -40,15 +41,16 @@ bool perf_record_cpu_map_data__test_bit(int i, =20 /* Read ith mask value from data into the given 64-bit sized bitmap */ static void perf_record_cpu_map_data__read_one_mask(const struct perf_reco= rd_cpu_map_data *data, - int i, unsigned long *bitmap) + int i, unsigned long *bitmap, + u16 long_size) { #if __SIZEOF_LONG__ =3D=3D 8 - if (data->mask32_data.long_size =3D=3D 4) + if (long_size =3D=3D 4) bitmap[0] =3D data->mask32_data.mask[i]; else bitmap[0] =3D data->mask64_data.mask[i]; #else - if (data->mask32_data.long_size =3D=3D 4) { + if (long_size =3D=3D 4) { bitmap[0] =3D data->mask32_data.mask[i]; bitmap[1] =3D 0; } else { @@ -64,24 +66,27 @@ static void perf_record_cpu_map_data__read_one_mask(con= st struct perf_record_cpu } static struct perf_cpu_map *cpu_map__from_entries(const struct perf_record= _cpu_map_data *data) { + /* Snapshot nr =E2=80=94 data is mmap'd and could change between reads */ + u16 nr =3D READ_ONCE(data->cpus_data.nr); struct perf_cpu_map *map; =20 - map =3D perf_cpu_map__empty_new(data->cpus_data.nr); + map =3D perf_cpu_map__empty_new(nr); if (!map) return NULL; =20 - for (unsigned int i =3D 0; i < data->cpus_data.nr; i++) { + for (unsigned int i =3D 0; i < nr; i++) { + u16 cpu =3D READ_ONCE(data->cpus_data.cpu[i]); /* * Special treatment for -1, which is not real cpu number, * and we need to use (int) -1 to initialize map[i], * otherwise it would become 65535. */ - if (data->cpus_data.cpu[i] =3D=3D (u16) -1) { + if (cpu =3D=3D (u16) -1) { RC_CHK_ACCESS(map)->map[i].cpu =3D -1; - } else if (data->cpus_data.cpu[i] < INT16_MAX) { - RC_CHK_ACCESS(map)->map[i].cpu =3D (int16_t) data->cpus_data.cpu[i]; + } else if (cpu < INT16_MAX) { + RC_CHK_ACCESS(map)->map[i].cpu =3D (int16_t) cpu; } else { - pr_err("Invalid cpumap entry %u\n", data->cpus_data.cpu[i]); + pr_err("Invalid cpumap entry %u\n", cpu); perf_cpu_map__put(map); return NULL; } @@ -93,11 +98,21 @@ static struct perf_cpu_map *cpu_map__from_entries(const= struct perf_record_cpu_m static struct perf_cpu_map *cpu_map__from_mask(const struct perf_record_cp= u_map_data *data) { DECLARE_BITMAP(local_copy, 64); - int weight =3D 0, mask_nr =3D data->mask32_data.nr; + int weight =3D 0, mask_nr; + /* Snapshot before validation =E2=80=94 data is mmap'd and could change */ + u16 long_size =3D READ_ONCE(data->mask32_data.long_size); struct perf_cpu_map *map; =20 + /* long_size must be 4 or 8; other values overflow cpus_per_i below */ + if (long_size !=3D 4 && long_size !=3D 8) { + pr_warning("WARNING: cpu_map mask: unsupported long_size %u\n", long_siz= e); + return NULL; + } + + mask_nr =3D READ_ONCE(data->mask32_data.nr); + for (int i =3D 0; i < mask_nr; i++) { - perf_record_cpu_map_data__read_one_mask(data, i, local_copy); + perf_record_cpu_map_data__read_one_mask(data, i, local_copy, long_size); weight +=3D bitmap_weight(local_copy, 64); } =20 @@ -106,11 +121,14 @@ static struct perf_cpu_map *cpu_map__from_mask(const = struct perf_record_cpu_map_ return NULL; =20 for (int i =3D 0, j =3D 0; i < mask_nr; i++) { - int cpus_per_i =3D (i * data->mask32_data.long_size * BITS_PER_BYTE); + int cpus_per_i =3D (i * long_size * BITS_PER_BYTE); int cpu; =20 - perf_record_cpu_map_data__read_one_mask(data, i, local_copy); + perf_record_cpu_map_data__read_one_mask(data, i, local_copy, long_size); for_each_set_bit(cpu, local_copy, 64) { + /* Guard against more set bits than the first pass counted */ + if (j >=3D weight) + break; if (cpu + cpus_per_i < INT16_MAX) { RC_CHK_ACCESS(map)->map[j++].cpu =3D cpu + cpus_per_i; } else { @@ -126,18 +144,28 @@ static struct perf_cpu_map *cpu_map__from_mask(const = struct perf_record_cpu_map_ =20 static struct perf_cpu_map *cpu_map__from_range(const struct perf_record_c= pu_map_data *data) { + /* Snapshot fields =E2=80=94 data is mmap'd and could change between read= s */ + u16 start_cpu =3D READ_ONCE(data->range_cpu_data.start_cpu); + u16 end_cpu =3D READ_ONCE(data->range_cpu_data.end_cpu); + u16 any_cpu =3D READ_ONCE(data->range_cpu_data.any_cpu); struct perf_cpu_map *map; unsigned int i =3D 0; =20 - map =3D perf_cpu_map__empty_new(data->range_cpu_data.end_cpu - - data->range_cpu_data.start_cpu + 1 + data->range_cpu_data.any_cpu); + if (end_cpu < start_cpu) { + pr_warning("WARNING: cpu_map range: end_cpu %u < start_cpu %u\n", + end_cpu, start_cpu); + return NULL; + } + + /* any_cpu is boolean (0 or 1), not a count =E2=80=94 clamp to avoid infl= ated nr */ + map =3D perf_cpu_map__empty_new(end_cpu - start_cpu + 1 + !!any_cpu); if (!map) return NULL; =20 - if (data->range_cpu_data.any_cpu) + if (any_cpu) RC_CHK_ACCESS(map)->map[i++].cpu =3D -1; =20 - for (int cpu =3D data->range_cpu_data.start_cpu; cpu <=3D data->range_cpu= _data.end_cpu; + for (int cpu =3D start_cpu; cpu <=3D end_cpu; i++, cpu++) { if (cpu < INT16_MAX) { RC_CHK_ACCESS(map)->map[i].cpu =3D cpu; --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 635CF2C234A; Thu, 21 May 2026 01:11:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325892; cv=none; b=duFSx54Q4arSxOp8alvQ/2TLU2tr67qshn2wH5TQ+70PC91Vy922O0vhm+JA2jWbscee+4zMvRu9XEPOnvXOCDh8PsS5wdisU6PUoRy9fJ7J8fUrFo5j3hzKGHNDZVzXtpm678XsEFejAf5HtOVNNpGbvWcrWcF8rtLK4SsnQH4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325892; c=relaxed/simple; bh=7IvfBA+I2Jh89GcE5LEuaPDT7M9UJyefHImzYkxUGXk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fwJc4NhgcmwnKyPDiQNlwscpOGi5dcchCgRyPbXv/aFYfym7D9EZO9DMxWZupCHKnj+RTwj20Lucz8S2kjVrl5Ez6Z5OOw2xJzjLGS8W88WalS2nxV2cM8XUoMNZHc4l+TDPzRo2epT/wl3xeqhVF3a06bMWaYg8G1pExADLR+E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nQLutNeA; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nQLutNeA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C75711F00A3B; Thu, 21 May 2026 01:11:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325891; bh=ldgGERpaoZpcB1zs5XJgG6OAjIKlxZL+lrQgw++ELHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nQLutNeAQvaD0V+Oy+V3XC3KR5Ec4OckSVi7jtznyPQt5RrooUmaqurbbctP951B6 rdPCCMj4lMGDft1mh9OmACTvlDDvx0WjbRi6hymrKWwacDIFKSun/LFy/fGm8v07ld 0p1ob7sH2PMxEeUlx8tLvibbmvOZ0aD6zsa/grIY59M7PmIP771gpqU68lL6n8rw7p klnexoncFCsx4K88DE46Vpu2lOufXeko0StHDyrTjUic2Wk24bzzl5sAb8cy00ms61 UV4EK3peGZ3A8xfHwzQBDYFW2dGb6wPvIuKF4HDHpCVIlUr6AwOmQ331Gz+OTQAJUP CfrzOa2l6yP+A== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 13/27] perf auxtrace: Harden auxtrace_error event handling Date: Wed, 20 May 2026 22:09:58 -0300 Message-ID: <20260521011027.622268-14-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo Fix four issues in PERF_RECORD_AUXTRACE_ERROR handling: 1. auxtrace_error_name() takes a signed int parameter, but e->type is __u32. A crafted value like 0xFFFFFFFF converts to -1, passes the bounds check, and causes a negative array index. Fix by changing the parameter to unsigned int. 2. The msg field is printed via %s without a length bound. The min_size table only guarantees fields up to msg (offset 48), so a truncated event has zero msg bytes within the event boundary. Compute the available msg length from header.size, cap at sizeof(e->msg), and use %.*s. 3. fmt >=3D 2 adds machine_pid and vcpu fields after msg[64]. Older files may have fmt >=3D 2 but an event size that doesn't include these fields. Add a size check in the swap handler to downgrade fmt before the conditional field access, and a matching size guard in the fprintf path for native-endian events (which are mmap'd read-only and can't be modified in place). 4. python_process_auxtrace_error() had the same issues: msg was passed to tuple_set_string() unbounded, and machine_pid/vcpu were accessed unconditionally without checking fmt or event size. Apply the same bounds checks. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/auxtrace.c | 24 +++++++++++++--- .../scripting-engines/trace-event-python.c | 28 +++++++++++++++++-- tools/perf/util/session.c | 18 ++++++++++-- 3 files changed, 61 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index a224687ffbc1b5be..d9770e1d2f959fc4 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -1759,7 +1759,7 @@ static const char * const auxtrace_error_type_name[] = =3D { [PERF_AUXTRACE_ERROR_ITRACE] =3D "instruction trace", }; =20 -static const char *auxtrace_error_name(int type) +static const char *auxtrace_error_name(unsigned int type) { const char *error_type_name =3D NULL; =20 @@ -1775,6 +1775,7 @@ size_t perf_event__fprintf_auxtrace_error(union perf_= event *event, FILE *fp) struct perf_record_auxtrace_error *e =3D &event->auxtrace_error; unsigned long long nsecs =3D e->time; const char *msg =3D e->msg; + int msg_max; int ret; =20 ret =3D fprintf(fp, " %s error type %u", @@ -1792,11 +1793,26 @@ size_t perf_event__fprintf_auxtrace_error(union per= f_event *event, FILE *fp) if (!e->fmt) msg =3D (const char *)&e->time; =20 - if (e->fmt >=3D 2 && e->machine_pid) + /* Bound msg to the bytes actually within the event, capped at the array = size */ + msg_max =3D (int)((void *)event + event->header.size - (void *)msg); + if (msg_max < 0) + msg_max =3D 0; + if (msg_max > (int)sizeof(e->msg)) + msg_max =3D sizeof(e->msg); + + /* + * Unlike the swap path which downgrades fmt in place, + * native-endian events are mmap'd read-only =E2=80=94 check size + * instead to avoid accessing machine_pid/vcpu OOB. + */ + if (e->fmt >=3D 2 && + event->header.size >=3D offsetof(typeof(event->auxtrace_error), vcpu)= + + sizeof(event->auxtrace_error.vcpu) && + e->machine_pid) ret +=3D fprintf(fp, " machine_pid %d vcpu %d", e->machine_pid, e->vcpu); =20 - ret +=3D fprintf(fp, " cpu %d pid %d tid %d ip %#"PRI_lx64" code %u: %s\n= ", - e->cpu, e->pid, e->tid, e->ip, e->code, msg); + ret +=3D fprintf(fp, " cpu %d pid %d tid %d ip %#"PRI_lx64" code %u: %.*s= \n", + e->cpu, e->pid, e->tid, e->ip, e->code, msg_max, msg); return ret; } =20 diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools= /perf/util/scripting-engines/trace-event-python.c index 8edd2f36e5a95829..cee1f32d70225cc7 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -1607,6 +1607,9 @@ static void python_process_auxtrace_error(struct perf= _session *session __maybe_u const char *handler_name =3D "auxtrace_error"; unsigned long long tm =3D e->time; const char *msg =3D e->msg; + s32 machine_pid =3D 0, vcpu =3D 0; + char msg_buf[MAX_AUXTRACE_ERROR_MSG + 1]; + int msg_max; PyObject *handler, *t; =20 handler =3D get_handler(handler_name); @@ -1618,6 +1621,25 @@ static void python_process_auxtrace_error(struct per= f_session *session __maybe_u msg =3D (const char *)&e->time; } =20 + /* Bound msg to the bytes within the event, ensure NUL-termination */ + msg_max =3D (int)((void *)event + event->header.size - (void *)msg); + if (msg_max <=3D 0) { + msg_buf[0] =3D '\0'; + } else { + if (msg_max > (int)sizeof(msg_buf) - 1) + msg_max =3D sizeof(msg_buf) - 1; + memcpy(msg_buf, msg, msg_max); + msg_buf[msg_max] =3D '\0'; + } + + /* Only access fmt >=3D 2 fields if the event is large enough */ + if (e->fmt >=3D 2 && + event->header.size >=3D offsetof(typeof(event->auxtrace_error), vcpu)= + + sizeof(event->auxtrace_error.vcpu)) { + machine_pid =3D e->machine_pid; + vcpu =3D e->vcpu; + } + t =3D tuple_new(11); =20 tuple_set_u32(t, 0, e->type); @@ -1627,10 +1649,10 @@ static void python_process_auxtrace_error(struct pe= rf_session *session __maybe_u tuple_set_s32(t, 4, e->tid); tuple_set_u64(t, 5, e->ip); tuple_set_u64(t, 6, tm); - tuple_set_string(t, 7, msg); + tuple_set_string(t, 7, msg_buf); tuple_set_u32(t, 8, cpumode); - tuple_set_s32(t, 9, e->machine_pid); - tuple_set_s32(t, 10, e->vcpu); + tuple_set_s32(t, 9, machine_pid); + tuple_set_s32(t, 10, vcpu); =20 call_object(handler, t, handler_name); =20 diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index dad482d7e800984d..5b089da2245457e7 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -738,8 +738,22 @@ static int perf_event__auxtrace_error_swap(union perf_= event *event, if (event->auxtrace_error.fmt) event->auxtrace_error.time =3D bswap_64(event->auxtrace_error.time); if (event->auxtrace_error.fmt >=3D 2) { - event->auxtrace_error.machine_pid =3D bswap_32(event->auxtrace_error.mac= hine_pid); - event->auxtrace_error.vcpu =3D bswap_32(event->auxtrace_error.vcpu); + /* + * fmt >=3D 2 adds machine_pid and vcpu after msg[64]. + * Older files may have fmt >=3D 2 but an event size + * that doesn't include these fields =E2=80=94 downgrade to + * avoid swapping out of bounds. + */ + if (event->header.size < offsetof(typeof(event->auxtrace_error), vcpu) + + sizeof(event->auxtrace_error.vcpu)) { + pr_warning("WARNING: PERF_RECORD_AUXTRACE_ERROR: fmt %u but event too s= mall for machine_pid/vcpu (%u bytes), downgrading fmt\n", + event->auxtrace_error.fmt, + event->header.size); + event->auxtrace_error.fmt =3D 1; + } else { + event->auxtrace_error.machine_pid =3D bswap_32(event->auxtrace_error.ma= chine_pid); + event->auxtrace_error.vcpu =3D bswap_32(event->auxtrace_error.vcpu); + } } return 0; } --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 660452ED16D; Thu, 21 May 2026 01:11:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325896; cv=none; b=COUa4VAQBnEL4Ihmk9/IUrAHWy4ycUiaWx5VbpR1x5UWfVl78u2M23e71lutm2aXKgNkcqkTM2VT8AE3aX+MOzw1OAPqXbBHqdlgpA4O4sZKwX+aSrzfqArZo3c1pZi74rFV4X8hxczg7hRw8yf9X2AVwrO73ovUaGBWZio0zxg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325896; c=relaxed/simple; bh=7ANnDTDRR8IsZ8u2lyRrnOOpJS5PWsMwqVg2FXvJpgE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bsSMmc2Ffip4ANDflFdYKfz6Efz2dv7KOSIMk0V0ZZS/AUPA6GqHh3IrXhFnz3jVh886opwHsKy4+SdxTxXsWdqrOv99EkSfI/pjaJGlrW4bOJ7coijMN3QVmu7NmpvBHqZYvOoJLvQeqdAMM0J5SAkWBKpcn9cDdnLsYXjXIIM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Jb4EwU8N; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Jb4EwU8N" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85A501F000E9; Thu, 21 May 2026 01:11:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325895; bh=wfLF7hL4cp3FmDsLRc1sLgNOeR8HNr+cAMrD6g5a5Ag=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Jb4EwU8NW2ZS6sc4iXCUmXJPu7sM6lSraQmiaybi0w8DrAZmsqshF9H9x5Zd+QuEc 3qCcVN/HQrpYnX9u8i/UfV04gxcnFwWz2KvgQwXdisd/qpFG0PDU2j0Fxw5sQwF0p+ 0+dX+5IkuHo2MiWhyi76nP6Nd0dauiyN0aDiiejAnAE01g3Rsycl4NWOiiFdU2c9D8 FV23Og3XPeb+vWf9WrdSHXOtylKs3GOV2M6X/WbnEhxGmQ5shzMn53o1CFwhIPyWvo 7tlYGAInAfjilr1l7Ib2WSv/fk+YS9ClnAMRxt3hhXP9MpL5Q0sAN9FPbO088y0jk1 jG2JG1QQgXjrA== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, Blake Jones , "Claude Opus 4.6 (1M context)" Subject: [PATCH 14/27] perf session: Add byte-swap and bounds check for PERF_RECORD_BPF_METADATA events Date: Wed, 20 May 2026 22:09:59 -0300 Message-ID: <20260521011027.622268-15-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo PERF_RECORD_BPF_METADATA has no entry in perf_event__swap_ops[], so its nr_entries field is never byte-swapped when reading a cross-endian perf.data file. Downstream processing in perf_event__fprintf_bpf_metadata() loops over nr_entries, so a foreign-endian value causes out-of-bounds reads. Add a swap handler that byte-swaps nr_entries after validating that header.size is large enough. The entries[] array contains only char arrays (key/value strings), so no per-entry swap is needed =E2=80=94 but en= sure NUL-termination on the writable cross-endian path. Validate header.size, nr_entries, and string NUL-termination in the common event delivery path so that native-endian files with malicious values are also rejected. Snapshot nr_entries via READ_ONCE() before validation =E2=80=94 the event is on a MAP_SHARED mmap that could theoretic= ally change between the bounds check and the loop. Fixes: ab38e84ba9a8 ("perf record: collect BPF metadata from existing BPF p= rograms") Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Blake Jones Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 85 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 5b089da2245457e7..928775f727c497cf 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -933,6 +933,45 @@ static int perf_event__time_conv_swap(union perf_event= *event, return 0; } =20 +static int perf_event__bpf_metadata_swap(union perf_event *event, + bool sample_id_all __maybe_unused) +{ + u64 i, nr, max_nr; + + /* Fixed header must fit before accessing nr_entries or prog_name */ + if (event->header.size < sizeof(event->bpf_metadata)) + return -1; + + event->bpf_metadata.nr_entries =3D bswap_64(event->bpf_metadata.nr_entrie= s); + + /* + * Ensure NUL-termination on the cross-endian path where the + * mapping is writable (MAP_PRIVATE + PROT_WRITE). Fixing + * the string in place is preferred over rejecting because it + * preserves the event for downstream processing =E2=80=94 only the + * last byte is lost. + * + * The native-endian path (MAP_SHARED + PROT_READ) cannot + * write, so it validates and skips unterminated events in + * perf_session__process_user_event() instead. The two + * strategies produce different outcomes for the same + * malformed input (fix vs skip), which is inherent in the + * writable-vs-read-only mapping model. + */ + event->bpf_metadata.prog_name[BPF_PROG_NAME_LEN - 1] =3D '\0'; + + nr =3D event->bpf_metadata.nr_entries; + max_nr =3D (event->header.size - sizeof(event->bpf_metadata)) / + sizeof(event->bpf_metadata.entries[0]); + if (nr > max_nr) + nr =3D max_nr; + + for (i =3D 0; i < nr; i++) { + event->bpf_metadata.entries[i].key[BPF_METADATA_KEY_LEN - 1] =3D '\0'; + event->bpf_metadata.entries[i].value[BPF_METADATA_VALUE_LEN - 1] =3D '\0= '; + } + return 0; +} static int perf_event__schedstat_cpu_swap(union perf_event *event __maybe_unused, bool sample_id_all __maybe_unused) @@ -1032,6 +1071,7 @@ static perf_event__swap_op perf_event__swap_ops[] =3D= { [PERF_RECORD_STAT_ROUND] =3D perf_event__stat_round_swap, [PERF_RECORD_EVENT_UPDATE] =3D perf_event__event_update_swap, [PERF_RECORD_TIME_CONV] =3D perf_event__time_conv_swap, + [PERF_RECORD_BPF_METADATA] =3D perf_event__bpf_metadata_swap, [PERF_RECORD_SCHEDSTAT_CPU] =3D perf_event__schedstat_cpu_swap, [PERF_RECORD_SCHEDSTAT_DOMAIN] =3D perf_event__schedstat_domain_swap, [PERF_RECORD_HEADER_MAX] =3D NULL, @@ -2172,9 +2212,52 @@ static s64 perf_session__process_user_event(struct p= erf_session *session, case PERF_RECORD_FINISHED_INIT: err =3D tool->finished_init(tool, session, event); break; - case PERF_RECORD_BPF_METADATA: + case PERF_RECORD_BPF_METADATA: { + u64 nr_entries, max_entries; + + if (event->header.size < sizeof(event->bpf_metadata)) { + pr_warning("WARNING: PERF_RECORD_BPF_METADATA: header.size (%u) too sma= ll, skipping\n", + event->header.size); + err =3D 0; + break; + } + + /* + * Native-endian files are mmap'd read-only =E2=80=94 validate + * NUL-termination instead of writing. + */ + if (strnlen(event->bpf_metadata.prog_name, + BPF_PROG_NAME_LEN) =3D=3D BPF_PROG_NAME_LEN) { + pr_warning("WARNING: PERF_RECORD_BPF_METADATA: prog_name not null-termi= nated, skipping\n"); + err =3D 0; + break; + } + + /* Snapshot =E2=80=94 event is mmap'd and could change between reads */ + nr_entries =3D READ_ONCE(event->bpf_metadata.nr_entries); + max_entries =3D (event->header.size - sizeof(event->bpf_metadata)) / + sizeof(event->bpf_metadata.entries[0]); + if (nr_entries > max_entries) { + pr_warning("WARNING: PERF_RECORD_BPF_METADATA: nr_entries %" PRIu64 " e= xceeds max %" PRIu64 ", skipping\n", + nr_entries, max_entries); + err =3D 0; + break; + } + + for (u64 i =3D 0; i < nr_entries; i++) { + if (strnlen(event->bpf_metadata.entries[i].key, + BPF_METADATA_KEY_LEN) =3D=3D BPF_METADATA_KEY_LEN || + strnlen(event->bpf_metadata.entries[i].value, + BPF_METADATA_VALUE_LEN) =3D=3D BPF_METADATA_VALUE_LEN) { + pr_warning("WARNING: PERF_RECORD_BPF_METADATA: entry %" PRIu64 " key/v= alue not null-terminated, skipping\n", i); + err =3D 0; + goto out; + } + } + err =3D tool->bpf_metadata(tool, session, event); break; + } case PERF_RECORD_SCHEDSTAT_CPU: err =3D tool->schedstat_cpu(tool, session, event); break; --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34BA530E835; Thu, 21 May 2026 01:11:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325900; cv=none; b=dIAc2ADh7LQwoQumkMrT6RYzMbiWAsi9EEHlmbKpeP9PmTxWL7FoIFvLNFwTNk9ZRp0yWr+svp5s54yYHHBz9O2gq7RMnYOKCC+jz4Yr5Ub5ATBkxpKx2LfE8+Xf0fvXwvWw/e2uFlj95+Qsd2kimtsQbEVfG2NXSMkes8QMJjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325900; c=relaxed/simple; bh=WRosXuZkQDmYT8rjDXE5FylHHwOQJjryxO18sN26qGQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=aId1d9D8uibXlc/bZNJBzpFT++kJ10oAuAc7r2/ph2mE16jA1UQG08QcgWpxTOQmlO5fozk/sr34uM0LkqzpUfiaHX+3uScjZKLNByTxUWFmaCbuh7RFmddiDRA7EyBDo08gP//R9kOAYMi8ai1hGGiFwT6UTY6qNJcKNWct+IA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M/PgNVIu; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="M/PgNVIu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75FCD1F00A3B; Thu, 21 May 2026 01:11:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325899; bh=I0dIR4DnWQ86OB3fVrj++Z8yjNAKmzRMqhWPPx4sOKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M/PgNVIukyolyPjpX3PmWM+EboMJ81djgkkVb4LC0LaFSwoB18i5KtdbS+FMbiMoI zfsCzR9P4PYGu6zpbt6OCQlXRO0U9byZYOMV7dpJzHpcA+2SIeLS3HOao7MuuYP295 N3bDJ+p1xkOAsRLJNXj9CDJdjkji7FPLZJjX9IoGxRq3YAdxNWKTSQOFEiXfZHdnlh 0KBGFVFuAZQRWGvIHI7rAAeyn3zM6FcVB16+urWl4AX11GcTt1t3+RU/rpYEpq+grO bpcyIcGArw2AJo6PTTEljUeSblWiFDfZD8XabtK/VkLnGW9AZ3BK+dhmETEPzPiwqP /CG04ub3xYL2g== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 15/27] perf header: Validate null-termination in PERF_RECORD_EVENT_UPDATE string fields Date: Wed, 20 May 2026 22:10:00 -0300 Message-ID: <20260521011027.622268-16-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo strdup(ev->unit) and strdup(ev->name) read until '\0' with no guarantee the string is null-terminated within event->header.size. The dump_trace fprintf path has the same problem with %s. Validate before either path runs =E2=80=94 same class of bug fixed for MMAP/MMAP2/COMM/CGROUP by perf_event__check_nul(). Also harden the event_update swap handler to: - Validate SCALE event size before swapping the double at offset 24, which exceeds the 24-byte min_size. - Validate CPUS event size before accessing the cpu_map type/nr/long_size fields, which also start at the min_size boundary. - Swap CPUS variant fields (type, nr, long_size) so the processing path sees native byte order. Add validation in perf_event__process_event_update() for all event update variants (UNIT, NAME, SCALE, CPUS) before dump_trace or processing. Validate CPUS nr against payload size for both PERF_CPU_MAP__CPUS and PERF_CPU_MAP__MASK types on the fprintf (dump_trace) path: - CPUS: check nr does not exceed available cpu entries - MASK: check nr does not exceed available mask entries for both mask32 (long_size =3D=3D 4) and mask64 (long_size =3D=3D 8) layouts, with underflow guards on the offsetof subtraction Fix a missing break before the default case in the CPUS switch path. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 149 ++++++++++++++++++++++++++++++++++++-- tools/perf/util/session.c | 99 ++++++++++++++++++++++++- 2 files changed, 241 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index c0b5c99f462ad925..a5acdcb1a4c02fca 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -5117,15 +5117,76 @@ size_t perf_event__fprintf_event_update(union perf_= event *event, FILE *fp) =20 switch (ev->type) { case PERF_EVENT_UPDATE__SCALE: + if (event->header.size < offsetof(struct perf_record_event_update, scale= ) + + sizeof(ev->scale)) { + ret +=3D fprintf(fp, "... scale: (truncated)\n"); + break; + } ret +=3D fprintf(fp, "... scale: %f\n", ev->scale.scale); break; case PERF_EVENT_UPDATE__UNIT: - ret +=3D fprintf(fp, "... unit: %s\n", ev->unit); - break; - case PERF_EVENT_UPDATE__NAME: - ret +=3D fprintf(fp, "... name: %s\n", ev->name); + case PERF_EVENT_UPDATE__NAME: { + size_t str_off =3D offsetof(struct perf_record_event_update, unit); + size_t max_len =3D event->header.size > str_off ? + event->header.size - str_off : 0; + + if (max_len =3D=3D 0 || strnlen(ev->unit, max_len) =3D=3D max_len) { + ret +=3D fprintf(fp, "... %s: (unterminated)\n", + ev->type =3D=3D PERF_EVENT_UPDATE__UNIT ? "unit" : "name"); + break; + } + ret +=3D fprintf(fp, "... %s: %s\n", + ev->type =3D=3D PERF_EVENT_UPDATE__UNIT ? "unit" : "name", + ev->unit); break; - case PERF_EVENT_UPDATE__CPUS: + } + case PERF_EVENT_UPDATE__CPUS: { + size_t cpus_off =3D offsetof(struct perf_record_event_update, cpus); + u32 cpus_payload; + + if (event->header.size < cpus_off + sizeof(__u16) + + sizeof(struct perf_record_range_cpu_map)) { + ret +=3D fprintf(fp, "... cpus: (truncated)\n"); + break; + } + + /* + * Validate nr against payload =E2=80=94 this function may be + * called from the stub handler (dump_trace path) which + * bypasses perf_event__process_event_update() validation. + */ + cpus_payload =3D event->header.size - cpus_off; + if (ev->cpus.cpus.type =3D=3D PERF_CPU_MAP__CPUS) { + if (cpus_payload < offsetof(struct perf_record_cpu_map_data, cpus_data.= cpu) || + ev->cpus.cpus.cpus_data.nr > + (cpus_payload - offsetof(struct perf_record_cpu_map_data, cpus_data= .cpu)) / + sizeof(ev->cpus.cpus.cpus_data.cpu[0])) { + ret +=3D fprintf(fp, "... cpus: nr %u exceeds payload\n", + ev->cpus.cpus.cpus_data.nr); + break; + } + } else if (ev->cpus.cpus.type =3D=3D PERF_CPU_MAP__MASK) { + if (ev->cpus.cpus.mask32_data.long_size =3D=3D 4) { + if (cpus_payload < offsetof(struct perf_record_cpu_map_data, mask32_da= ta.mask) || + ev->cpus.cpus.mask32_data.nr > + (cpus_payload - offsetof(struct perf_record_cpu_map_data, mask32_d= ata.mask)) / + sizeof(ev->cpus.cpus.mask32_data.mask[0])) { + ret +=3D fprintf(fp, "... cpus: mask nr %u exceeds payload\n", + ev->cpus.cpus.mask32_data.nr); + break; + } + } else if (ev->cpus.cpus.mask64_data.long_size =3D=3D 8) { + if (cpus_payload < offsetof(struct perf_record_cpu_map_data, mask64_da= ta.mask) || + ev->cpus.cpus.mask64_data.nr > + (cpus_payload - offsetof(struct perf_record_cpu_map_data, mask64_d= ata.mask)) / + sizeof(ev->cpus.cpus.mask64_data.mask[0])) { + ret +=3D fprintf(fp, "... cpus: mask nr %u exceeds payload\n", + ev->cpus.cpus.mask64_data.nr); + break; + } + } + } + ret +=3D fprintf(fp, "... "); =20 map =3D cpu_map__new_data(&ev->cpus.cpus); @@ -5135,6 +5196,7 @@ size_t perf_event__fprintf_event_update(union perf_ev= ent *event, FILE *fp) } else ret +=3D fprintf(fp, "failed to get cpus\n"); break; + } default: ret +=3D fprintf(fp, "... unknown type\n"); break; @@ -5269,6 +5331,82 @@ int perf_event__process_event_update(const struct pe= rf_tool *tool __maybe_unused struct evsel *evsel; struct perf_cpu_map *map; =20 + /* + * Validate payload before dump_trace or processing =E2=80=94 both + * paths access variant-specific fields without further checks. + */ + if (ev->type =3D=3D PERF_EVENT_UPDATE__UNIT || + ev->type =3D=3D PERF_EVENT_UPDATE__NAME) { + size_t str_off =3D offsetof(struct perf_record_event_update, unit); + size_t max_len =3D event->header.size - str_off; + + if (max_len =3D=3D 0 || strnlen(ev->unit, max_len) =3D=3D max_len) { + pr_warning("WARNING: PERF_RECORD_EVENT_UPDATE: %s not null-terminated, = skipping\n", + ev->type =3D=3D PERF_EVENT_UPDATE__UNIT ? "unit" : "name"); + return 0; + } + } else if (ev->type =3D=3D PERF_EVENT_UPDATE__SCALE) { + if (event->header.size < offsetof(struct perf_record_event_update, scale= ) + + sizeof(ev->scale)) { + pr_warning("WARNING: PERF_RECORD_EVENT_UPDATE: SCALE payload too small,= skipping\n"); + return 0; + } + } else if (ev->type =3D=3D PERF_EVENT_UPDATE__CPUS) { + size_t cpus_off =3D offsetof(struct perf_record_event_update, cpus); + size_t min_cpus =3D sizeof(__u16) + + sizeof(struct perf_record_range_cpu_map); + u32 cpus_payload; + + if (event->header.size < cpus_off + min_cpus) { + pr_warning("WARNING: PERF_RECORD_EVENT_UPDATE: CPUS payload too small, = skipping\n"); + return 0; + } + + /* + * Validate per-variant nr against the remaining + * payload on the native path =E2=80=94 the swap path clamps + * nr in perf_event__event_update_swap(), but native + * events are read-only and cannot be clamped in place. + * cpu_map__new_data() trusts nr for allocation and + * iteration, so unchecked values cause OOB reads. + */ + cpus_payload =3D event->header.size - cpus_off; + switch (ev->cpus.cpus.type) { + case PERF_CPU_MAP__CPUS: + if (ev->cpus.cpus.cpus_data.nr > + (cpus_payload - offsetof(struct perf_record_cpu_map_data, cpus_data= .cpu)) / + sizeof(ev->cpus.cpus.cpus_data.cpu[0])) { + pr_warning("WARNING: EVENT_UPDATE CPUS: nr %u exceeds payload, skippin= g\n", + ev->cpus.cpus.cpus_data.nr); + return 0; + } + break; + case PERF_CPU_MAP__MASK: + if (ev->cpus.cpus.mask32_data.long_size =3D=3D 4) { + if (cpus_payload < offsetof(struct perf_record_cpu_map_data, mask32_da= ta.mask) || + ev->cpus.cpus.mask32_data.nr > + (cpus_payload - offsetof(struct perf_record_cpu_map_data, mask32_d= ata.mask)) / + sizeof(ev->cpus.cpus.mask32_data.mask[0])) { + pr_warning("WARNING: EVENT_UPDATE MASK: nr %u exceeds payload, skippi= ng\n", + ev->cpus.cpus.mask32_data.nr); + return 0; + } + } else if (ev->cpus.cpus.mask64_data.long_size =3D=3D 8) { + if (cpus_payload < offsetof(struct perf_record_cpu_map_data, mask64_da= ta.mask) || + ev->cpus.cpus.mask64_data.nr > + (cpus_payload - offsetof(struct perf_record_cpu_map_data, mask64_d= ata.mask)) / + sizeof(ev->cpus.cpus.mask64_data.mask[0])) { + pr_warning("WARNING: EVENT_UPDATE MASK: nr %u exceeds payload, skippi= ng\n", + ev->cpus.cpus.mask64_data.nr); + return 0; + } + } + break; + default: + break; + } + } + if (dump_trace) perf_event__fprintf_event_update(event, stdout); =20 @@ -5300,6 +5438,7 @@ int perf_event__process_event_update(const struct per= f_tool *tool __maybe_unused evsel->core.pmu_cpus =3D map; } else pr_err("failed to get event_update cpus\n"); + break; default: break; } diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 928775f727c497cf..5c679264362d262e 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -680,8 +680,103 @@ static int perf_event__build_id_swap(union perf_event= *event, static int perf_event__event_update_swap(union perf_event *event, bool sample_id_all __maybe_unused) { - event->event_update.type =3D bswap_64(event->event_update.type); - event->event_update.id =3D bswap_64(event->event_update.id); + struct perf_record_event_update *ev =3D &event->event_update; + + ev->type =3D bswap_64(ev->type); + ev->id =3D bswap_64(ev->id); + + /* + * Swap variant-specific fields so the processing path + * sees native byte order. + */ + if (ev->type =3D=3D PERF_EVENT_UPDATE__SCALE) { + if (event->header.size < offsetof(struct perf_record_event_update, scale= ) + + sizeof(ev->scale)) + return -1; + mem_bswap_64(&ev->scale.scale, sizeof(ev->scale.scale)); + } else if (ev->type =3D=3D PERF_EVENT_UPDATE__CPUS) { + u32 cpus_payload; + struct perf_record_cpu_map_data *data =3D &ev->cpus.cpus; + + /* CPUS fields start at the same offset as scale (union) */ + if (event->header.size < offsetof(struct perf_record_event_update, cpus)= + + sizeof(__u16) + sizeof(struct perf_record_range_cpu_map)) + return -1; + cpus_payload =3D event->header.size - offsetof(struct perf_record_event_= update, cpus); + data->type =3D bswap_16(data->type); + /* + * Full swap including array elements =E2=80=94 same logic as + * perf_event__cpu_map_swap() but scoped to the + * embedded cpu_map_data within EVENT_UPDATE. + */ + switch (data->type) { + case PERF_CPU_MAP__CPUS: { + u16 nr, max_nr; + + data->cpus_data.nr =3D bswap_16(data->cpus_data.nr); + nr =3D data->cpus_data.nr; + max_nr =3D (cpus_payload - offsetof(struct perf_record_cpu_map_data, + cpus_data.cpu)) / + sizeof(data->cpus_data.cpu[0]); + if (nr > max_nr) { + nr =3D max_nr; + data->cpus_data.nr =3D nr; + } + for (unsigned int i =3D 0; i < nr; i++) + data->cpus_data.cpu[i] =3D bswap_16(data->cpus_data.cpu[i]); + break; + } + case PERF_CPU_MAP__MASK: + data->mask32_data.long_size =3D bswap_16(data->mask32_data.long_size); + switch (data->mask32_data.long_size) { + case 4: { + u16 nr, max_nr; + + data->mask32_data.nr =3D bswap_16(data->mask32_data.nr); + nr =3D data->mask32_data.nr; + max_nr =3D (cpus_payload - offsetof(struct perf_record_cpu_map_data, + mask32_data.mask)) / + sizeof(data->mask32_data.mask[0]); + if (nr > max_nr) { + nr =3D max_nr; + data->mask32_data.nr =3D nr; + } + for (unsigned int i =3D 0; i < nr; i++) + data->mask32_data.mask[i] =3D bswap_32(data->mask32_data.mask[i]); + break; + } + case 8: { + u16 nr, max_nr; + + data->mask64_data.nr =3D bswap_16(data->mask64_data.nr); + nr =3D data->mask64_data.nr; + if (cpus_payload < offsetof(struct perf_record_cpu_map_data, mask64_da= ta.mask)) { + data->mask64_data.nr =3D 0; + break; + } + max_nr =3D (cpus_payload - offsetof(struct perf_record_cpu_map_data, + mask64_data.mask)) / + sizeof(data->mask64_data.mask[0]); + if (nr > max_nr) { + nr =3D max_nr; + data->mask64_data.nr =3D nr; + } + for (unsigned int i =3D 0; i < nr; i++) + data->mask64_data.mask[i] =3D bswap_64(data->mask64_data.mask[i]); + break; + } + default: + break; + } + break; + case PERF_CPU_MAP__RANGE_CPUS: + data->range_cpu_data.start_cpu =3D bswap_16(data->range_cpu_data.start_= cpu); + data->range_cpu_data.end_cpu =3D bswap_16(data->range_cpu_data.end_cpu); + break; + default: + break; + } + } return 0; } =20 --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E86322F617C; Thu, 21 May 2026 01:11:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325904; cv=none; b=ucDYbP1tll5ctZdiemthak38vTt5jr83STQ//+BaKrt7I80mV3cv4cvwrr9/aLwd6AovbHVmc1HQWVlj8Nl3EPtcfFB+jn7Va7WuBHoIIDMASBQ3lvFReWP6Ia5lWjxEaI67vp4Ep2vFtaqWWlD4Z4fDZ8u1mnkPXq52JfB4ncA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325904; c=relaxed/simple; bh=PW41cv5kXkdVpS3ZUbxhHvzBh07qB1+iU3fAm3UazT0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MfC+3lCvTmKj/jGzYuj5RRwv7FeWjkv8sOkqsP0enSeS70NwGybp2o9cWuXgnxXhgeG3ss5PKB+9XP65eIsYCCW93Eu0M+KcNUnobRWA2/j7g+C5rhK6YWuZFoQ71NUgWomwvpdJiM6AXjtDH0Adrs7YqnZ9L/KkL2K7TuImHJI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JQ+Ogf+3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JQ+Ogf+3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98ADC1F000E9; Thu, 21 May 2026 01:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325902; bh=6Rf93g36W5u+pwfA73fWl4dUNPCQ7xkBt/ZPk9vIo8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JQ+Ogf+3ryLkL9PIYsX6aa1jzAPVrPc0h4umBFVj8eZmfK94D0zKEPBZGCe2Bk6lA 8V8HZB7ICrPUbTaRzLdBLn/fAX8NFZo80g12o2vwEjRDliK6xkFK+1qUTRQQKqflSg cMB7t65IbJ5SI2PaZoPneURZj7CsUMdqnNCLiPy/iIBv261rjDmJ/jHZkCOtS7sKPp VAUUetLORDnGxXzvz0Fa4vJdKly9x/wCmzRsaPjiXRNL51qJxudcP+qq7/Sox6Rj+H mK6EnV1/stpSj3cSKGvcvDRfcyMQVGP49+s/yxT8lS4b8S8m8cAd/jwQqVAxlYBUds ahcftPIy/g0uQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 16/27] perf tools: Bounds check perf_event_attr fields against attr.size before printing Date: Wed, 20 May 2026 22:10:01 -0300 Message-ID: <20260521011027.622268-17-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo perf_event_attr__fprintf() accessed all struct fields unconditionally, but attrs from older perf.data files or BPF-captured syscall payloads may have a smaller size than the current struct. Fields beyond the recorded size contain uninitialized or zero-filled data. Add size-guarded macros (PRINT_ATTRn, PRINT_ATTRn_bf) that compare each field's offset against attr->size before accessing it. Guard the bitfield block (disabled, inherit, ... defer_output) with attr_size >=3D 48. These bitfields share a single __u64 at offset 40, which is within PERF_ATTR_SIZE_VER0 for validated perf.data attrs, but BPF-captured attrs from perf trace can have a smaller size when the tracee passes a minimal struct to sys_perf_event_open. Also fix the BPF trace path: when perf trace intercepts sys_perf_event_open via BPF, the program copies PERF_ATTR_SIZE_VER0 bytes when the tracee passes size=3D0, but leaves the size field as 0. Set attr->size to PERF_ATTR_SIZE_VER0 in the augmented syscall handler so the bounds checks match the actual copied size. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/trace/beauty/perf_event_open.c | 20 ++- tools/perf/util/perf_event_attr_fprintf.c | 141 ++++++++++++++-------- 2 files changed, 111 insertions(+), 50 deletions(-) diff --git a/tools/perf/trace/beauty/perf_event_open.c b/tools/perf/trace/b= eauty/perf_event_open.c index c1c7445dcff994cb..42a8d2f0e0f161b7 100644 --- a/tools/perf/trace/beauty/perf_event_open.c +++ b/tools/perf/trace/beauty/perf_event_open.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: LGPL-2.1 +#include #include "trace/beauty/beauty.h" #include "util/evsel_fprintf.h" #include @@ -80,7 +81,24 @@ static size_t perf_event_attr___scnprintf(struct perf_ev= ent_attr *attr, char *bf =20 static size_t syscall_arg__scnprintf_augmented_perf_event_attr(struct sysc= all_arg *arg, char *bf, size_t size) { - return perf_event_attr___scnprintf((void *)arg->augmented.args->value, bf= , size, + struct perf_event_attr *attr =3D (void *)arg->augmented.args->value; + struct perf_event_attr local_attr; + + /* + * The BPF program copies PERF_ATTR_SIZE_VER0 bytes when the + * tracee passes size=3D0, but leaves the size field as 0. + * Copy to a local so we can fix up size without writing to + * the potentially read-only augmented args buffer. + */ + if (!attr->size) { + memcpy(&local_attr, attr, PERF_ATTR_SIZE_VER0); + memset((void *)&local_attr + PERF_ATTR_SIZE_VER0, 0, + sizeof(local_attr) - PERF_ATTR_SIZE_VER0); + local_attr.size =3D PERF_ATTR_SIZE_VER0; + attr =3D &local_attr; + } + + return perf_event_attr___scnprintf(attr, bf, size, trace__show_zeros(arg->trace)); } =20 diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/pe= rf_event_attr_fprintf.c index 741c3d657a8b6ae7..3933639d76c54bb3 100644 --- a/tools/perf/util/perf_event_attr_fprintf.c +++ b/tools/perf/util/perf_event_attr_fprintf.c @@ -275,24 +275,56 @@ static void __p_config_id(struct perf_pmu *pmu, char = *buf, size_t size, u32 type #define p_type_id(val) __p_type_id(buf, BUF_SIZE, pmu, val) #define p_config_id(val) __p_config_id(pmu, buf, BUF_SIZE, attr->type, val) =20 -#define PRINT_ATTRn(_n, _f, _p, _a) \ -do { \ - if (_a || attr->_f) { \ - _p(attr->_f); \ - ret +=3D attr__fprintf(fp, _n, buf, priv);\ - } \ +#define PRINT_ATTRn(_n, _f, _p, _a) \ +do { \ + if (attr_size >=3D offsetof(struct perf_event_attr, _f) + \ + sizeof(attr->_f) && \ + (_a || attr->_f)) { \ + _p(attr->_f); \ + ret +=3D attr__fprintf(fp, _n, buf, priv); \ + } \ +} while (0) + +/* bitfield members share an offset; most are within PERF_ATTR_SIZE_VER0 */ +#define PRINT_ATTRn_bf(_n, _f, _p, _a) \ +do { \ + if (_a || attr->_f) { \ + _p(attr->_f); \ + ret +=3D attr__fprintf(fp, _n, buf, priv); \ + } \ } while (0) =20 #define PRINT_ATTRf(_f, _p) PRINT_ATTRn(#_f, _f, _p, false) +#define PRINT_ATTRf_bf(_f, _p) PRINT_ATTRn_bf(#_f, _f, _p, false) =20 int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr, attr__fprintf_f attr__fprintf, void *priv) { struct perf_pmu *pmu =3D perf_pmus__find_by_type(attr->type); + /* + * size =3D=3D 0 means ABI0 =E2=80=94 the producer didn't set attr.size. + * perf_event__fprintf_attr() may pass the raw mmap'd event + * before the local copy, so default to PERF_ATTR_SIZE_VER0 + * (the ABI0 footprint) to avoid reading past the attr into + * the ID array that follows it in HEADER_ATTR events. + */ + u32 attr_size =3D attr->size ?: PERF_ATTR_SIZE_VER0; char buf[BUF_SIZE]; int ret =3D 0; =20 - if (!pmu && (attr->type =3D=3D PERF_TYPE_HARDWARE || attr->type =3D=3D PE= RF_TYPE_HW_CACHE)) { + /* + * Cap to what we understand: all callers store the attr in a + * buffer of sizeof(*attr) bytes (perf.data read path copies + * min(attr.size, sizeof), BPF augmented path copies into a + * fixed-size value[] array). A spoofed attr->size larger + * than sizeof would cause PRINT_ATTRn to read past the + * actual buffer. + */ + if (attr_size > sizeof(*attr)) + attr_size =3D sizeof(*attr); + + if (!pmu && attr_size >=3D offsetof(struct perf_event_attr, config) + siz= eof(attr->config) && + (attr->type =3D=3D PERF_TYPE_HARDWARE || attr->type =3D=3D PERF_TYPE_= HW_CACHE)) { u32 extended_type =3D attr->config >> PERF_PMU_TYPE_SHIFT; =20 if (extended_type) @@ -306,45 +338,53 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_ev= ent_attr *attr, PRINT_ATTRf(sample_type, p_sample_type); PRINT_ATTRf(read_format, p_read_format); =20 - PRINT_ATTRf(disabled, p_unsigned); - PRINT_ATTRf(inherit, p_unsigned); - PRINT_ATTRf(pinned, p_unsigned); - PRINT_ATTRf(exclusive, p_unsigned); - PRINT_ATTRf(exclude_user, p_unsigned); - PRINT_ATTRf(exclude_kernel, p_unsigned); - PRINT_ATTRf(exclude_hv, p_unsigned); - PRINT_ATTRf(exclude_idle, p_unsigned); - PRINT_ATTRf(mmap, p_unsigned); - PRINT_ATTRf(comm, p_unsigned); - PRINT_ATTRf(freq, p_unsigned); - PRINT_ATTRf(inherit_stat, p_unsigned); - PRINT_ATTRf(enable_on_exec, p_unsigned); - PRINT_ATTRf(task, p_unsigned); - PRINT_ATTRf(watermark, p_unsigned); - PRINT_ATTRf(precise_ip, p_unsigned); - PRINT_ATTRf(mmap_data, p_unsigned); - PRINT_ATTRf(sample_id_all, p_unsigned); - PRINT_ATTRf(exclude_host, p_unsigned); - PRINT_ATTRf(exclude_guest, p_unsigned); - PRINT_ATTRf(exclude_callchain_kernel, p_unsigned); - PRINT_ATTRf(exclude_callchain_user, p_unsigned); - PRINT_ATTRf(mmap2, p_unsigned); - PRINT_ATTRf(comm_exec, p_unsigned); - PRINT_ATTRf(use_clockid, p_unsigned); - PRINT_ATTRf(context_switch, p_unsigned); - PRINT_ATTRf(write_backward, p_unsigned); - PRINT_ATTRf(namespaces, p_unsigned); - PRINT_ATTRf(ksymbol, p_unsigned); - PRINT_ATTRf(bpf_event, p_unsigned); - PRINT_ATTRf(aux_output, p_unsigned); - PRINT_ATTRf(cgroup, p_unsigned); - PRINT_ATTRf(text_poke, p_unsigned); - PRINT_ATTRf(build_id, p_unsigned); - PRINT_ATTRf(inherit_thread, p_unsigned); - PRINT_ATTRf(remove_on_exec, p_unsigned); - PRINT_ATTRf(sigtrap, p_unsigned); - PRINT_ATTRf(defer_callchain, p_unsigned); - PRINT_ATTRf(defer_output, p_unsigned); + /* + * All bitfields share a single __u64 right after read_format. + * BPF-captured attrs from perf trace may have a small size + * when the tracee passes a minimal struct, so skip the + * entire block when it's not covered. + */ + if (attr_size >=3D offsetof(struct perf_event_attr, wakeup_events)) { + PRINT_ATTRf_bf(disabled, p_unsigned); + PRINT_ATTRf_bf(inherit, p_unsigned); + PRINT_ATTRf_bf(pinned, p_unsigned); + PRINT_ATTRf_bf(exclusive, p_unsigned); + PRINT_ATTRf_bf(exclude_user, p_unsigned); + PRINT_ATTRf_bf(exclude_kernel, p_unsigned); + PRINT_ATTRf_bf(exclude_hv, p_unsigned); + PRINT_ATTRf_bf(exclude_idle, p_unsigned); + PRINT_ATTRf_bf(mmap, p_unsigned); + PRINT_ATTRf_bf(comm, p_unsigned); + PRINT_ATTRf_bf(freq, p_unsigned); + PRINT_ATTRf_bf(inherit_stat, p_unsigned); + PRINT_ATTRf_bf(enable_on_exec, p_unsigned); + PRINT_ATTRf_bf(task, p_unsigned); + PRINT_ATTRf_bf(watermark, p_unsigned); + PRINT_ATTRf_bf(precise_ip, p_unsigned); + PRINT_ATTRf_bf(mmap_data, p_unsigned); + PRINT_ATTRf_bf(sample_id_all, p_unsigned); + PRINT_ATTRf_bf(exclude_host, p_unsigned); + PRINT_ATTRf_bf(exclude_guest, p_unsigned); + PRINT_ATTRf_bf(exclude_callchain_kernel, p_unsigned); + PRINT_ATTRf_bf(exclude_callchain_user, p_unsigned); + PRINT_ATTRf_bf(mmap2, p_unsigned); + PRINT_ATTRf_bf(comm_exec, p_unsigned); + PRINT_ATTRf_bf(use_clockid, p_unsigned); + PRINT_ATTRf_bf(context_switch, p_unsigned); + PRINT_ATTRf_bf(write_backward, p_unsigned); + PRINT_ATTRf_bf(namespaces, p_unsigned); + PRINT_ATTRf_bf(ksymbol, p_unsigned); + PRINT_ATTRf_bf(bpf_event, p_unsigned); + PRINT_ATTRf_bf(aux_output, p_unsigned); + PRINT_ATTRf_bf(cgroup, p_unsigned); + PRINT_ATTRf_bf(text_poke, p_unsigned); + PRINT_ATTRf_bf(build_id, p_unsigned); + PRINT_ATTRf_bf(inherit_thread, p_unsigned); + PRINT_ATTRf_bf(remove_on_exec, p_unsigned); + PRINT_ATTRf_bf(sigtrap, p_unsigned); + PRINT_ATTRf_bf(defer_callchain, p_unsigned); + PRINT_ATTRf_bf(defer_output, p_unsigned); + } =20 PRINT_ATTRn("{ wakeup_events, wakeup_watermark }", wakeup_events, p_unsig= ned, false); PRINT_ATTRf(bp_type, p_unsigned); @@ -359,9 +399,12 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_eve= nt_attr *attr, PRINT_ATTRf(sample_max_stack, p_unsigned); PRINT_ATTRf(aux_sample_size, p_unsigned); PRINT_ATTRf(sig_data, p_unsigned); - PRINT_ATTRf(aux_start_paused, p_unsigned); - PRINT_ATTRf(aux_pause, p_unsigned); - PRINT_ATTRf(aux_resume, p_unsigned); + /* aux_{start_paused,pause,resume} are at byte 116, past VER0 */ + if (attr_size >=3D offsetof(struct perf_event_attr, sig_data)) { + PRINT_ATTRf_bf(aux_start_paused, p_unsigned); + PRINT_ATTRf_bf(aux_pause, p_unsigned); + PRINT_ATTRf_bf(aux_resume, p_unsigned); + } =20 return ret; } --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D1352F7462; Thu, 21 May 2026 01:11:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325907; cv=none; b=A2IqnJXleO9xbh0VvhXPe1Nfomk5kF5hNkAPG9pyTOiXFmZ30UbBIIxfvM87YTqYT5mIT5sNbTqg4RubHx/LXYuaB1cK0W4/NzCLsVqeZ/wFqkBeQnBwbwMC7vjJDvY4ov0zIVGrX5t4qcFbQAoRCXvOuph1OkA/7gTQk/xEi8s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325907; c=relaxed/simple; bh=5SqcVoDwhs4O02snWyVxoXrBgVRcq0XH16OtXUHvxlQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=akfPTItZs4USxBeDqu41o+sCmrSztKlGlNu/fe0OvzAd0K6DFFVvvOsv8pF2KNP1/FQXY9W9UQ4x4hsX23c5P4mOzkwOhK+JUEVK4fYGA7+Pq9m1V6Gz8Hc24Oox1DgAXtmHI499EmrhIEbV1nHUgHVx/reOZresjxPscSOyZrU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S1eyvceU; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="S1eyvceU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56C7C1F00A3B; Thu, 21 May 2026 01:11:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325906; bh=9pOInj+H9hw3UiddnFH9fPrGOAwkA73UYr1q6TNMXWc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S1eyvceUUiETRoh/NFcj/ZT0wPrHk14WUHvA0sNfsHyInqoL+1+s+JU9T/tmHO4eO 7s8eeupAxyDY3ZqEXgSWyY5R0Uapl+W8TqlnTe7tE9T7AO1UypvQxXQrNHWAl1qAOv aHLJUpCpaQeAJiT3Vh7nDiflfVpTHnya3AcxJDh1wJl6rk3WK4+jSTKMhrD/YnHDc5 HpcoGJh+MhsLkkob2KjKQcMOnPCb6UQGzS3dHsL7TqXfAAMjiwKiTMEkJI2FiBWLTR Xa18PG10cHYnrU7bjP9uaG+k84GphS7JAhz1ggu2osQvDlqggLXyjEGsLDGgH80pCR /ag6sLgxJmqCQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , "Claude Opus 4.6 (1M context)" Subject: [PATCH 17/27] perf header: Propagate feature section processing errors Date: Wed, 20 May 2026 22:10:02 -0300 Message-ID: <20260521011027.622268-18-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo perf_session__read_header() discards the return value from perf_header__process_sections(), so any error from a feature section processor (process_nrcpus, process_compressed, etc.) is silently ignored and the session opens as if nothing went wrong. This defeats the validation added by subsequent commits in this series: a crafted perf.data that fails a feature section check would still be processed with partially-initialized state. Check the return value and fail the session if any feature section processor returns an error. For truncated files (data.size =3D=3D 0, i.e. recording was interrupted before the header was finalized), skip feature section processing entirely and clear the feature bitmap so tools use their "feature not present" fallbacks instead of accessing uninitialized env fields. Change the feature processor stubs for optional libraries (libtraceevent, libbpf) from returning -1 to returning 0, so that perf.data files containing these features can still be opened on builds without the optional library =E2=80=94 the feature is simply skipped rather than causing a fatal error. Also fix evlist__prepare_tracepoint_events() failure to return -EINVAL instead of -ENOMEM, since the failure is a data validation issue, not an allocation failure. Fixes: 1c0b04d12ae9 ("perf tools: Add perf_session__read_header function") Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 51 ++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index a5acdcb1a4c02fca..01288c08b6e09284 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -2748,8 +2748,9 @@ static int process_tracing_data(struct feat_fd *ff __= maybe_unused, void *data __ =20 return ret < 0 ? -1 : 0; #else - pr_err("ERROR: Trying to read tracing data without libtraceevent support.= \n"); - return -1; + /* Not an error =E2=80=94 the feature is simply unsupported in this build= */ + pr_debug("Tracing data present but libtraceevent not available, skipping.= \n"); + return 0; #endif } =20 @@ -3643,8 +3644,9 @@ static int process_bpf_prog_info(struct feat_fd *ff _= _maybe_unused, void *data _ up_write(&env->bpf_progs.lock); return err; #else - pr_err("ERROR: Trying to read bpf_prog_info without libbpf support.\n"); - return -1; + /* Not an error =E2=80=94 the feature is simply unsupported in this build= */ + pr_debug("BPF prog info present but libbpf not available, skipping.\n"); + return 0; #endif // HAVE_LIBBPF_SUPPORT } =20 @@ -3712,8 +3714,9 @@ static int process_bpf_btf(struct feat_fd *ff __mayb= e_unused, void *data __mayb free(node); return err; #else - pr_err("ERROR: Trying to read btf data without libbpf support.\n"); - return -1; + /* Not an error =E2=80=94 the feature is simply unsupported in this build= */ + pr_debug("BTF data present but libbpf not available, skipping.\n"); + return 0; #endif // HAVE_LIBBPF_SUPPORT } =20 @@ -4900,7 +4903,7 @@ int perf_session__read_header(struct perf_session *se= ssion) struct perf_file_header f_header; struct perf_file_attr f_attr; u64 f_id; - int nr_attrs, nr_ids, i, j, err; + int nr_attrs, nr_ids, i, j, err =3D -ENOMEM; int fd =3D perf_data__fd(data); =20 session->evlist =3D evlist__new(); @@ -4920,6 +4923,7 @@ int perf_session__read_header(struct perf_session *se= ssion) return err; } =20 + err =3D -ENOMEM; if (perf_file_header__read(&f_header, header, fd) < 0) return -EINVAL; =20 @@ -4997,15 +5001,36 @@ int perf_session__read_header(struct perf_session *= session) lseek(fd, tmp, SEEK_SET); } =20 + /* + * Skip feature section processing for truncated files + * (data.size =3D=3D 0 means recording was interrupted). The + * section table is unreliable in that case, and the event + * data can still be processed without the feature headers. + * Clear the bitmap so has_feat() returns false and tools + * use their "feature not present" fallbacks instead of + * accessing uninitialized env fields. + */ + if (f_header.data.size =3D=3D 0) { + bitmap_zero(header->adds_features, HEADER_FEAT_BITS); + } else { #ifdef HAVE_LIBTRACEEVENT - perf_header__process_sections(header, fd, &session->tevent, - perf_file_section__process); + err =3D perf_header__process_sections(header, fd, &session->tevent, + perf_file_section__process); + if (err < 0) + goto out_delete_evlist; =20 - if (evlist__prepare_tracepoint_events(session->evlist, session->tevent.pe= vent)) - goto out_delete_evlist; + if (evlist__prepare_tracepoint_events(session->evlist, + session->tevent.pevent)) { + err =3D -EINVAL; + goto out_delete_evlist; + } #else - perf_header__process_sections(header, fd, NULL, perf_file_section__proces= s); + err =3D perf_header__process_sections(header, fd, NULL, + perf_file_section__process); + if (err < 0) + goto out_delete_evlist; #endif + } =20 return 0; out_errno: @@ -5014,7 +5039,7 @@ int perf_session__read_header(struct perf_session *se= ssion) out_delete_evlist: evlist__delete(session->evlist); session->evlist =3D NULL; - return -ENOMEM; + return err; } =20 int perf_event__process_feature(const struct perf_tool *tool __maybe_unuse= d, --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34378317161; Thu, 21 May 2026 01:11:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325911; cv=none; b=JHuy5pPcxQs92kbB/WnOGKP984JA24+f0Ck0L6IFsMSGZQE57VI+09LWacxpYBa7CPmWF9Mau45AnkUU7/rca1MYhIVp/kWUOT5iicwIOgYlfoRL252R0uK3QTcaWgdTg3iZCVQ9V2upDOjmW6H0NMSzRs17lJjXYqXI8oGoRpI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325911; c=relaxed/simple; bh=UH8qZMtB0dZev38iw6EV5IiGwNP/HJWHgd1a5/fm4p0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PtJXTeHXet5/49A29/P6NNDdmW/VO0w+JyllDKDA8bTtf5XLWthI8wWne30YWIjUeBzg0qsEboq3fNpP2K3CXDB7NhfHBfjNnpJBpPUN8Cn6RE4aQ1CpEi0+vUcaGhhS64hRSdLNRMRFzvWI/J5tbk21+w8qXDz3CxSfv0+yPrk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=N2oKHQ4h; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="N2oKHQ4h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D73241F000E9; Thu, 21 May 2026 01:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325910; bh=WkDyanjkd0fsHYlYgKixcxHkfdMbK2pEV7ITx3xVGFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=N2oKHQ4hSzJrHKMlx605NUnEyZ43O3RjwDHSQdEhrvCIg1vngGNyQvFFHFntGkih4 AkXJ/tsxJQylfBsyYgFTesYmt2etVvHJ6f8oEe83krDOjFLSM03ZrJvkDwXDbOwZQE F8/bAA/SijdpoNZetyLVacrOvh4qhxGlgkludNG/eYecExCkebzogWVM74HZnqOslQ rLbtydNkrdrAoYs60uKPbIH1RxeOlNBOJ4OpD7qyH9P4QquVnF58mlr00rDOUcqeZ7 kDId60c2IqfqmekKhWbs/CfliR8mRemgGkFXIri/eiNnC8piVfWrzaDAZjLyinqNJ/ qcWVv2Y7PyrUg== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 18/27] perf header: Validate f_attr.ids section before use in perf_session__read_header() Date: Wed, 20 May 2026 22:10:03 -0300 Message-ID: <20260521011027.622268-19-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo perf_session__read_header() reads f_attr.ids.size from the perf.data file and divides it by sizeof(u64) to compute nr_ids, which is declared as int. No validation is performed on the value before it is used to allocate arrays and drive a read loop. On 32-bit architectures, a crafted f_attr.ids.size of 0x100000000 (4 GB) produces nr_ids =3D 0x20000000, but the allocation size 1 * 0x20000000 * 8 overflows size_t to 0, so zalloc(0) returns a valid pointer. The subsequent loop writes 0x20000000 IDs into that zero-length buffer, corrupting the heap. On 64-bit, the u64-to-int truncation silently drops high bits, processing fewer IDs than the file claims. While not exploitable, this is a data integrity issue. Add validation before using f_attr.ids: - Cap nr_attrs (attrs.size / attr_size) to MAX_NR_ATTRS (1 << 16) with overflow-safe u64 comparison before assigning to int - Reject ids.size not aligned to sizeof(u64) - Cap ids.size / sizeof(u64) to MAX_IDS_PER_ATTR (1 << 24) to prevent int truncation and size_t overflow on 32-bit - Reject ids sections that extend past the end of the file, guarded by S_ISREG() so non-regular files (block devices, pipes) are not falsely rejected Also fix perf_header__getbuffer64() to set errno =3D EIO when readn() returns 0 (EOF). Without this, the out_errno path in perf_session__read_header() returns -errno which is 0 (success) on truncated files, causing downstream NULL dereferences. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 77 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 01288c08b6e09284..ad0a6aab8a6d5336 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -64,6 +64,25 @@ #include #endif =20 +/* + * nr_ids * sizeof(struct perf_sample_id) must not overflow + * size_t on 32-bit; the struct is ~104 bytes (32-bit) or + * ~184 bytes (64-bit), so 1<<24 (16M) keeps the product + * under 2 GB on 32-bit. + * + * This is a per-attribute cap only =E2=80=94 the total across all + * attributes is not capped because legitimate high-core-count + * workloads (e.g. 5000 tracepoints =C3=97 4096 CPUs) can exceed + * a single-attribute limit. + */ +#define MAX_IDS_PER_ATTR (1 << 24) +/* + * Cap nr_attrs to prevent resource exhaustion from crafted + * files. 65536 is well beyond any real workload (perf stat + * typically uses < 100 events) but prevents u64-to-int + * truncation on the attr count. + */ +#define MAX_NR_ATTRS (1 << 16) #define MAX_BPF_DATA_LEN (256 * 1024 * 1024) #define MAX_BPF_PROGS 131072 #define MAX_CACHE_ENTRIES 32768 @@ -4468,8 +4487,13 @@ int perf_session__inject_header(struct perf_session = *session, static int perf_header__getbuffer64(struct perf_header *header, int fd, void *buf, size_t size) { - if (readn(fd, buf, size) <=3D 0) + ssize_t n =3D readn(fd, buf, size); + + if (n <=3D 0) { + if (n =3D=3D 0) + errno =3D EIO; return -1; + } =20 if (header->needs_swap) mem_bswap_64(buf, size); @@ -4803,6 +4827,8 @@ static int read_attr(int fd, struct perf_header *ph, if (ret <=3D 0) { pr_debug("cannot read %d bytes of header attr\n", PERF_ATTR_SIZE_VER0); + if (ret =3D=3D 0) + errno =3D EIO; return -1; } =20 @@ -4903,6 +4929,7 @@ int perf_session__read_header(struct perf_session *se= ssion) struct perf_file_header f_header; struct perf_file_attr f_attr; u64 f_id; + struct stat input_stat; int nr_attrs, nr_ids, i, j, err =3D -ENOMEM; int fd =3D perf_data__fd(data); =20 @@ -4951,6 +4978,15 @@ int perf_session__read_header(struct perf_session *s= ession) return -EINVAL; } =20 + if (fstat(fd, &input_stat) < 0) + return -errno; + + /* Check before assigning to int to avoid u64-to-int truncation */ + if (f_header.attrs.size / f_header.attr_size > MAX_NR_ATTRS) { + pr_err("Too many attributes: %" PRIu64 " (max %d)\n", + f_header.attrs.size / f_header.attr_size, MAX_NR_ATTRS); + return -EINVAL; + } nr_attrs =3D f_header.attrs.size / f_header.attr_size; lseek(fd, f_header.attrs.offset, SEEK_SET); =20 @@ -4967,6 +5003,45 @@ int perf_session__read_header(struct perf_session *s= ession) perf_event__attr_swap(&f_attr.attr); } =20 + /* + * Validate ids section: must be aligned to u64, and + * the count must fit in an int to avoid truncation in + * nr_ids and size_t overflow in perf_evsel__alloc_id() + * on 32-bit architectures. + */ + if (f_attr.ids.size % sizeof(u64)) { + pr_err("Invalid ids section size %" PRIu64 " for attr %d, not aligned t= o u64\n", + f_attr.ids.size, i); + err =3D -EINVAL; + goto out_delete_evlist; + } + + /* + * Cap the ID count to avoid int truncation of nr_ids + * on 64-bit and size_t overflow in the allocation + * paths (nr_ids * sizeof(u64), nr_ids * + * sizeof(struct perf_sample_id)) on 32-bit. + */ + if (f_attr.ids.size / sizeof(u64) > MAX_IDS_PER_ATTR) { + pr_err("Invalid ids section size %" PRIu64 " for attr %d, too many IDs\= n", + f_attr.ids.size, i); + err =3D -EINVAL; + goto out_delete_evlist; + } + + /* + * FIXME: see perf_header__process_sections() =E2=80=94 block + * devices bypass this check because st_size is 0. + */ + if (S_ISREG(input_stat.st_mode) && + (f_attr.ids.offset > (u64)input_stat.st_size || + f_attr.ids.size > (u64)input_stat.st_size - f_attr.ids.offset)) { + pr_err("Invalid ids section for attr %d: offset=3D%" PRIu64 " size=3D%"= PRIu64 " exceeds file size %" PRIu64 "\n", + i, f_attr.ids.offset, f_attr.ids.size, (u64)input_stat.st_size); + err =3D -EINVAL; + goto out_delete_evlist; + } + tmp =3D lseek(fd, 0, SEEK_CUR); evsel =3D evsel__new(&f_attr.attr); =20 --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6374C31E83D; Thu, 21 May 2026 01:11:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325915; cv=none; b=XD9o0CS4BRJMD2913omu0nc7UeuDkP0/CXdpr9iLE/JAN9VkCswu3YAJTIECsGj9GqKzz+xbqwHY7CfcSMCaVOx3ZJFza03MVRp/53alINVuRFNo4ihlzgFwHeoIrLsxtss5Ql+YdLxbaKSGeSkDOT7cYA4fBTkobpKiqKncVUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325915; c=relaxed/simple; bh=Y2h+CVvXwGxDcsNibmCM4j/7sROHXesboSchM2mh8gU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Qmw1kOMlhSPVJw2F+3HV2mCgTNECJM4cmo/ocCH/nbXvIHxJNIF0TauzkNIYGQNckXGUAbRcBehApije68AB3IEoDVrg20DZgWyw2fHy/kp9aZHe2a+K7AnXV3WMghMw5+ljrcpF/GGapKaIVm1/wj5449ZXnG8t81yzJW8XvEU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jK5vnpZM; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jK5vnpZM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96A561F00A3B; Thu, 21 May 2026 01:11:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325914; bh=rJ47xZ5z5sp6xTwzTpQXJSwv9U/H2TiBxMS2fbkB5mw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jK5vnpZM8RAdfKt75p7Z/HTZgsC+1vo3kcX9AUAXPFtSyzLqxpUrDea0P3n3nWI0l 5auQD6jGP5IWuIWuIfJiRV+Hn54Bh7Q/PWmpZSwwScDr2hAaCfjR4cy48jfK7XrWH4 y08yNxtn+ptBdnKz3ZdQWo7J3/F7YJr6j8fRbx4LrJB9jDdIbOVuELJdHIseT2gl7k 2lRX5tJ1cnDDItCcuFTedA8kvGCc8W00Ez2Cs5Uw8+X7ratyBPNm9J8oQCYq9TYUV7 +Aytq7mrOy3pkqIgw0bVvhliSJL41RMldvX55hN/z+onAsHpS5Mt6BhnylnypKrZlq 2ARko21r4NoZQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, David Carrillo-Cisneros , "Claude Opus 4.6 (1M context)" Subject: [PATCH 19/27] perf header: Validate feature section size and add read path bounds checking Date: Wed, 20 May 2026 22:10:04 -0300 Message-ID: <20260521011027.622268-20-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo Harden feature section parsing against crafted perf.data files: 1. perf_header__process_sections() reads the feature section table and passes each section's offset and size directly to the processing callbacks without validating them against the actual file size. A crafted section size would make all downstream bounds checks against ff->size ineffective since they compare against the untrusted, inflated bound. Add an fstat() check with S_ISREG() guard and verify that each section's offset + size does not extend past EOF. 2. __do_read_buf() validates reads against ff->size (section size), but __do_read_fd() had no such check, so a malformed perf.data with an understated section size could cause reads past the end of the current section into the next section's data. Add the bounds check in __do_read(), the common caller of both helpers, so it is enforced uniformly for both the fd and buf paths. Track the section-relative offset in __do_read_fd() so the check works for the fd path. Reject negative sizes which on 32-bit can occur when a u32 >=3D 0x80000000 is passed as ssize_t. 3. do_read_string() relied on file data being null-padded. Add explicit null-termination (buf[len-1] =3D '\0') after reading and validate length (>=3D 1, fits within section) before allocating, so callers like process_cpu_topology() never receive an unterminated string. 4. Initialize feat_fd.offset to 0 (section-relative) instead of section->offset (file-absolute) so the bounds tracking is consistent with __do_read()'s section-relative comparison. Adjust process_build_id() to use lseek() for its file-absolute offset needs since it cannot rely on ff->offset for that. 5. Propagate ff->size to perf_file_section__fprintf_info() so its reads are also bounded. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: David Carrillo-Cisneros Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 65 ++++++++++++++++++++++++++++++++++------ 1 file changed, 56 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index ad0a6aab8a6d5336..bea1446046282ce9 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -233,23 +233,32 @@ static int __do_read_fd(struct feat_fd *ff, void *add= r, ssize_t size) =20 if (ret !=3D size) return ret < 0 ? (int)ret : -1; + ff->offset +=3D size; return 0; } =20 static int __do_read_buf(struct feat_fd *ff, void *addr, ssize_t size) { - if (size > (ssize_t)ff->size - ff->offset) - return -1; - memcpy(addr, ff->buf + ff->offset, size); ff->offset +=3D size; =20 return 0; - } =20 static int __do_read(struct feat_fd *ff, void *addr, ssize_t size) { + /* + * Reject negative sizes, which on 32-bit can occur when a + * u32 >=3D 0x80000000 is passed as ssize_t. The cast to + * ssize_t is safe because perf_header__process_sections() + * validates that each section fits within the file size + * before any feature callback reaches here, and only + * feature sections (metadata like build IDs, topology, etc.) + * use this path =E2=80=94 these cannot legitimately approach 2GB. + */ + if (size < 0 || size > (ssize_t)ff->size - ff->offset) + return -1; + if (!ff->buf) return __do_read_fd(ff, addr, size); return __do_read_buf(ff, addr, size); @@ -289,16 +298,25 @@ static char *do_read_string(struct feat_fd *ff) if (do_read_u32(ff, &len)) return NULL; =20 + /* At least the null terminator. */ + if (len < 1 || len > ff->size - ff->offset) { + pr_debug("do_read_string: invalid length %u (remaining %zu)\n", + len, (size_t)(ff->size - ff->offset)); + return NULL; + } + buf =3D malloc(len); if (!buf) return NULL; =20 if (!__do_read(ff, buf, len)) { /* - * strings are padded by zeroes - * thus the actual strlen of buf - * may be less than len + * do_write_string() writes len including the null + * terminator, padded to NAME_ALIGN. Ensure the + * string is always null-terminated even if the file + * data has been tampered with. */ + buf[len - 1] =3D '\0'; return buf; } =20 @@ -2775,7 +2793,12 @@ static int process_tracing_data(struct feat_fd *ff _= _maybe_unused, void *data __ =20 static int process_build_id(struct feat_fd *ff, void *data __maybe_unused) { - if (perf_header__read_build_ids(ff->ph, ff->fd, ff->offset, ff->size)) + off_t offset =3D lseek(ff->fd, 0, SEEK_CUR); + + if (offset =3D=3D (off_t)-1) + return -1; + + if (perf_header__read_build_ids(ff->ph, ff->fd, offset, ff->size)) pr_debug("Failed to read buildids, continuing...\n"); return 0; } @@ -4152,6 +4175,7 @@ static int perf_file_section__fprintf_info(struct per= f_file_section *section, ff =3D (struct feat_fd) { .fd =3D fd, .ph =3D ph, + .size =3D section->size, }; =20 if (!feat_ops[feat].full_only || hd->full) @@ -4512,6 +4536,7 @@ int perf_header__process_sections(struct perf_header = *header, int fd, int sec_size; int feat; int err; + struct stat st; =20 nr_sections =3D bitmap_weight(header->adds_features, HEADER_FEAT_BITS); if (!nr_sections) @@ -4529,7 +4554,29 @@ int perf_header__process_sections(struct perf_header= *header, int fd, if (err < 0) goto out_free; =20 + if (fstat(fd, &st) < 0) { + pr_err("Failed to stat the perf data file\n"); + err =3D -1; + goto out_free; + } + for_each_set_bit(feat, header->adds_features, header->last_feat) { + /* + * FIXME: block devices have st_size =3D=3D 0, so we skip + * bounds checking entirely. Historically perf never + * prevented using a block device as input, but it + * probably should =E2=80=94 there's no valid use case for it + * and it bypasses all file-size validation. + */ + if (S_ISREG(st.st_mode) && + (sec->offset > (u64)st.st_size || + sec->size > (u64)st.st_size - sec->offset)) { + pr_err("Feature %s (%d) section extends past EOF (offset=3D%" PRIu64 ",= size=3D%" PRIu64 ", file=3D%" PRIu64 ")\n", + header_feat__name(feat), feat, + sec->offset, sec->size, (u64)st.st_size); + err =3D -1; + goto out_free; + } err =3D process(sec++, header, feat, fd, data); if (err < 0) goto out_free; @@ -4756,7 +4803,7 @@ static int perf_file_section__process(struct perf_fil= e_section *section, .fd =3D fd, .ph =3D ph, .size =3D section->size, - .offset =3D section->offset, + .offset =3D 0, }; =20 if (lseek(fd, section->offset, SEEK_SET) =3D=3D (off_t)-1) { --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DCFF2FD1AA; Thu, 21 May 2026 01:11:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325919; cv=none; b=gsfItad2VS86kCfFGAI09AOsSKss2DwImxzPuZlrks9p66HCcNzYU+auAjTyNztVLdwhs/W9IDz5M6UUwejotXTX/q8Iyw7/mFCIZOP0KD9+lFxZi7qs11fiAyBLR5n18zALHczYYnwkCSgukDcuqjtotlhwhWMRVqWp4Nb2HyM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325919; c=relaxed/simple; bh=4GiJux1QXQ0TO/PnVj5QD9bUFxkgW1/aL3+3VWPmNd8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qDpV2yJyzhi1kp6OEIHuES2h7DxZj8Q08/NcjhrRYreDDCmglEsQfPE7TZ6TN3DW7uk3l8RWxBZEfyIOp8o/0fsLPGnCeQrRx8yh6gC+D9tSyNQY1ldRtBSYnhANkYpWAsm7/RSfhRemw9OZyXxa9lnaa/ryAZaZFAyax2NLDxM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eRkxCwju; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eRkxCwju" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86E691F000E9; Thu, 21 May 2026 01:11:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325918; bh=cDSk8lTfw789EePfAjRGrLwoyOcs30FApoVLrMXWXu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eRkxCwjuOt0xzfXy1/Gfi0LRXcbFspWUp9pcZk8iiy0oPsxOmNUA98/AjXpYzZtGP 4Kj1uQw0M+HcIFsWwwGZJ0FBfvBOW4+B5AxnQXrfgzWhOEQoJenNMbVhkFt1jZDV84 73zr2qtgN+scDKPRGZMcQi2MRmB0ph7LpfkINS5PFTsNtBppHupDu5X0+VLH9QFMdx ZlUKGxDR77pbqsgOISr0WG/0XB8Ckq1+6fO1NTaO9qYrTMFpJEw8ZM/qeM3Fyp6APb aF9iE4X148yujCLVWtleDIPPipOSPR2nXrcc5sKt9XWFGOcHdRcCEo+c1OtnRAGCg4 crmBNU24luxyA== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, Wang Nan , "Claude Opus 4.6 (1M context)" Subject: [PATCH 20/27] perf header: Sanity check HEADER_EVENT_DESC attr.size before swap Date: Wed, 20 May 2026 22:10:05 -0300 Message-ID: <20260521011027.622268-21-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo read_event_desc() reads nre (event count), sz (attr size), and nr (IDs per event) from the file and uses them to control allocations and loops without validating them against the section size. A crafted perf.data could trigger large allocations or many loop iterations before __do_read() eventually rejects the reads. Add bounds checks in read_event_desc(): - Reject sz smaller than PERF_ATTR_SIZE_VER0. - Require at least one event (nre > 0). - Check that nre events fit in the remaining section, using the minimum per-event footprint of sz + sizeof(u32). - Pre-swap attr->size to native byte order, then reject values below PERF_ATTR_SIZE_VER0 or above sz before calling perf_event__attr_swap() to prevent heap out-of-bounds access. - Handle ABI0 (attr.size =3D=3D 0): substitute PERF_ATTR_SIZE_VER0, and on native-endian files write the value back so free_event_desc() does not treat the zero as its end-of-array sentinel (it iterates while attr.size !=3D 0). The swap path skips the write-back =E2=80=94 perf_event__attr_swap() has its own ABI0 fallback that sets VER0 after swapping. - Check that nr IDs fit in the remaining section before allocating. Fixes: b30b61729246 ("perf tools: Fix a problem when opening old perf.data = with different byte order") Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 54 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index bea1446046282ce9..05674b76df9b47f6 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -2173,9 +2173,28 @@ static struct evsel *read_event_desc(struct feat_fd = *ff) if (do_read_u32(ff, &nre)) goto error; =20 + /* Size of each of the nre attributes. */ if (do_read_u32(ff, &sz)) goto error; =20 + /* + * Require at least one event with an attr no smaller than the + * first published struct, and reject sz values where + * sz + sizeof(u32) would overflow size_t (possible on 32-bit) + * or nre =3D=3D UINT32_MAX where nre + 1 wraps to 0 in the calloc. + * + * The minimum section footprint per event is sz bytes for the + * attr plus a u32 for the id count, check that nre events fit. + */ + if (!nre || sz < PERF_ATTR_SIZE_VER0 || + sz > ff->size || (size_t)sz > SIZE_MAX - sizeof(u32) || + nre =3D=3D UINT32_MAX || + nre > (ff->size - ff->offset) / (sz + sizeof(u32))) { + pr_err("Invalid HEADER_EVENT_DESC: nre=3D%u sz=3D%u (min %d)\n", + nre, sz, PERF_ATTR_SIZE_VER0); + goto error; + } + /* buffer to hold on file attr struct */ buf =3D malloc(sz); if (!buf) @@ -2191,6 +2210,9 @@ static struct evsel *read_event_desc(struct feat_fd *= ff) msz =3D sz; =20 for (i =3D 0, evsel =3D events; i < nre; evsel++, i++) { + struct perf_event_attr *attr =3D buf; + u32 attr_size; + evsel->core.idx =3D i; =20 /* @@ -2200,6 +2222,32 @@ static struct evsel *read_event_desc(struct feat_fd = *ff) if (__do_read(ff, buf, sz)) goto error; =20 + /* Reject before attr_swap to prevent OOB via bswap_safe() */ + attr_size =3D ff->ph->needs_swap ? bswap_32(attr->size) : attr->size; + /* ABI0: size =3D=3D 0 means the producer didn't set it */ + if (!attr_size) { + attr_size =3D PERF_ATTR_SIZE_VER0; + /* + * Write back so free_event_desc() doesn't + * treat this event as the end-of-array sentinel + * (it iterates while attr.size !=3D 0). + * + * Only for native =E2=80=94 the swap path must NOT + * write native-endian VER0 here because + * perf_event__attr_swap() would re-swap it + * to 0x40000000, defeating bswap_safe() bounds. + * perf_event__attr_swap() has its own ABI0 + * fallback that sets VER0 after swapping. + */ + if (!ff->ph->needs_swap) + attr->size =3D attr_size; + } + if (attr_size < PERF_ATTR_SIZE_VER0 || attr_size > sz) { + pr_err("Event %d attr.size (%u) invalid (min: %d, max: %u)\n", + i, attr_size, PERF_ATTR_SIZE_VER0, sz); + goto error; + } + if (ff->ph->needs_swap) perf_event__attr_swap(buf); =20 @@ -2221,6 +2269,12 @@ static struct evsel *read_event_desc(struct feat_fd = *ff) if (!nr) continue; =20 + /* Prevent oversized allocation from crafted nr */ + if (nr > (ff->size - ff->offset) / sizeof(*id)) { + pr_err("Event %d: id count %u exceeds remaining section\n", i, nr); + goto error; + } + id =3D calloc(nr, sizeof(*id)); if (!id) goto error; --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0828E328B77; Thu, 21 May 2026 01:12:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325923; cv=none; b=W1atkLFInVtZjgt9+3QQg/MgElkEMZYtPhLvc/WalHGOtGY54GpOrgaqHJ5JTi0MWBe9n+1wAEUBgDeo1TfnDE+Wus2lJNI9duzbr0IpGo9wLOy+6TpDxbXa9k0SLQ19a+dUBh88SqfbOafaLzPBuRcTRzKGWgxZJJOq46Wvirg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325923; c=relaxed/simple; bh=lE0Lp4NvipUcKkNQLLOOZWucucRFl5RhO95SQFiVuUo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZnR9Ppsm0IHSv/uEHwW3VtKIzxrolpkbBAgkYy/uy1FGcpu7WYWrSw8kP4A3AloZh8BIYd0TdWUwJaytODQEcxJpKNzQjJp05ScWh0MjSlaZj27wGqsXqacjRlZNR3a4foWaTUpIsrAYysHXiY4Qa6ge3aKhSPfMn5rG6LtAB7k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oSHe778x; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oSHe778x" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 781F01F00A3B; Thu, 21 May 2026 01:11:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325921; bh=HdLJnlfbFxfwz3n9WaCXsNCSFEvx7+4Ha7Ihp8LuP2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oSHe778xl4Q682xLleyeMMfV1OLxvusfzZd8hB4Zk7z4BUcQKwU6yhRGXnMD6TKSW wjE9j3SIJGWXFG3KBaATThqKiPbQftVr0BzBxLDU1hn0YuNhXvdNmrLO9iDpfv6Ir7 U46drTx0zHjmK+2K58LjFQ+21nNI0Y1gR/7zbl6oclh6prraMPuPHaT3n1taNjE43B h+VxHTX3+NHCis5iLDBfkR5oTCnajfZnFpjoJX+j8KXyFmltM7f2P/Dyf0UVboNUrE M4S7JeFtEKXJNibTsfqCbKZFT6uxYOR3enVRSzScqJv4p1vr+5Gu9TQq6cTEEU7zJ3 AxhJDrdIuGAFg== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 21/27] perf header: Validate bitmap size before allocating in do_read_bitmap() Date: Wed, 20 May 2026 22:10:06 -0300 Message-ID: <20260521011027.622268-22-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo do_read_bitmap() reads a u64 bit count from the file and passes it to bitmap_zalloc() without checking it against the remaining section size. A crafted perf.data could trigger a large allocation that would only fail later when the per-element reads exceed section bounds. Additionally, bitmap_zalloc() takes an int parameter, so a crafted size with bits set above bit 31 (e.g. 0x100000040) would pass the section bounds check but truncate when passed to bitmap_zalloc(), allocating a much smaller buffer than the subsequent read loop expects. Reject size values that exceed INT_MAX, and check that the data needed (BITS_TO_U64(size) u64 values) fits in the remaining section before allocating. Switch from bitmap_zalloc() to calloc() of u64 units so the allocation size matches the u64 read/write granularity and avoids unsigned long vs u64 mismatch on 32-bit architectures. Fix do_write_bitmap() to use memcpy to read u64-sized chunks from the unsigned long bitmap, preventing out-of-bounds reads on 32-bit systems where sizeof(unsigned long) is 4 but the bitmap is stored in u64 units. Fix process_mem_topology() minimum section size: the check used nr * 2 * sizeof(u64) per node, but do_read_bitmap() reads an additional u64 for the bitmap size, so the minimum is 3 * sizeof(u64). Fix memory leak in process_mem_topology() error paths: replace free(nodes) with memory_node__delete_nodes() to free per-node bitmaps allocated by do_read_bitmap(). Currently used by process_mem_topology() for HEADER_MEM_TOPOLOGY. Reported-by: sashiko-bot@kernel.org # Running on a local machine Closes: https://lore.kernel.org/linux-perf-users/20260414224622.2AE69C19425= @smtp.kernel.org/ Fixes: a881fc56038a ("perf header: Sanity check HEADER_MEM_TOPOLOGY") Closes: https://lore.kernel.org/linux-perf-users/20260410223242.DD76FC19421= @smtp.kernel.org/ Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 05674b76df9b47f6..634a11c7d8b9a9ef 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -178,15 +178,25 @@ int do_write(struct feat_fd *ff, const void *buf, siz= e_t size) /* Return: 0 if succeeded, -ERR if failed. */ static int do_write_bitmap(struct feat_fd *ff, unsigned long *set, u64 siz= e) { - u64 *p =3D (u64 *) set; + size_t byte_size =3D BITS_TO_LONGS(size) * sizeof(unsigned long); int i, ret; =20 ret =3D do_write(ff, &size, sizeof(size)); if (ret < 0) return ret; =20 + /* + * The on-disk format uses u64 elements, but the in-memory bitmap + * uses unsigned long, which is only 4 bytes on 32-bit architectures. + * Copy with bounded size so the last element doesn't read past the + * bitmap allocation when BITS_TO_LONGS(size) is odd. + */ for (i =3D 0; (u64) i < BITS_TO_U64(size); i++) { - ret =3D do_write(ff, p + i, sizeof(*p)); + u64 val =3D 0; + size_t off =3D i * sizeof(val); + + memcpy(&val, (char *)set + off, min(sizeof(val), byte_size - off)); + ret =3D do_write(ff, &val, sizeof(val)); if (ret < 0) return ret; } @@ -335,7 +345,20 @@ static int do_read_bitmap(struct feat_fd *ff, unsigned= long **pset, u64 *psize) if (ret) return ret; =20 - set =3D bitmap_zalloc(size); + /* Bitmap APIs use int for nbits; reject u64 values that truncate. */ + if (size > INT_MAX || + BITS_TO_U64(size) > (ff->size - ff->offset) / sizeof(u64)) { + pr_debug("do_read_bitmap: size %" PRIu64 " exceeds section bounds\n", si= ze); + return -1; + } + + /* + * bitmap_zalloc() allocates in unsigned long units, which are only + * 4 bytes on 32-bit architectures. The read loop below casts the + * buffer to u64 * and writes 8-byte elements, so allocate in u64 + * units to ensure the buffer is large enough. + */ + set =3D calloc(BITS_TO_U64(size), sizeof(u64)); if (!set) return -ENOMEM; =20 @@ -3496,7 +3519,7 @@ static int process_mem_topology(struct feat_fd *ff, return -1; } =20 - if (ff->size < 3 * sizeof(u64) + nr * 2 * sizeof(u64)) { + if (ff->size < 3 * sizeof(u64) + nr * 3 * sizeof(u64)) { pr_err("Invalid HEADER_MEM_TOPOLOGY: section too small (%zu) for %llu no= des\n", ff->size, (unsigned long long)nr); return -1; @@ -3531,7 +3554,7 @@ static int process_mem_topology(struct feat_fd *ff, =20 out: if (ret) - free(nodes); + memory_node__delete_nodes(nodes, nr); return ret; } =20 --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC2F42FE066; Thu, 21 May 2026 01:12:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325926; cv=none; b=dc57Ona6+edRTSvuM5z5GI6pgLmN5MiqawqzZhEoRHXTrDHNsQmNkcnLu4FG2Hc1cLmaYdIeO4aNUHDxiwFBk9174FeoNsqbQjGGUql/Wd8JSJcSC9JGC3/yIvIMdfYSdKJxZsIK4cf+4IN6Gi70hziZ6g5XBl3hvF0pS/TyO1I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325926; c=relaxed/simple; bh=Yqg/IBE2CcGpNJPPDJ4kC7uzHfAqzlRL6k9ckhkcn+s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MBVBNfj9zwy8BGvqsdh1BDtF4w8rGXmJQD1jUUOTp94VaI75SSZ+WFhLjKyn7zQVgSDuj/AQ9mQDGHGChDRc6/azCMIDCNF9M3V2tZJEhzhTnZCDbg44L7U2UwDjSHNcYdXVYr7RlEHTo29+UZV0k3KGXnUn9FH3+VHj1IPaILI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=beUD0xfr; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="beUD0xfr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3AF9D1F000E9; Thu, 21 May 2026 01:12:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325925; bh=dJprlDZCEIfvTVcYWDyyLMwv3FMI4RqyQGUtKkqsT2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=beUD0xfrIImVa3MTthubR1dfB+XlqdS2ljs7I6plVtMuXHwYE/IOClWU+MQKA4/U/ BF664bYp13yBd0+r8a4LDgt6w62tcazXkbPpmPknFoBNCMkjK/GoajR6H/qbqthovw WhGjl5H3eT0l2V1bpqVQ8IgE+cTXrcwalwjiTfMZ2QRx18JFqH11Ddv8kl4WEOFN0o 4jJ+6EbuEP2TjZ3CsVZGjtE/FDkdSoRk4cqPshKQN7I7YyoW0CI+/KpZoNWMI8rDlG AqCoNhQFGG5xViodfybLo5FI6xeDdb8XF2UHDO5RzxEylcZeeQ7h7/5FZB1Bw+Q3KM DqIjxePNozeQQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, Chun-Tse Shao , "Claude Opus 4.6 (1M context)" Subject: [PATCH 22/27] perf session: Add byte-swap for PERF_RECORD_COMPRESSED2 events Date: Wed, 20 May 2026 22:10:07 -0300 Message-ID: <20260521011027.622268-23-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo PERF_RECORD_COMPRESSED2 has a data_size field (__u64) at offset 8 that is not covered by the header byte-swap in prefetch_event(). When reading a cross-endian perf.data file, data_size was used without swapping, causing either garbage decompression sizes or silent data corruption. PERF_RECORD_COMPRESSED (the original format) has no fields beyond the header, so it doesn't need a swap op. Add perf_event__compressed2_swap() and register it in perf_event__swap_ops[]. Fixes: 208c0e168344 ("perf record: Add 8-byte aligned event type PERF_RECOR= D_COMPRESSED2") Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Chun-Tse Shao Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 5c679264362d262e..7e25f75de37abce4 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1028,6 +1028,14 @@ static int perf_event__time_conv_swap(union perf_eve= nt *event, return 0; } =20 +static int perf_event__compressed2_swap(union perf_event *event, + bool sample_id_all __maybe_unused) +{ + /* Only data_size needs swapping =E2=80=94 compressed payload is a raw by= te stream */ + event->pack2.data_size =3D bswap_64(event->pack2.data_size); + return 0; +} + static int perf_event__bpf_metadata_swap(union perf_event *event, bool sample_id_all __maybe_unused) { @@ -1166,6 +1174,7 @@ static perf_event__swap_op perf_event__swap_ops[] =3D= { [PERF_RECORD_STAT_ROUND] =3D perf_event__stat_round_swap, [PERF_RECORD_EVENT_UPDATE] =3D perf_event__event_update_swap, [PERF_RECORD_TIME_CONV] =3D perf_event__time_conv_swap, + [PERF_RECORD_COMPRESSED2] =3D perf_event__compressed2_swap, [PERF_RECORD_BPF_METADATA] =3D perf_event__bpf_metadata_swap, [PERF_RECORD_SCHEDSTAT_CPU] =3D perf_event__schedstat_cpu_swap, [PERF_RECORD_SCHEDSTAT_DOMAIN] =3D perf_event__schedstat_domain_swap, --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C9E22FE066; Thu, 21 May 2026 01:12:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325930; cv=none; b=U+fqnoK7n/2Q6BxHhu+MhYMJcRmh8Z48InuXNdTyv2FWHPPCeFMwYSxoJLVjWF1pRBX57iHUZZmLrov4VoYkRgDNyAsQ9Yp9bKIUbQcemiTUuxV7GKZjBdbzZcGRbaQ5VBRJPK4vSz3coRy2KX8msgXV0JWUoFLsd0CSUUbHl78= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325930; c=relaxed/simple; bh=W/Gs84TuKJQjpqrHsayfhOJcGR6+AMIKCnWRLMaWgfg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=J06a96X0L9zEbunxA0UHRWtlFXcEWF4QCVnDUn1uyKg63QaTnf5Qm235FG8WpsaCD+Y7/UE5J6lGUdLTnnMCdgwzalTs9NHv69PSEdrpRkJ+MTDWDkYXH5IGOoZL817bmh/BjtgGIhhBeb1w7M4eHAiq9iI/6mRFlhIgIO0A/zg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fUSsqTLz; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fUSsqTLz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B68D1F00A3B; Thu, 21 May 2026 01:12:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325929; bh=CAYcX/rJbUv+G1YpYo/oyEdA9UkFY3bdgJo38g3Toww=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fUSsqTLz87aVxTjg3C+uclZPzr+4wZx6cRELY8k4NWI+xmxnpyHwwaMATvaYdsLGV HrG8vwieDZ0nz/OCZ1KfJtDkPSQKeAQNxv7cLpvlYKtZ+6SjXal7PyLozCh3pogjfM CTkkLpEikBRVEoNHGgpc5Ts0esjRqtCureVekT9mEaZqHrhAxh7pZ5MS2kMjd8iodd TchGxrJpPANzBtOQySK3z8nQxUbSPEpr9trnmcSwfyqbqRz2Ac//DFEMEmJj1i0YDA eCjXl9VRPuG9PrQ6Av7rQ+9wMYVXf4B6O4K1RsxKer0Kqp6X4bwC57uRBR1h3M/6g6 GPECSegG61KZQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 23/27] perf tools: Harden compressed event processing Date: Wed, 20 May 2026 22:10:08 -0300 Message-ID: <20260521011027.622268-24-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo Add several hardening checks to the compressed event decompression pipeline: 1. Guard against decomp_last_rem underflow: check that decomp_last->head does not exceed decomp_last->size before subtracting. A u64 underflow here would produce a huge decomp_len, causing an oversized mmap allocation. 2. Validate comp_mmap_len from the HEADER_COMPRESSED feature section: reject values that are not 4K-aligned, smaller than 4096, or larger than ~2 GB (prevents size_t overflow when adding decomp_last_rem on 32-bit, while allowing legitimate large mmap buffers from perf record -m). 3. Validate COMPRESSED event header size: reject events where header.size is too small to contain the fixed struct fields, preventing underflow in the payload size calculation. 4. Validate COMPRESSED2 event data_size: check that data_size does not exceed the available payload (header.size minus the fixed struct fields) for the newer compressed format. 5. Reject compressed events when the HEADER_COMPRESSED feature is missing from the file header, which means no decompression context was initialized. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 17 +++++++++++++++++ tools/perf/util/tool.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 634a11c7d8b9a9ef..8ab05d46021b73af 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -3859,6 +3859,23 @@ static int process_compressed(struct feat_fd *ff, if (do_read_u32(ff, &(env->comp_mmap_len))) return -1; =20 + /* + * FIXME: perf.data should record the recording system's page + * size =E2=80=94 it affects mmap buffer alignment, sample addresses, + * and data_page_size/code_page_size interpretation. Without + * it we assume 4K (the smallest Linux page size) as a safe + * minimum alignment for comp_mmap_len validation. + * + * Cap at 2 GB to keep decomp_len + decomp_last_rem + + * sizeof(struct decomp) within size_t range on 32-bit. + */ + if (env->comp_mmap_len < 4096 || env->comp_mmap_len % 4096 || + env->comp_mmap_len > (2U * 1024 * 1024 * 1024 - 4096)) { + pr_err("Invalid HEADER_COMPRESSED: comp_mmap_len (%u) must be a 4K-align= ed value in [4096, %u]\n", + env->comp_mmap_len, 2U * 1024 * 1024 * 1024 - 4096); + return -1; + } + return 0; } =20 diff --git a/tools/perf/util/tool.c b/tools/perf/util/tool.c index 225a77d530ce8ab3..18641919473a859f 100644 --- a/tools/perf/util/tool.c +++ b/tools/perf/util/tool.c @@ -24,7 +24,15 @@ static int perf_session__process_compressed_event(const = struct perf_tool *tool _ size_t mmap_len, decomp_len =3D perf_session__env(session)->comp_mmap_len; struct decomp *decomp, *decomp_last =3D session->active_decomp->decomp_la= st; =20 + if (!decomp_len) { + pr_err("Compressed events found but HEADER_COMPRESSED not set\n"); + return -1; + } + if (decomp_last) { + /* Prevent u64 underflow in decomp_last_rem */ + if (decomp_last->head > decomp_last->size) + return -1; decomp_last_rem =3D decomp_last->size - decomp_last->head; decomp_len +=3D decomp_last_rem; } @@ -47,14 +55,37 @@ static int perf_session__process_compressed_event(const= struct perf_tool *tool _ decomp->size =3D decomp_last_rem; } =20 + /* + * Events are read directly from the mmap'd file; fields could + * theoretically change via a FUSE-backed file, but that applies + * to the entire event processing pipeline, not just here. + */ if (event->header.type =3D=3D PERF_RECORD_COMPRESSED) { + if (event->header.size < sizeof(struct perf_record_compressed)) + goto err_decomp; src =3D (void *)event + sizeof(struct perf_record_compressed); src_size =3D event->pack.header.size - sizeof(struct perf_record_compres= sed); } else if (event->header.type =3D=3D PERF_RECORD_COMPRESSED2) { + /* + * prefetch_event() only guarantees that the 8-byte + * event header fits; validate that header.size covers + * the data_size field before accessing it, otherwise a + * crafted event reads data_size from adjacent memory. + */ + if (event->header.size < sizeof(struct perf_record_compressed2)) + goto err_decomp; src =3D (void *)event + sizeof(struct perf_record_compressed2); src_size =3D event->pack2.data_size; + /* + * data_size is independent of header.size (which + * includes padding); verify it doesn't exceed the + * actual payload to prevent out-of-bounds reads in + * zstd_decompress_stream(). + */ + if (src_size > event->header.size - sizeof(struct perf_record_compressed= 2)) + goto err_decomp; } else { - return -1; + goto err_decomp; } =20 decomp_size =3D zstd_decompress_stream(session->active_decomp->zstd_decom= p, src, src_size, @@ -77,6 +108,11 @@ static int perf_session__process_compressed_event(const= struct perf_tool *tool _ pr_debug("decomp (B): %zd to %zd\n", src_size, decomp_size); =20 return 0; + +err_decomp: + munmap(decomp, mmap_len); + pr_err("Couldn't decompress data\n"); + return -1; } #endif =20 --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39260306768; Thu, 21 May 2026 01:12:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325934; cv=none; b=GIMsjjkFUc5bKf5LAV/TmbD92CQDiFMqRx8Jav6yn1TS7SN8DKuJLQyHFEdg+dL5JOr32g4eLhMDvtZpCQiw8ejakMbbxOPVvnkqN+yVxQiI7GrY6ATM1FNguzpEbs+WdB+dOYFUhqpstPaHEI5B+/5APEHh3vwd5yl//TvL34I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325934; c=relaxed/simple; bh=/DCnT6jDug1BmvSNjveuZ+WerLEOJejT2NJhiI8D0/o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a4lud1pXhRDbcYD87FwwtsvdKiKbLPriIvivHOha/G5JzSHOZ3FMKE+gqtqjJlMS/Z7S/kVjnvf39WvsACBZIi7imQO6PWgYytM/tvz91M4X+a6nTkg07slK4kBealbEc8cvV+9bqENzo27rx7kRt8xsoxKLdiURA2esczQNOuE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HFmfVL30; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HFmfVL30" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEB871F000E9; Thu, 21 May 2026 01:12:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325933; bh=XbcPDwGAi64vr2qIRi1JYjbatAK0bs/CUotXphvheJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HFmfVL30lA2uiSX4wss2NV7Xnq+JJ4VaoVPA8uCezLTM4bcx7Djk9Qx1hUfUAtwgk s1fTIRioij1duA/QBTosFgN9DF2ff1mpoX7UK3Xjp4d8j1norm2X4H74ivBQX9/9M+ cUILB+4OW6Q/CI/7vhRrKJgq9yaFOdgkC8ns0kqHFzYBtGSd7xnuayjba7BUobP9gK chlFASSA2Sm85gKi/7vXD+hsb1kWh+jA60KBY1gB+fVWy5fhU0L4uUSAxxXR+pVgqO a89oe8WYXVU0XcSbTRGLxyJENM0mTLhlzuN+FksXJ3l4+GT/gr/vPtF82kQRTWW04c JQXKIzFf/HtEw== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 24/27] perf session: Check for decompression buffer size overflow Date: Wed, 20 May 2026 22:10:09 -0300 Message-ID: <20260521011027.622268-25-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo On 32-bit systems, sizeof(struct decomp) + decomp_len can wrap size_t when comp_mmap_len is large. The preceding patch caps comp_mmap_len at ~2 GB, which bounds individual values, but two additions can still overflow: 1. decomp_len +=3D decomp_last_rem: on 32-bit, adding a u64 to size_t silently truncates, producing a corrupted decomp_len that would bypass the subsequent overflow check and result in an undersized buffer allocation. 2. sizeof(struct decomp) + decomp_len: even with the cap, the final addition could overflow on systems with small size_t. Add explicit overflow checks before each addition as defense-in-depth. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/tool.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/perf/util/tool.c b/tools/perf/util/tool.c index 18641919473a859f..25c9b378aa163664 100644 --- a/tools/perf/util/tool.c +++ b/tools/perf/util/tool.c @@ -34,9 +34,22 @@ static int perf_session__process_compressed_event(const = struct perf_tool *tool _ if (decomp_last->head > decomp_last->size) return -1; decomp_last_rem =3D decomp_last->size - decomp_last->head; + /* + * Check before adding: on 32-bit, size_t +=3D u64 + * silently truncates, bypassing the overflow check + * below and producing an undersized buffer. + */ + if (decomp_last_rem > SIZE_MAX - decomp_len - sizeof(struct decomp)) { + pr_err("Decompression buffer size overflow\n"); + return -1; + } decomp_len +=3D decomp_last_rem; } =20 + if (decomp_len > SIZE_MAX - sizeof(struct decomp)) { + pr_err("Decompression buffer size overflow\n"); + return -1; + } mmap_len =3D sizeof(struct decomp) + decomp_len; decomp =3D mmap(NULL, mmap_len, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D1CB306768; Thu, 21 May 2026 01:12:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325938; cv=none; b=Zl0NB3lX3pQXxcuU5fkNY8HZ0KnAstm10AYU5ZhXEjzvNyZy7fk/NtJ10NctGudzLOwTPW8LN2c+V5AoQcuYPl8e7LXiMWk20SBQAi6fXHniznoeCh2jMhvT5flRo8AKd/KKPMx6/9UE6NP/83vSfW+5SbnQk9LNJWVJSZnjryY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325938; c=relaxed/simple; bh=zGoAvfeDHH+BkAyY76shjc5a4ne36SGhKh2c5ZUb1j8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iWm71bUknpOGaTn7HnmREx1tOJQlEMEw3LR15ll9N6JnwIEUF/2edhJlVJU77acIj3dzk+pQhbQdfemG5H3bd/wWjbqzVnM1EdgrhIfphX118rPXB6FltZkFtopVNMMm6CmH+MDHQkYjufpcwlKt/tGhg3bYo7OzCcf2ESpIF3o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GWJfDUkE; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GWJfDUkE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C6561F00A3B; Thu, 21 May 2026 01:12:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325937; bh=fzPDW85BQ/78gPmMmw8IfPSrWQgBIdw3iKIypcBad8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GWJfDUkEyBlIcNOlYZyM2/HprmdfgPKWplsSYfIiicZvIY4MnLD11fS9+238xJbxs QYZSs1s3NIF2vuB82fd7gME+7gQML3FLJlQabaBLO7s2ufVRDmJIUIGPfEff7jNDDW VZwq0mJ7OEZbnygzU6yoOBrRT1Ch6CC1I1tfLV8PyBiDk6EGDvWT4ArsYxXD1a/A/w kqzuJ3uPftL5gnCHJBL9i9CfNob2/6j4QOkfL9agZdnwXxPY51GHEQEF1IIj0wCtxV gmgjS9Jf+RNJ1a3wSEuU56643MbGzjKSD2ZQsCjlJjdTxKwVA/DYyuvB+l/Dhyj7uh m8OPhZj+4ifpQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, "Claude Opus 4.6 (1M context)" Subject: [PATCH 25/27] perf session: Bound nr_cpus_avail and validate sample CPU Date: Wed, 20 May 2026 22:10:10 -0300 Message-ID: <20260521011027.622268-26-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo Several downstream consumers (timechart, kwork, sched) use fixed-size arrays indexed by CPU. A crafted perf.data can supply arbitrary CPU values that index past these arrays, causing out-of-bounds access. Clamp nr_cpus_avail to MAX_NR_CPUS when reading HEADER_NRCPUS, and fall back to MAX_NR_CPUS when the header is missing (truncated files, pipe mode, pre-2017 perf). Then validate sample.cpu against nr_cpus_avail in perf_session__deliver_event() before any tool callback runs. Only validate when PERF_SAMPLE_CPU is set in sample_type =E2=80=94 when absent, evsel__parse_sample() leaves sample.cpu as (u32)-1, a sentinel that downstream tools (script, inject) check to identify events without CPU info. Clamping it to 0 would break those checks. Also refactor the sample parsing in perf_session__deliver_event() to call evsel__parse_sample() directly (via evlist__event2evsel() for evsel lookup), with explicit guest VM SID resolution for machine_pid and vcpu fields. Fix an off-by-one in end_sample_processing(): change the loop bound from cpu <=3D numcpus to cpu < numcpus to prevent accessing one element past the array. For pipe-mode streams where HEADER_NRCPUS may arrive late or not at all, the MAX_NR_CPUS fallback ensures the bounds check is still effective against the fixed-size downstream arrays. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 43 ++++++++++++++++++++++ tools/perf/util/session.c | 77 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 119 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 8ab05d46021b73af..8bc5904591d49a68 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -48,6 +48,7 @@ #include #include "asm/bug.h" #include "tool.h" +#include "../perf.h" #include "time-utils.h" #include "units.h" #include "util/util.h" // perf_exe() @@ -2894,12 +2895,36 @@ static int process_nrcpus(struct feat_fd *ff, void = *data __maybe_unused) if (ret) return ret; =20 + /* Validate raw values before clamping */ if (nr_cpus_online > nr_cpus_avail) { pr_err("Invalid HEADER_NRCPUS: nr_cpus_online (%u) > nr_cpus_avail (%u)\= n", nr_cpus_online, nr_cpus_avail); return -1; } =20 + /* + * FIXME: Several downstream consumers use fixed-size arrays + * indexed by CPU (timechart MAX_CPUS, kwork/sched/annotate + * DECLARE_BITMAP(MAX_NR_CPUS)). Until these are converted + * to dynamic allocation, clamp nr_cpus_avail so per-event + * CPU bounds checks reject samples above the array limit. + * Data from CPUs beyond MAX_NR_CPUS will be lost. + * + * Pipe-mode streams from pre-2017 perf or third-party tools + * that lack HEADER_NRCPUS will hit the MAX_NR_CPUS fallback + * in perf_session__deliver_event() instead. + */ + if (nr_cpus_avail > MAX_NR_CPUS) { + pr_warning("WARNING: perf.data recorded on a %u-CPU machine but perf is = compiled with MAX_NR_CPUS=3D%d.\n" + " Samples from CPUs >=3D %d will be clamped to CPU 0. Consi= der rebuilding\n" + " perf with a larger MAX_NR_CPUS, or help convert fixed-size= CPU arrays to\n" + " dynamic allocation.\n", + nr_cpus_avail, MAX_NR_CPUS, MAX_NR_CPUS); + nr_cpus_avail =3D MAX_NR_CPUS; + if (nr_cpus_online > nr_cpus_avail) + nr_cpus_online =3D nr_cpus_avail; + } + env->nr_cpus_avail =3D (int)nr_cpus_avail; env->nr_cpus_online =3D (int)nr_cpus_online; return 0; @@ -5248,6 +5273,24 @@ int perf_session__read_header(struct perf_session *s= ession) #endif } =20 + /* + * Without nr_cpus_avail the sample CPU bounds check in + * perf_session__deliver_event() is bypassed, allowing crafted + * CPU IDs to reach downstream consumers that index fixed-size + * arrays (timechart, kwork, sched =E2=80=94 all sized MAX_NR_CPUS). + * + * This can happen with truncated files (interrupted recording + * loses all feature sections), very old files that predate + * HEADER_NRCPUS, or crafted files that omit it. Fall back to + * MAX_NR_CPUS so the bounds check is still effective =E2=80=94 any + * CPU ID below that limit is safe for all downstream arrays. + */ + if (header->env.nr_cpus_avail =3D=3D 0) { + header->env.nr_cpus_avail =3D MAX_NR_CPUS; + pr_warning("WARNING: perf.data is missing HEADER_NRCPUS, using MAX_NR_CP= US (%d) as CPU bound\n", + MAX_NR_CPUS); + } + return 0; out_errno: return -errno; diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 7e25f75de37abce4..bf14fa8c52f65604 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -2076,14 +2076,89 @@ static int perf_session__deliver_event(struct perf_= session *session, const char *file_path) { struct perf_sample sample; + struct evsel *evsel; int ret; =20 perf_sample__init(&sample, /*all=3D*/false); - ret =3D evlist__parse_sample(session->evlist, event, &sample); + evsel =3D evlist__event2evsel(session->evlist, event); + if (!evsel) { + pr_err("No evsel found for event type %u\n", + event->header.type); + ret =3D -EFAULT; + goto out; + } + ret =3D evsel__parse_sample(evsel, event, &sample); if (ret) { pr_err("Can't parse sample, err =3D %d\n", ret); goto out; } + /* + * evsel__parse_sample() doesn't populate machine_pid/vcpu, + * which are needed by machines__find_for_cpumode() to + * attribute samples to guest VMs. The SID table maps + * sample IDs to the guest that owns the event. + */ + if (perf_guest && sample.id) { + struct perf_sample_id *sid =3D evlist__id2sid(session->evlist, sample.id= ); + + if (sid) { + sample.machine_pid =3D sid->machine_pid; + sample.vcpu =3D sid->vcpu.cpu; + } + } + + /* + * Validate sample.cpu before any callback can use it as an + * array index (kwork cpus_runtime, timechart cpus_cstate_*, + * sched cpu_last_switched). + * + * When PERF_SAMPLE_CPU is absent, evsel__parse_sample() leaves + * sample.cpu as (u32)-1 =E2=80=94 a sentinel that downstream tools + * (script, inject) check to identify events without CPU info. + * Only check when sample.cpu was actually populated from event + * data: PERF_RECORD_SAMPLE always has it when PERF_SAMPLE_CPU + * is set; non-sample events only have it when sample_id_all is + * enabled. Otherwise sample.cpu is the (u32)-1 sentinel from + * evsel__parse_sample() and must not be validated or clamped. + */ + if ((evsel->core.attr.sample_type & PERF_SAMPLE_CPU) && + (event->header.type =3D=3D PERF_RECORD_SAMPLE || + evsel->core.attr.sample_id_all)) { + int nr_cpus_avail =3D perf_session__env(session)->nr_cpus_avail; + + /* + * For perf.data files the MAX_NR_CPUS fallback in + * perf_session__read_header() guarantees this is set. + * For pipe mode, HEADER_NRCPUS may arrive late or not + * at all (pre-2017 perf, third-party tools). Fall + * back to MAX_NR_CPUS so the bounds check still works + * against fixed-size downstream arrays. + */ + if (nr_cpus_avail <=3D 0) { + nr_cpus_avail =3D MAX_NR_CPUS; + perf_session__env(session)->nr_cpus_avail =3D nr_cpus_avail; + pr_warning_once("WARNING: HEADER_NRCPUS not set, using MAX_NR_CPUS (%d)= as CPU bound\n", + MAX_NR_CPUS); + } + if (sample.cpu >=3D (u32)nr_cpus_avail && + sample.cpu !=3D (u32)-1) { + /* + * Warn rather than abort: synthesized events + * (MMAP, COMM) lack sample_id_all data, so + * parse_id_sample reads garbage from the event + * payload. Clamping to 0 protects downstream + * array indexing while keeping the session alive. + * + * Preserve (u32)-1: perf script and perf inject + * use it as a sentinel for "CPU not applicable." + * Downstream array users (timechart, kwork) have + * their own per-callback bounds checks. + */ + pr_warning_once("WARNING: sample CPU %u >=3D nr_cpus_avail %u, clamping= to 0\n", + sample.cpu, nr_cpus_avail); + sample.cpu =3D 0; + } + } =20 ret =3D auxtrace__process_event(session, event, &sample, tool); if (ret < 0) --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4EBEE33AD8C; Thu, 21 May 2026 01:12:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325942; cv=none; b=YAgM5lsqc1LHLOIjnYJV9N4AbyNYs2zRGuajFUL77H/pj1I3snieSSAbPQYBRmiyiKRRT2GDTeSV5oftp+fg+/hNDQm0yNGXtHI/Ymrzref46k9yhPUaK6nrJAltUTC0WdiUH85Jzeb123DWY4RnacvNo6NqDPpmdTHircM64ko= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325942; c=relaxed/simple; bh=Q3v+AbeVq/fBP1sDqSyv9hFFDtXfsQhkpyhUlAA88HU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=P4BO2LvZlOPTwtVtmf4s58b1b9IBEz6chJrQnNpIoFsgGjtBa4M0OA3e06eaHXnhyphKuEaAgYfVJAAmXwyXjbLFCL26A2qHWZfG35QUOmOJHCQeGNzCNmqTZaTAgHJgrusTZmJKZXUVmixFqOo1fYOeiBY6yW1LpUmM/cIcMnQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Lkr5a0HW; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Lkr5a0HW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C00BE1F000E9; Thu, 21 May 2026 01:12:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325941; bh=v4wXLn2GxE9k4/wrqT4DzbHNixMQqNiVQxJE9EHgn5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Lkr5a0HWuvK/EIWodB2oskA8UA3pE0MtBQypmFZ+FOq9D8Wfi9U2zGx+NeFfSbbx3 /pu5b2EyKYY9cNzSvLuRpIaDKuv+yO47wjCbnkn0P/tyDvVag7CdxQC52u2M+cNRME /q/rx0kqhbeb1sh9T6GNvw93/XveaQrBaijlvCcFYDp/axAJ39NGR9DxJBXs9xQE+Q 6PU9i48esUIYimawbbjSKL+mFXMwDH5gM0NqnBlGQzSkJCtWDXoSAqLuMeUbKXqr+6 jeOnkg98fSoUjza9qyngvCt0TqgrHHiME6bAhNNJ1xcl4vsMUtTtF8gb+6kB4kdmJC e6fV1OXhV/TcQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot@kernel.org, Yang Jihong , "Claude Opus 4.6 (1M context)" Subject: [PATCH 26/27] perf kwork: Bounds check work->cpu before indexing cpus_runtime[] Date: Wed, 20 May 2026 22:10:11 -0300 Message-ID: <20260521011027.622268-27-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo work->cpu comes from sample->cpu which is (u32)-1 when PERF_SAMPLE_CPU is absent. Stored as int, this becomes -1 which passes the signed BUG_ON(work->cpu >=3D MAX_NR_CPUS) but causes an out-of-bounds access on cpus_runtime[-1]. Replace the BUG_ON in top_calc_total_runtime() with an unsigned bounds check that skips entries with invalid CPU values, counting them for a summary warning. Guard the same index in profile_event_match() (bitmap OOB), top_calc_idle_time(), top_calc_irq_runtime(), top_calc_cpu_usage(), and top_calc_load_runtime(). Also guard against division by zero in top_calc_cpu_usage() when no runtime was accumulated. Reported-by: sashiko-bot@kernel.org # Running on a local machine Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Cc: Yang Jihong Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-kwork.c | 45 +++++++++++++++++++++++++++++++++----- tools/perf/util/kwork.h | 1 + 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/tools/perf/builtin-kwork.c b/tools/perf/builtin-kwork.c index 59a54d11f7fa63ad..f123230df283dacb 100644 --- a/tools/perf/builtin-kwork.c +++ b/tools/perf/builtin-kwork.c @@ -424,7 +424,9 @@ static bool profile_event_match(struct perf_kwork *kwor= k, u64 time =3D sample->time; struct perf_time_interval *ptime =3D &kwork->ptime; =20 - if ((kwork->cpu_list !=3D NULL) && !test_bit(cpu, kwork->cpu_bitmap)) + /* Guard test_bit: cpu =3D=3D -1 (absent PERF_SAMPLE_CPU) would index pas= t the bitmap */ + if ((kwork->cpu_list !=3D NULL) && + ((unsigned int)cpu >=3D MAX_NR_CPUS || !test_bit(cpu, kwork->cpu_bitm= ap))) return false; =20 if (((ptime->start !=3D 0) && (ptime->start > time)) || @@ -1980,7 +1982,18 @@ static void top_calc_total_runtime(struct perf_kwork= *kwork) next =3D rb_first_cached(&class->work_root); while (next) { work =3D rb_entry(next, struct kwork_work, node); - BUG_ON(work->cpu >=3D MAX_NR_CPUS); + /* + * work->cpu comes from sample->cpu which is -1 when + * PERF_SAMPLE_CPU is absent. As int that's -1, but as + * unsigned it exceeds MAX_NR_CPUS =E2=80=94 skip to avoid OOB + * on cpus_runtime[]. + */ + /* Counted and reported in perf_kwork__top_report() */ + if ((unsigned int)work->cpu >=3D MAX_NR_CPUS) { + stat->nr_skipped_cpu++; + next =3D rb_next(next); + continue; + } stat->cpus_runtime[work->cpu].total +=3D work->total_runtime; stat->cpus_runtime[MAX_NR_CPUS].total +=3D work->total_runtime; next =3D rb_next(next); @@ -1992,7 +2005,8 @@ static void top_calc_idle_time(struct perf_kwork *kwo= rk, { struct kwork_top_stat *stat =3D &kwork->top_stat; =20 - if (work->id =3D=3D 0) { + /* See comment in top_calc_total_runtime() */ + if (work->id =3D=3D 0 && (unsigned int)work->cpu < MAX_NR_CPUS) { stat->cpus_runtime[work->cpu].idle +=3D work->total_runtime; stat->cpus_runtime[MAX_NR_CPUS].idle +=3D work->total_runtime; } @@ -2004,6 +2018,10 @@ static void top_calc_irq_runtime(struct perf_kwork *= kwork, { struct kwork_top_stat *stat =3D &kwork->top_stat; =20 + /* See comment in top_calc_total_runtime() */ + if ((unsigned int)work->cpu >=3D MAX_NR_CPUS) + return; + if (type =3D=3D KWORK_CLASS_IRQ) { stat->cpus_runtime[work->cpu].irq +=3D work->total_runtime; stat->cpus_runtime[MAX_NR_CPUS].irq +=3D work->total_runtime; @@ -2056,12 +2074,19 @@ static void top_calc_cpu_usage(struct perf_kwork *k= work) if (work->total_runtime =3D=3D 0) goto next; =20 + /* See comment in top_calc_total_runtime() */ + if ((unsigned int)work->cpu >=3D MAX_NR_CPUS) + goto next; + __set_bit(work->cpu, stat->all_cpus_bitmap); =20 top_subtract_irq_runtime(kwork, work); =20 - work->cpu_usage =3D work->total_runtime * 10000 / - stat->cpus_runtime[work->cpu].total; + /* Guard against division by zero if no runtime was accumulated */ + if (stat->cpus_runtime[work->cpu].total) { + work->cpu_usage =3D work->total_runtime * 10000 / + stat->cpus_runtime[work->cpu].total; + } =20 top_calc_idle_time(kwork, work); next: @@ -2074,7 +2099,8 @@ static void top_calc_load_runtime(struct perf_kwork *= kwork, { struct kwork_top_stat *stat =3D &kwork->top_stat; =20 - if (work->id !=3D 0) { + /* See comment in top_calc_total_runtime() */ + if (work->id !=3D 0 && (unsigned int)work->cpu < MAX_NR_CPUS) { stat->cpus_runtime[work->cpu].load +=3D work->total_runtime; stat->cpus_runtime[MAX_NR_CPUS].load +=3D work->total_runtime; } @@ -2142,6 +2168,13 @@ static void perf_kwork__top_report(struct perf_kwork= *kwork) next =3D rb_next(next); } =20 + if (kwork->top_stat.nr_skipped_cpu) { + printf(" Warning: %u work entries with invalid CPU were excluded from t= otals.\n" + " Task runtimes may appear inflated (IRQ time not subtracted).\n" + " Consider re-recording with PERF_SAMPLE_CPU enabled.\n", + kwork->top_stat.nr_skipped_cpu); + } + printf("\n"); } =20 diff --git a/tools/perf/util/kwork.h b/tools/perf/util/kwork.h index abf637d447948f3a..65eb81acfbe38421 100644 --- a/tools/perf/util/kwork.h +++ b/tools/perf/util/kwork.h @@ -193,6 +193,7 @@ struct __top_cpus_runtime { struct kwork_top_stat { DECLARE_BITMAP(all_cpus_bitmap, MAX_NR_CPUS); struct __top_cpus_runtime *cpus_runtime; + unsigned int nr_skipped_cpu; }; =20 struct perf_kwork { --=20 2.54.0 From nobody Sun May 24 22:35:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2768433D6FC; Thu, 21 May 2026 01:12:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325946; cv=none; b=b/3yt2KxuJ3X+4y7nWQYpqvQsGX1BU7Jbrpyj0VgwuDcBdjCE79sOWyRbfrH/gKp78d4s3t7gU0n+Vz1d7+8IBS0iUkhc4c0SftOjoxPAsyImyPbW2+LUjq2tct6Lmzdy/TPPOGEkoh93AVKhfbNSiF1VMydriAA0gRSB78rNIg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779325946; c=relaxed/simple; bh=KIEkF3EaJz77SDF5mxDrTXlVeJG2dBXvwn8aBmMRo2A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QAPKxaxX/oIBk4hcAcMVmuDr2gZ7p6TCcymWX+7SYdq3Xda3zXLbBQ2lyhSHpeArbgNYASH5Fx6eZUerzvNEj8cHIMdaXaZ0qNIFF70jefuekJHfSQVffUX2FJzNiVaETrqiym1LKl0AlXgpx4j5DcrPH9pr01bMx8PZtvjEiSk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KZ9l3siI; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KZ9l3siI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B21C41F00A3B; Thu, 21 May 2026 01:12:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779325944; bh=rS1Jh9K0PvkOY4v1OPA2sgP8wFd1Za7efBuvZ/20nLI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KZ9l3siI9JdIcyuR6C2/Qq2j8+Sb9uz23JQuZeNXGH7BF9hfYSbNvsBizghLIr7SK XTzamN/oxYffNaGyNfQZ0cdH+KnFBQh3pqGSbvkfDHqyx/AEXeHW4xZAA+XNx0uAEK JV96AqzIWQRuIH3EEvGo53D+SocJIedfWu+3heRrsnf9M9067+QqtUIWEsfzukmepJ 1dkDrrQ4Sf8/coVpL4IoT7baZ7kd9mXmSsmMdlplyy/3P81odFbYjI2Zcej8sFVm8V RsDVjqjLhNfrK0LQCXIJ9xiFmVOHOW3EzlEjV+/jCJQojbIHf2z3bz5Ywb8UvgoV80 45+QohRdSy7ww== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , "Claude Opus 4.6 (1M context)" Subject: [PATCH 27/27] perf test: Add truncated perf.data robustness test Date: Wed, 20 May 2026 22:10:12 -0300 Message-ID: <20260521011027.622268-28-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521011027.622268-1-acme@kernel.org> References: <20260521011027.622268-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo Add a shell test that verifies perf report handles truncated perf.data files gracefully =E2=80=94 exiting with an error code rather than crashing = with SIGSEGV or SIGABRT. The test records a simple workload, then truncates the resulting perf.data at four offsets that exercise different parsing stages: 8 bytes =E2=80=94 file header magic only 64 bytes =E2=80=94 partial file header (attr section incomplete) 256 bytes =E2=80=94 into the first events (partial event headers) 75% size =E2=80=94 mid-stream truncation (partial event data) For each truncation, perf report is run and the exit code is checked: - Exit code 0 (success) fails the test =E2=80=94 a truncated file should never parse without error. - Crash signals are detected portably via kill -l, which maps the signal number to a name on the running system. This handles architectures where signal numbers differ (e.g. SIGBUS is 7 on x86/ARM but 10 on MIPS/SPARC). Core-dump signals (ILL, ABRT, BUS, FPE, SEGV, TRAP, SYS) fail the test. - Higher exit codes (200+) are perf's own negative-errno returns (e.g. -EINVAL =3D 234) and are expected. This exercises the bounds checking, minimum-size validation, and error propagation added by the preceding patches in this series. Testing it: root@number:~# perf test truncat 84: Test that perf report handles truncated perf.data gracefully (no cra= sh, no segfault =E2=80=94 clean error exit).: Ok root@number:~# perf test -vv truncat 84: Test that perf report handles truncated perf.data gracefully (no cra= sh, no segfault =E2=80=94 clean error exit).: --- start --- test child forked, pid 62890 ---- end(0) ---- 84: Test that perf report handles truncated perf.data gracefully (no cra= sh, no segfault =E2=80=94 clean error exit).: Ok root@number:~# Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Assisted-by: Claude Opus 4.6 (1M context) [ Fixed the SPDX on the line where 'perf test' expects the test description= , reviewed by Ian Rogers ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/shell/data_validation.sh | 85 +++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 tools/perf/tests/shell/data_validation.sh diff --git a/tools/perf/tests/shell/data_validation.sh b/tools/perf/tests/s= hell/data_validation.sh new file mode 100755 index 0000000000000000..fa7980c4ddd30954 --- /dev/null +++ b/tools/perf/tests/shell/data_validation.sh @@ -0,0 +1,85 @@ +#!/bin/bash +# Test that perf report handles truncated perf.data gracefully (no crash, = no segfault =E2=80=94 clean error exit). +# SPDX-License-Identifier: GPL-2.0 +# +# Exercises the bounds checking and minimum-size validation added +# by the perf-data-validation hardening series. + +err=3D0 + +cleanup() { + rm -f "${perfdata}" "${perfdata}.old" "${truncated}" "${stderrfile}" + trap - EXIT TERM INT +} +trap 'cleanup; exit 1' TERM INT +trap cleanup EXIT + +perfdata=3D$(mktemp /tmp/__perf_test.perf.data.XXXXX) +truncated=3D$(mktemp /tmp/__perf_test.perf.data.XXXXX) +stderrfile=3D$(mktemp /tmp/__perf_test.perf.data.XXXXX) + +# Record a simple workload +if ! perf record -o "${perfdata}" -- perf test -w noploop 2>/dev/null; then + echo "Skip: perf record failed" + cleanup + exit 2 +fi + +file_size=3D$(stat -c %s "${perfdata}") +if [ "${file_size}" -lt 512 ]; then + echo "Skip: perf.data too small (${file_size} bytes)" + cleanup + exit 2 +fi + +# Test truncation at various offsets that exercise different +# parsing stages: +# 8 =E2=80=94 file header magic only, no attrs or data +# 64 =E2=80=94 partial file header (attr section incomplete) +# 256 =E2=80=94 into the first events (partial event headers) +# 75% =E2=80=94 mid-stream truncation (partial event data) +for cut_at in 8 64 256 $((file_size * 3 / 4)); do + if [ "${cut_at}" -ge "${file_size}" ]; then + continue + fi + head -c "${cut_at}" "${perfdata}" > "${truncated}" + + # perf report should exit with an error, not crash. + # Capture stderr to detect sanitizer violations. + perf report -i "${truncated}" --stdio > /dev/null 2> "${stderrfile}" + exit_code=3D$? + + # A truncated file should never parse successfully + if [ ${exit_code} -eq 0 ]; then + echo "FAIL: perf report exited 0 (success) on ${cut_at}-byte truncated f= ile =E2=80=94 expected an error" + err=3D1 + continue + fi + + # Detect sanitizer violations =E2=80=94 ASAN/MSAN/TSAN/UBSAN exit + # with code 1 by default, which would otherwise look like a + # clean error exit. Check stderr for their markers. + if grep -qE "^(=3D=3D[0-9]+=3D=3DERROR:|SUMMARY: [A-Za-z]*Sanitizer)" "${= stderrfile}" 2>/dev/null; then + sanitizer=3D$(grep -oE "(Address|Memory|Thread|UndefinedBehavior)Sanitiz= er" "${stderrfile}" | head -1) + echo "FAIL: perf report triggered ${sanitizer:-sanitizer} on ${cut_at}-b= yte truncated file" + err=3D1 + continue + fi + + # Detect crash signals portably =E2=80=94 signal numbers differ + # across architectures (e.g. SIGBUS is 7 on x86/ARM but + # 10 on MIPS/SPARC). Use kill -l to map the number to a + # name on the running system. + if [ ${exit_code} -gt 128 ] && [ ${exit_code} -lt 200 ]; then + sig_name=3D$(kill -l $((exit_code - 128)) 2>/dev/null) + case ${sig_name} in + ILL|ABRT|BUS|FPE|SEGV|TRAP|SYS) + echo "FAIL: perf report crashed (SIG${sig_name}) on ${cut_at}-byte trun= cated file" + err=3D1 + ;; + esac + fi +done + +cleanup +exit ${err} --=20 2.54.0