diff options
| author | Kui-Feng Lee <thinker.li@gmail.com> | 2024-02-21 18:11:04 -0800 |
|---|---|---|
| committer | Martin KaFai Lau <martin.lau@kernel.org> | 2024-02-22 12:26:40 -0800 |
| commit | 3e0008336ae3153fb89b1a15bb877ddd38680fe6 (patch) | |
| tree | 8c45e2221acca5756299cd79561305fa71569755 /kernel/bpf | |
| parent | 58fd62e0aa50fdd20bc41a01e787001f3af8a925 (diff) | |
| download | linux-3e0008336ae3153fb89b1a15bb877ddd38680fe6.tar.gz linux-3e0008336ae3153fb89b1a15bb877ddd38680fe6.tar.bz2 linux-3e0008336ae3153fb89b1a15bb877ddd38680fe6.zip | |
bpf: Check cfi_stubs before registering a struct_ops type.
Recently, st_ops->cfi_stubs was introduced. However, the upcoming new
struct_ops support (e.g. sched_ext) is not aware of this and does not
provide its own cfi_stubs. The kernel ends up NULL dereferencing the
st_ops->cfi_stubs.
Considering struct_ops supports kernel module now, this NULL check
is necessary. This patch is to reject struct_ops registration
that does not provide a cfi_stubs.
Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>
Link: https://lore.kernel.org/r/20240222021105.1180475-2-thinker.li@gmail.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/bpf_struct_ops.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c index 0d7be97a2411..a6019087b467 100644 --- a/kernel/bpf/bpf_struct_ops.c +++ b/kernel/bpf/bpf_struct_ops.c @@ -302,6 +302,11 @@ int bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc, } sprintf(value_name, "%s%s", VALUE_PREFIX, st_ops->name); + if (!st_ops->cfi_stubs) { + pr_warn("struct_ops for %s has no cfi_stubs\n", st_ops->name); + return -EINVAL; + } + type_id = btf_find_by_name_kind(btf, st_ops->name, BTF_KIND_STRUCT); if (type_id < 0) { |