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 2F07B471264; Tue, 21 Jul 2026 18:08: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=1784657326; cv=none; b=eYDhtN+bOJnPSDGMb+YKMYnZyE2bwmVntucVPar7Wy8Ext95v9LZ7aXGEf4APy+eGeBNDoiNOEqjeanNn9P5h3ZKHPfmmecFVd5KIMKbo4DJEzi4QX+LSk2CiX0q6V+wtI8VT7e2SRpa/VvK0Q1jFcb37600xDb0bBROCz5o014= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784657326; c=relaxed/simple; bh=MyZ6cNvmP7oJ+UGus1m8u6+HpuV52rVFno57z9dRy/s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YQfaPsSpvjDyonpotTXcF1LAQ9rkDe7ew/bYFr6AkGgDMFq+lydywZ2ETrAFMKq/uyvEK8x1i1/SFvlXC1mcVoGZFy0bqZDNsSlfn9txGTzWR4ayfYwGFJ3bbVeFU+G5pDvUhijdPUCvfiSqpdp5Se6Q7IBqz8NSKh2FGykxqT8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uX0+sKOd; 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="uX0+sKOd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9504A1F000E9; Tue, 21 Jul 2026 18:08:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784657325; bh=Ya0RlP6Mfi/ApKF7PWUnHUC67zF+O3vCI5jGIjZ0l90=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uX0+sKOdqOoU+xo32JY0vPcGI5ZSvo79XYMjT7NFJAnQ4QhOZJzJLhVq30zczxNQw lvHLHdlXd6lyu9DWkXt/6O83gSnK/24uBz8SCU5sswHZFr9ZG7XDE6vMfU2T4H4t/F jeH3Ujt+fkfUdXOaCN4W+4FHKvNZYyaIFUY46H/4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot , Song Liu , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.18 0722/1611] perf bpf: Add NULL check for btf__type_by_id() in synthesize_bpf_prog_name() Date: Tue, 21 Jul 2026 17:13:58 +0200 Message-ID: <20260721152531.619011860@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnaldo Carvalho de Melo [ Upstream commit 903b0526dcf86d030c5970b4b0a67f9c227368e2 ] synthesize_bpf_prog_name() calls btf__type_by_id() and immediately dereferences the result via t->name_off without checking for NULL. btf__type_by_id() returns NULL when the type_id is invalid or out of range. When processing perf.data files, finfo->type_id comes from untrusted input, so an invalid ID causes a NULL pointer dereference. Fix by checking t for NULL before dereferencing. Reported-by: sashiko-bot Fixes: fc462ac75b36daaa ("perf bpf: Extract logic to create program names from perf_event__synthesize_one_bpf_prog()") Cc: Song Liu Assisted-by: Claude:claude-opus-4.6 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/bpf-event.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c index 9b0638e5f4afb7..149b7f28a25eef 100644 --- a/tools/perf/util/bpf-event.c +++ b/tools/perf/util/bpf-event.c @@ -146,7 +146,8 @@ static int synthesize_bpf_prog_name(char *buf, int size, if (btf) { finfo = func_infos + sub_id * info->func_info_rec_size; t = btf__type_by_id(btf, finfo->type_id); - short_name = btf__name_by_offset(btf, t->name_off); + if (t) + short_name = btf__name_by_offset(btf, t->name_off); } else if (sub_id == 0 && sub_prog_cnt == 1) { /* no subprog */ if (info->name[0]) -- 2.53.0