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 85A183B1EFC; Tue, 21 Jul 2026 20:41:41 +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=1784666502; cv=none; b=D5SdWwcpvXH92nygw1O2zW1fLUoiyr0tfdFyklRcEBUCrL9wd8RGJkDycjFOtDg/MJLTf7oH4Ahby8wQDinxCjnn9S8BkcedeHpVYCFyVu5EMh68wsZygV2fP+ZMBxmWj52mwCn8G+kEMknGjzl1AQQUc8LuW2J5xPNgMYUyDws= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784666502; c=relaxed/simple; bh=ey5GynZiEOoLGtECIshWSVg74J+wcZBHop27Gr2d3Es=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eKQwi1ju8QEacBuHl3C8hoNqn/I2sklIMNSi7h6VcHOW5aATQDFqeZrKMvRiSRm2qp1p40lRJGTAtqm1F3jwiqw3SmJT7qdhhG5dc+KIUurLNqnjwNL8myt/5Uk87SJndTP55hDKxZU4msgugyTS2bMANhbVYYoXfQBPeKl/LQs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fNTbVjZ0; 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="fNTbVjZ0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA0F81F000E9; Tue, 21 Jul 2026 20:41:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784666501; bh=kwK16Sl1iE+ct1Tr20eqR/c9Y3WvO6eD1PBtlpSPk5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fNTbVjZ0gD3+Q0JgXGsxDiLxXcTI204SrnLYSt5uFAim1fP+k0NiPd437r71JbaPo iNY+ZMYd8B8ygrVEMi8p8puXrYwqCJHnIE5Xy4fB3D7yQxxRGCmQZdBezidcHSX+Ln smNqz/cdGUsuuyM7VF+wA7iQfo99fqCyZgWcJ2fM= 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.6 0690/1266] perf bpf: Add NULL check for btf__type_by_id() in synthesize_bpf_prog_name() Date: Tue, 21 Jul 2026 17:18:47 +0200 Message-ID: <20260721152457.294299748@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152441.786066624@linuxfoundation.org> References: <20260721152441.786066624@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.6-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 2a9b90aa181fc7..dfebec3a6e71f5 100644 --- a/tools/perf/util/bpf-event.c +++ b/tools/perf/util/bpf-event.c @@ -137,7 +137,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