From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2842C4332F for ; Sun, 18 Dec 2022 16:58:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233061AbiLRQ6f (ORCPT ); Sun, 18 Dec 2022 11:58:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233072AbiLRQ5G (ORCPT ); Sun, 18 Dec 2022 11:57:06 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2498E1C411; Sun, 18 Dec 2022 08:19:41 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B126060C99; Sun, 18 Dec 2022 16:19:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C5ECC433D2; Sun, 18 Dec 2022 16:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671380380; bh=L7QBOubpQX1WNlFRy75XautUJd4viMxIeZ6KVlGJcfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fwvmv8uhMXO3uSxfyBf7inrXTsaRSWZDUm09nO1GeoYv8XePJ0iyDglDq/Ylvun2R n3oB1oazcuJyrdS85SYX/Tsk0WDnQaMn9L0acmVkzTffJ+jzrJ2q42U6Kx4cCIygh3 E20zJxU80FGvz88XniV8Ugt/XThKWz4HRwY3N1QAHaF7Lv2yrijK7nq2pLeCgkjGcN G84ChZQMTzCuvPnc5QpGC/ldxI/jqDN98Ox9NVN0FHMeM/xLcTUs/QXUztU8q2l57a aQbN3FxNdn7VEbCVZRU59WMzzszddhG1zp35fwtBWMucxmDHCJ2oxyKenfOx3IpgYa SZTj0bqLO4r3w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stanislav Fomichev , syzbot+8dd0551dda6020944c5d@syzkaller.appspotmail.com, Daniel Borkmann , Yonghong Song , Sasha Levin , martin.lau@linux.dev, ast@kernel.org, andrii@kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 22/30] bpf: Prevent decl_tag from being referenced in func_proto arg Date: Sun, 18 Dec 2022 11:18:27 -0500 Message-Id: <20221218161836.933697-22-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221218161836.933697-1-sashal@kernel.org> References: <20221218161836.933697-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stanislav Fomichev [ Upstream commit f17472d4599697d701aa239b4c475a506bccfd19 ] Syzkaller managed to hit another decl_tag issue: btf_func_proto_check kernel/bpf/btf.c:4506 [inline] btf_check_all_types kernel/bpf/btf.c:4734 [inline] btf_parse_type_sec+0x1175/0x1980 kernel/bpf/btf.c:4763 btf_parse kernel/bpf/btf.c:5042 [inline] btf_new_fd+0x65a/0xb00 kernel/bpf/btf.c:6709 bpf_btf_load+0x6f/0x90 kernel/bpf/syscall.c:4342 __sys_bpf+0x50a/0x6c0 kernel/bpf/syscall.c:5034 __do_sys_bpf kernel/bpf/syscall.c:5093 [inline] __se_sys_bpf kernel/bpf/syscall.c:5091 [inline] __x64_sys_bpf+0x7c/0x90 kernel/bpf/syscall.c:5091 do_syscall_64+0x54/0x70 arch/x86/entry/common.c:48 This seems similar to commit ea68376c8bed ("bpf: prevent decl_tag from being referenced in func_proto") but for the argument. Reported-by: syzbot+8dd0551dda6020944c5d@syzkaller.appspotmail.com Signed-off-by: Stanislav Fomichev Signed-off-by: Daniel Borkmann Acked-by: Yonghong Song Link: https://lore.kernel.org/bpf/20221123035422.872531-2-sdf@google.com Signed-off-by: Sasha Levin --- kernel/bpf/btf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index a28bbec8c59f..8fd65a0eb7f3 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -2849,6 +2849,11 @@ static int btf_func_proto_check(struct btf_verifier_env *env, break; } + if (btf_type_is_resolve_source_only(arg_type)) { + btf_verifier_log_type(env, t, "Invalid arg#%u", i + 1); + return -EINVAL; + } + if (args[i].name_off && (!btf_name_offset_valid(btf, args[i].name_off) || !btf_name_valid_identifier(btf, args[i].name_off))) { -- 2.35.1