From nobody Mon Oct 6 17:06:47 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F41CA1FF7D7 for ; Sat, 19 Jul 2025 03:05:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752894336; cv=none; b=ql8oMuy48GNzD23GINhcRz5dcDtdt42/bv1YP2cjrSmNtDwEbfCDGyySLu5/JckQ9UwHQO+sIGnF+IGzA+whOuqB/bo4hbdroNbRCifJS71QJjIm3VzhNOyiBQ8VfUK5QcFRsj/K5fPVju9dPk6sAVPBrIAyV9U4n9YYSBj/m8c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752894336; c=relaxed/simple; bh=zejmlYNwgS/OQpMHacoEnWFRqhftHB8onU2Qvy6vpsU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=cKE/MWiLgRw+q1BsmwFE1D+2X2dP+fc9oE39RcFdyrllq3gavGtKKbBFktdzLLoquNpR1Rg4bShQCK2qLhnoDUSWBVEh6EcySNWTUfB41NTsBCqUPdFfmRt0Ta5XE+HfzTl/H7E5T4Kj8Y1c96Jdw85gUFZCLwM+Fpc6cxAGP5w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=EDgFirkO; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="EDgFirkO" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-31202bbaafaso2493209a91.1 for ; Fri, 18 Jul 2025 20:05:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752894334; x=1753499134; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=5dVZGHVi7sQRXRzVKkfTNIiUhn/WdB0GHZb62bnQe1c=; b=EDgFirkOGS85qRaiOI/zxkysJ6T1p81hM77lHF0hZuID2SuhzYP/LjkEpcEm8/8Hj5 CTRxaWX6tsnwWTdUf/C1pygvyIniu+TISXGiv99ScBKMQZQlpcnzBxeA0/cwxftUyrPQ 9hAvrpwrtnR3w6McgA5c36kDgSVDfuZOK4Ai1E+i3bXBOs+ThYr/q3LosEGdBnZbkmI6 0/4Dink9VhCPL61DT1TLI4RNX1TihzGfczoRBkQm7xId+NUPfsx9C9Rky+3YdO4iU4qZ O5ibyJ7l9TgxyjEEfk33Qn7TeF2k+Ndk5IOq3z2qoEtIaU9oVQbT5XK7MkprFGnV6Qye VqaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752894334; x=1753499134; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5dVZGHVi7sQRXRzVKkfTNIiUhn/WdB0GHZb62bnQe1c=; b=WxmGHsFPMsrGfZ0jCnvwNXfoLVV4l8j4G35Rr4kYHb/HYXA6GbeSjDdYETcqABJXAD Bhhk3764GO32ujES3xkoxQSzuBpr42HzQO4cPTW538PeswSvWGLy/3dfHkN2f5uk0s41 SbO8m9LGAAGJtd3kmxVyghHgKEu4QMiyZq1MPNT28kyYiR05lwY/LNWIF8KqyBUiczbb JeHl78EeG5K7KDaiqSFiX6HD5noWGY0QFgKTJbJa93jFL8s0dJoL3TRY0CqMd+guAew/ YZ6+tjnp9/wAUu3JcZtTILcWUnxMfKg0AYpHL3Ub5CgfCqc3b2OewxTe8EvXT5lZTlaL zn6w== X-Forwarded-Encrypted: i=1; AJvYcCXc/huVdGKIXQ/To0sh5+S3Uvzyi3P4ptVk5Cfj8VyZed4lKDbzi4xtj95e9+41iiGG7OR/I5hnynGErcg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz72OZqRm5FyCbhVmN0amJ+Env3++haIQo6JCzdOM4WGANSCF19 RGUaR+KLL5BdOAqQvvEpFOwHZ51stE977IaXalofvmdrLWBX/DVpEZ5VyvQw+I54lrdNvIVVFhL i692P2GI+Qg== X-Google-Smtp-Source: AGHT+IGJY7ZCHAzxXWQwWCYTpvlQGS/fifvam3lq/ygXLcAuJEVe1IKP9gewERPFn8QEFZafxVK2+h8CDi4d X-Received: from pjbsu3.prod.google.com ([2002:a17:90b:5343:b0:312:1eb3:78c9]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:55c4:b0:311:9c9a:58c5 with SMTP id 98e67ed59e1d1-31c9f44b9c3mr18437977a91.12.1752894334313; Fri, 18 Jul 2025 20:05:34 -0700 (PDT) Date: Fri, 18 Jul 2025 20:05:04 -0700 In-Reply-To: <20250719030517.1990983-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250719030517.1990983-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250719030517.1990983-3-irogers@google.com> Subject: [PATCH v3 02/15] perf stat: Avoid buffer overflow to the aggregation map From: Ian Rogers To: Thomas Falcon , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , Ravi Bangoria , James Clark , Dapeng Mi , Weilin Wang , Andi Kleen , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" CPUs may be created and passed to perf_stat__get_aggr (via config->aggr_get_id), such as in the stat display should_skip_zero_counter. There may be no such aggr_id, for example, if running with a thread. Add a missing bound check and just create IDs for these cases. Reviewed-by: Thomas Falcon Signed-off-by: Ian Rogers --- tools/perf/builtin-stat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 77e2248fa7fc..73b4521ab8af 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -1365,7 +1365,7 @@ static struct aggr_cpu_id perf_stat__get_aggr(struct = perf_stat_config *config, struct aggr_cpu_id id; =20 /* per-process mode - should use global aggr mode */ - if (cpu.cpu =3D=3D -1) + if (cpu.cpu =3D=3D -1 || cpu.cpu >=3D config->cpus_aggr_map->nr) return get_id(config, cpu); =20 if (aggr_cpu_id__is_empty(&config->cpus_aggr_map->map[cpu.cpu])) --=20 2.50.0.727.gbf7dc18ff4-goog