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 E40B9388371; Sat, 17 Oct 2026 16:32: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=1792254735; cv=none; b=XAuxPetBSVNFBFqRo6H52pg3q8Nerk5inN0yhMsEn2+MgYExgIpfjqvgIUzAYFs08l7pmLMyzoerItJcSrphSaIG8MsswTO7v/ViQBL3dr/YH53xHZ+IPn6h/Zky6oNDJ/Z4boezHBM9JwKKhOGXStmTa8VARkByCh5Iu7mblI8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792254735; c=relaxed/simple; bh=MA7f5GCyRX5RfriAznx2WbsWqwQOfxapM82y5QOSV4U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sVzGb/KX24GRWEpS0YmSyq6TxhLiN8I/amZVEJo/SB/PAuS97eYRXgiII4p0SBqQVF6YWAad4Y4h9x0mSEvHOlIa+pjpvSiE2LKiDsSgvpAXAjt2Un5QuGY5p/KYi957bJaj9Ls5bq6d3sgfA/R935PnDv7oACbTZ8n7SFthkN4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tBqEbwMV; 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="tBqEbwMV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D10EF1F000C4; Sat, 17 Oct 2026 16:32:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1792254733; bh=S89DWEPotUsowgIpy/ZK9fMwEOzg+ivCgYFh1TuHkQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tBqEbwMVDdDLfHk6ru7us/cKw8/T4Et8YOLVMQ5wu+zNpCksT1c3Ie6OyUoywOv6S QtOjGk+X3P1GYcOVnAz1GU6S5KovhOFfN3oNWOofEO/4E6qe1aMTVTf9eN1oUcGYpD lYzYBsteyFpFrLeNV4WU6pev2tv2qtf+60kq4pp4= 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.12 543/869] perf tools: Use perf_env__get_cpu_topology() in machine__resolve() Date: Sat, 17 Oct 2026 17:56:24 +0200 Message-ID: <20261017160051.014967079@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261017160036.979869304@linuxfoundation.org> References: <20261017160036.979869304@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.12-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 aac96d5d19170..1e5085817e825 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" @@ -763,8 +764,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