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 C6F63357D11; Wed, 30 Sep 2026 16:38: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=1790786294; cv=none; b=EVmbpSsEtPgeAnJKCHPij2eJnHmwAfVrhcziiX24dnwv2HzxKspEwzJdv8+iOwO14nxY0WGkxdPIoiCywJfUrrhEYrlU0UB5hItS2yhgq9lnTszyIhuvPPORQBH635za09JEpK358zFElHRIzGcw32Q0HwbFkfWkrVDWAF8yoo8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790786294; c=relaxed/simple; bh=yJgxAm/2hdCAlD3o4J0dmgygLqqQ6OTXyZyeORx3tRg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rQfOv2zPPX6jYNhw1ti4mYqQO1BO51jeEAFfkFWJ6BbzVRFPnDtiVYtZEGwSkRTk3oWO4yIBBulrWSWThVlmOYexy2llJThN7uWbl9xk8oZr7XcTTv5NTUNMtVN+FLsryncUTMqApxJeYW719B8Pbiv1gCyTbq+9ssnW86LyTH8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MpqPv7iP; 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="MpqPv7iP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FCB71F000FF; Wed, 30 Sep 2026 16:38:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790786293; bh=7x0CYXaSrZOmKtKokIQNBG5lsM4Fh27BOtyJXE+N8EI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MpqPv7iPgjQ3xa0eiHBA1X4KFIs4/bmA67y6TBcwq/VKRNgrB3lLKEdRGWhp4b6aq EwtnaMPq0b6S+Gf1WpjYp1NkDLy9Kf8cga5YIU2vRQ2tqMC/3Ue941Q2BhKlZ53WsY cFv/nUfWr1ETtehcACdfluPIik9Bwaerz9bISpMQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiayuan Chen , Eduard Zingerman , Alexei Starovoitov , Sasha Levin Subject: [PATCH 6.1 811/982] bpf: Fix divide-by-zero in btf_struct_walk() Date: Wed, 30 Sep 2026 17:25:47 +0200 Message-ID: <20260930152434.177835038@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@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: Jiayuan Chen [ Upstream commit b0b3dc66529676228cb938cbcad66920f735c223 ] When an access goes past the struct and the last member is a flexible array, btf_struct_walk() folds the offset back into a single element with (off - moff) % t->size, but never checks that the element type has a size. BTF takes an empty struct, so this in program BTF /* event could be empty */ struct event { #ifdef HAVE_TIMESTAMP __u64 ts; #endif }; struct batch { int nr; struct event events[]; }; divides by zero at prog load time. Getting there needs a PTR_TO_BTF_ID that is not MEM_ALLOC, e.g. a plain read of a local kptr stashed in a map from a sleepable program. Oops: divide error: 0000 [#1] SMP KASAN PTI RIP: 0010:btf_struct_walk+0x53f/0x1570 Call Trace: btf_struct_access+0x42a/0xcd0 check_ptr_to_btf_access+0x4dc/0x1160 check_mem_access+0x3a45/0x8740 check_load_mem+0x36a/0xd10 do_check_common+0x3ef0/0xb210 bpf_check+0x6d3b/0x8580 bpf_prog_load+0xf7c/0x2720 __sys_bpf+0xa83/0x3690 __x64_sys_bpf+0xc7/0x150 x64_sys_call+0x1f3f/0x27e0 do_syscall_64+0xe5/0x610 entry_SYSCALL_64_after_hwframe+0x76/0x7e Reject a zero-sized element type. The fixed array path in the same function already bails out on the same thing: btf_struct_walk() ... /* skip empty array */ if (moff == mtrue_end) continue; msize /= total_nelems; Fixes: 9c5f8a1008a1 ("bpf: Support variable length array in tracing programs") Signed-off-by: Jiayuan Chen Acked-by: Eduard Zingerman Link: https://lore.kernel.org/r/20260910122316.186384-1-jiayuan.chen@linux.dev Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- kernel/bpf/btf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 2aa8afcebfce0..e20b4d024a828 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -5633,7 +5633,7 @@ static int btf_struct_walk(struct bpf_verifier_log *log, const struct btf *btf, if (btf_type_is_int(t)) return WALK_SCALAR; - if (!btf_type_is_struct(t)) + if (!btf_type_is_struct(t) || !t->size) goto error; off = (off - moff) % t->size; -- 2.53.0