From mboxrd@z Thu Jan 1 00:00:00 1970 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 6DC913BB138; Tue, 21 Jul 2026 21:31:10 +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=1784669471; cv=none; b=PMgNQAQ9nBlgLTHX3ax+kAkDd2uFO16L9yDmUpqb3qRfcJyQwr/e73xMnHKxFEVH4CU2Z7J0yw8CyjFDek+E/8ntkvbyofBdapSxZKrta+N6xDZTSUT+gmIc9DUrNDx5/aOXE+9k5QOAXFugIxTFDqksiGWWF1PpmV0RMGCDr9g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784669471; c=relaxed/simple; bh=zLGY2fZnrWzDqUqP7XLnuyHAbWWLAkHrVeDftaLB20w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mb0uiDNZIm1oza+w+pJmQIpO9V+5Z+R73Uj5wIiPQw/PbmL45tMsB3YBZSvCsg7gRH6kcES0F1ivt43GfHIxGUFOZTRhV5Y2xfLZSiqgS3DGNO3bmazlQawT6vUrrWnpSn1EwdJ+VL9rD5tTjvwkcUqVn9s/jlPhol5oQMmoQ/Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dvIeEgOX; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dvIeEgOX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D35881F000E9; Tue, 21 Jul 2026 21:31:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784669470; bh=ZBHktKjscZyvqTP2lgDgrh5NRkjbKAicRtS5/AtyBeA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dvIeEgOXg4GfCr+/gsS0W+a0Watez14f/52PTqDjSPM1l2/JwAgb1SRNBdEi4Juuf s3Y8nD0TnRb9EVO65Vlof9RLyKGiVj9iapWUwRYu7YjXe1LdugFAOupG0/lOgqbWrh vAP3swoMEy/6XxwcnuxnBpisFes0e57gnEgyRgag= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot , Ian Rogers , Kan Liang , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.1 0524/1067] perf tools: Use perf_env__get_cpu_topology() in machine__resolve() Date: Tue, 21 Jul 2026 17:18:45 +0200 Message-ID: <20260721152436.332905862@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152424.521567757@linuxfoundation.org> References: <20260721152424.521567757@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnaldo Carvalho de Melo [ Upstream commit 5484b43a0ec8231c36fba6ead654cb72dbba8b8f ] machine__resolve() accesses env->cpu[al->cpu].socket_id after checking al->cpu >= 0 and env->cpu != NULL, but without validating al->cpu against env->nr_cpus_avail. Since al->cpu comes from the untrusted perf.data sample, a crafted file with a large CPU index causes an out-of-bounds heap read. Use perf_env__get_cpu_topology() which validates both NULL and bounds. Also bounds-check al->cpu before the cast to struct perf_cpu (int16_t): without this, values like 65536 silently truncate to 0, bypassing the accessor's internal check and returning CPU 0's topology. Fixes: 0c4c4debb0adda4c ("perf tools: Add processor socket info to hist_entry and addr_location") Reported-by: sashiko-bot Reviewed-by: Ian Rogers Cc: Kan Liang Cc: Ian Rogers Assisted-by: Claude:claude-opus-4.6 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/event.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 1fa14598b91669..d4d2c2141b8554 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -12,6 +12,7 @@ #include #include "cpumap.h" #include "dso.h" +#include "env.h" #include "event.h" #include "debug.h" #include "hist.h" @@ -710,8 +711,18 @@ int machine__resolve(struct machine *machine, struct addr_location *al, if (al->cpu >= 0) { struct perf_env *env = machine->env; - if (env && env->cpu) - al->socket = env->cpu[al->cpu].socket_id; + /* + * Bounds-check al->cpu (s32) before casting to struct perf_cpu + * (int16_t): without this, e.g. 65536 truncates to 0 and silently + * returns CPU 0's topology. Can go once perf_cpu.cpu is widened. + */ + if (env && al->cpu < env->nr_cpus_avail) { + struct cpu_topology_map *topo; + + topo = perf_env__get_cpu_topology(env, (struct perf_cpu){ al->cpu }); + if (topo) + al->socket = topo->socket_id; + } } if (al->map) { -- 2.53.0