Re: [PATCH] bpf: Reject offloaded maps as map-in-map inner maps
From: Alexei Starovoitov
Date: Thu Nov 12 2026 - 15:53:05 EST
On Thu, Nov 12, 2026 at 02:56 AM Shihuang Liu <shlomojune6@xxxxxxxxx> wrote:
> + if (bpf_map_is_offloaded(inner_map))
> + return ERR_PTR(-EOPNOTSUPP);
> if (!inner_map->ops->map_meta_equal)
> return ERR_PTR(-ENOTSUPP);
No need for a new check.
.map_meta_equal in the ops means that the map can be an inner map.
See the comment in struct bpf_map_ops.
Drop it from bpf_map_offload_ops. Then the next check rejects the map.
> - if (inner_map_meta->ops->map_meta_equal(inner_map_meta, inner_map)) {
> + if (inner_map_meta->ops == inner_map->ops &&
> + inner_map_meta->ops->map_meta_equal(inner_map_meta, inner_map)) {
bpf_iter_attach_map() has the same problem. It checks map_type only:
BPF_LINK_CREATE
bpf_iter_attach_map() accepts an offloaded ARRAY or HASH
BPF_ITER_CREATE
prepare_seq_file()
__get_seq_info() bpf_map_offload_ops.iter_seq_info is NULL
bpf_map_elem_reg_info.seq_info is NULL
seq_info->seq_priv_size <- NULL pointer dereference
Something like this (compile tested only):
diff --git a/kernel/bpf/map_in_map.c b/kernel/bpf/map_in_map.c
index 0fa3f2a..9ec3bbf 100644
--- a/kernel/bpf/map_in_map.c
+++ b/kernel/bpf/map_in_map.c
@@ -38,6 +38,7 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd)
if (!inner_map_meta)
return ERR_PTR(-ENOMEM);
+ inner_map_meta->ops = inner_map->ops;
inner_map_meta->map_type = inner_map->map_type;
inner_map_meta->key_size = inner_map->key_size;
inner_map_meta->value_size = inner_map->value_size;
@@ -65,7 +66,6 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd)
}
/* Misc members not needed in bpf_map_meta_equal() check. */
- inner_map_meta->ops = inner_map->ops;
if (inner_map->ops == &array_map_ops || inner_map->ops == &percpu_array_map_ops) {
struct bpf_array *inner_array_meta =
container_of(inner_map_meta, struct bpf_array, map);
@@ -88,8 +88,9 @@ void bpf_map_meta_free(struct bpf_map *map_meta)
bool bpf_map_meta_equal(const struct bpf_map *meta0,
const struct bpf_map *meta1)
{
- /* No need to compare ops because it is covered by map_type */
- return meta0->map_type == meta1->map_type &&
+ /* An offloaded map has the map_type of a host map and its own ops */
+ return meta0->ops == meta1->ops &&
+ meta0->map_type == meta1->map_type &&
meta0->key_size == meta1->key_size &&
meta0->value_size == meta1->value_size &&
meta0->map_flags == meta1->map_flags &&
diff --git a/kernel/bpf/map_iter.c b/kernel/bpf/map_iter.c
index a58c148..9e459a2 100644
--- a/kernel/bpf/map_iter.c
+++ b/kernel/bpf/map_iter.c
@@ -176,6 +176,10 @@ static int bpf_iter_attach_map(struct bpf_prog *prog,
map->map_type != BPF_MAP_TYPE_RHASH)
goto put_map;
+ /* An offloaded map has the map_type of a host map and its own ops */
+ if (!map->ops->iter_seq_info)
+ goto put_map;
+
aux->map = map;
err = bpf_iter_map_check_prog(prog, aux);
if (err)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 04a3b3c..c8146db 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -112,7 +112,6 @@ int bpf_check_uarg_tail_zero(bpfptr_t uaddr,
}
const struct bpf_map_ops bpf_map_offload_ops = {
- .map_meta_equal = bpf_map_meta_equal,
.map_alloc = bpf_map_offload_map_alloc,
.map_free = bpf_map_offload_map_free,
.map_check_btf = map_check_no_btf,
Pls tag the respin as [PATCH bpf-next v2].
pw-bot: cr