From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E96E93DE430; Fri, 10 Apr 2026 22:09:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775858970; cv=none; b=CQ7jD7Y96XQrLrTNH6MmCazami+WCjZz+hHsVI8PXRfjzvaApTv8mzEVuA5pnkwVOjn0ziVGpXbE6c+wxCjxq+Hu3f9/U48DgXhM59MjzWh9yN2Wbzq8w9pPWMddsgPYucBNoquK3W1lswzMq8OEpaVPKA+LRIfyIdArh1OLH3Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775858970; c=relaxed/simple; bh=j30A9Z5L6IXnN9QgiWMvhJQBeVzj+KCfg9Y217D22Z4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XFn42X9/HLyB920UMfbdQKwkn7NVoEtPZ5a6/KyF5mluiWPRibDSf11xSi+6zCminAJ0rHPE5uDeRISKVjUNpNBBeeW+BUhj1LqdsN0lV/k2LvNQUccb6B7lc+fejbN8MxSqaDWAaavfi6lOXjNAs+RBi32XzZ9AkXGJHwf/VCU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Oy+d2ZAj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Oy+d2ZAj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 169BEC19421; Fri, 10 Apr 2026 22:09:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775858969; bh=j30A9Z5L6IXnN9QgiWMvhJQBeVzj+KCfg9Y217D22Z4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oy+d2ZAjFInF2ss8Z9cZDCkxRXemJDcVKY6XU2Fu4HDeMgai/guPej3ZoqgUvSLIH 7jMPNSA2dHt2wzGy8hmnGL+7ZDE7DLaSxeLXrMgVUdsEOVVXTeGZzdNKLpsWDMo8Yt 5dr7KbbGkgG0I3C4eOZNmORQwBO/rW2gFWqtkVCDQf3VMamWrtI9Zu8iT+jNFx6J+N HQBxKIpJVSmlmu50dkJTejd5NoKHPr58gUNZ2WQnoSKPBNOkrCquGEJBY+FJ1eueTy wmK5WKQTBjESErNDWzu9saIMKrQFYlJwnHNjOOML8rOTIawpO+wXG+49Hog0VPUnxH yiiHjMmrZJqeA== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Swapnil Sapkal Subject: [PATCH 03/13] perf header: Sanity check HEADER_NRCPUS and HEADER_CPU_DOMAIN_INFO Date: Fri, 10 Apr 2026 19:08:55 -0300 Message-ID: <20260410220905.200051-4-acme@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260410220905.200051-1-acme@kernel.org> References: <20260410220905.200051-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: 8bit From: Arnaldo Carvalho de Melo While working on some cleanups sashiko questioned about pre-existing issues, namely lacking sanity checks for perf.data headers, add some with the help of Claude. Cc: Ian Rogers Cc: Swapnil Sapkal Assisted-by: Claude Code:claude-opus-4-6 Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 45 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 22c44b6f0b098f95..4cb748763c8a0741 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -63,6 +63,8 @@ #include #endif +#define MAX_SCHED_DOMAINS 64 + /* * magic2 = "PERFILE2" * must be a numerical value to let the endianness @@ -2722,6 +2724,13 @@ static int process_nrcpus(struct feat_fd *ff, void *data __maybe_unused) ret = do_read_u32(ff, &nr_cpus_online); if (ret) return ret; + + 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; + } + env->nr_cpus_avail = (int)nr_cpus_avail; env->nr_cpus_online = (int)nr_cpus_online; return 0; @@ -3698,6 +3707,17 @@ static int process_cpu_domain_info(struct feat_fd *ff, void *data __maybe_unused nra = env->nr_cpus_avail; nr = env->nr_cpus_online; + if (nra == 0 || nr == 0) { + pr_err("Invalid HEADER_CPU_DOMAIN_INFO: missing HEADER_NRCPUS\n"); + return -1; + } + + if (ff->size < 2 * sizeof(u32) + nr * 2 * sizeof(u32)) { + pr_err("Invalid HEADER_CPU_DOMAIN_INFO: section too small (%zu) for %u CPUs\n", + (size_t)ff->size, nr); + return -1; + } + cd_map = calloc(nra, sizeof(*cd_map)); if (!cd_map) return -1; @@ -3714,6 +3734,18 @@ static int process_cpu_domain_info(struct feat_fd *ff, void *data __maybe_unused if (ret) return ret; + /* + * Sanity check: real systems have at most ~10 sched domain levels + * (SMT, CLS, MC, PKG + NUMA hops). Reject obviously bogus values + * from malformed perf.data files before they cause excessive + * allocation in the per-CPU loop. + */ + if (max_sched_domains > MAX_SCHED_DOMAINS) { + pr_err("Invalid HEADER_CPU_DOMAIN_INFO: max_sched_domains %u > %u\n", + max_sched_domains, MAX_SCHED_DOMAINS); + return -1; + } + env->max_sched_domains = max_sched_domains; for (i = 0; i < nr; i++) { @@ -3725,6 +3757,11 @@ static int process_cpu_domain_info(struct feat_fd *ff, void *data __maybe_unused return -1; } + if (cd_map[cpu]) { + pr_err("Invalid HEADER_CPU_DOMAIN_INFO: duplicate cpu %u\n", cpu); + return -1; + } + cd_map[cpu] = zalloc(sizeof(*cd_map[cpu])); if (!cd_map[cpu]) return -1; @@ -3760,7 +3797,13 @@ static int process_cpu_domain_info(struct feat_fd *ff, void *data __maybe_unused if (!d_info) return -1; - assert(cd_map[cpu]->domains[domain] == NULL); + if (cd_map[cpu]->domains[domain]) { + pr_err("Invalid HEADER_CPU_DOMAIN_INFO: duplicate domain %u for cpu %u\n", + domain, cpu); + free(d_info); + return -1; + } + cd_map[cpu]->domains[domain] = d_info; d_info->domain = domain; -- 2.53.0