]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
bpf: Dont allow vmlinux BTF to be used in map_create and prog_load.
authorAlexei Starovoitov <ast@kernel.org>
Sun, 7 Mar 2021 22:52:48 +0000 (14:52 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 30 Mar 2021 12:30:17 +0000 (14:30 +0200)
commita9b2ab5db842da37e0f8d830d2a57688d77e3556
treecfdb8f4cb61912e0a244d849f443e4458866007e
parent3242ca02ec146326729165eb603046b0c8d90bfe
bpf: Dont allow vmlinux BTF to be used in map_create and prog_load.

[ Upstream commit 350a5c4dd2452ea999cc5e1d4a8dbf12de2f97ef ]

The syzbot got FD of vmlinux BTF and passed it into map_create which caused
crash in btf_type_id_size() when it tried to access resolved_ids. The vmlinux
BTF doesn't have 'resolved_ids' and 'resolved_sizes' initialized to save
memory. To avoid such issues disallow using vmlinux BTF in prog_load and
map_create commands.

Fixes: 5329722057d4 ("bpf: Assign ID to vmlinux BTF and return extra info for BTF in GET_OBJ_INFO")
Reported-by: syzbot+8bab8ed346746e7540e8@syzkaller.appspotmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210307225248.79031-1-alexei.starovoitov@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/bpf/syscall.c
kernel/bpf/verifier.c