1 files changed, 14 insertions, 1 deletions

diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
index 217b10bd9f48..584636c9e2eb 100644
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
@@ -391,7 +391,8 @@ static void array_map_seq_show_elem(struct bpf_map *map, void *key,
                 return;
         }
 
-        seq_printf(m, "%u: ", *(u32 *)key);
+        if (map->btf_key_type_id)
+                seq_printf(m, "%u: ", *(u32 *)key);
         btf_type_seq_show(map->btf, map->btf_value_type_id, value, m);
         seq_puts(m, "\n");
 
@@ -428,6 +429,18 @@ static int array_map_check_btf(const struct bpf_map *map,
 {
         u32 int_data;
 
+        /* One exception for keyless BTF: .bss/.data/.rodata map */
+        if (btf_type_is_void(key_type)) {
+                if (map->map_type != BPF_MAP_TYPE_ARRAY ||
+                    map->max_entries != 1)
+                        return -EINVAL;
+
+                if (BTF_INFO_KIND(value_type->info) != BTF_KIND_DATASEC)
+                        return -EINVAL;
+
+                return 0;
+        }
+
         if (BTF_INFO_KIND(key_type->info) != BTF_KIND_INT)
                 return -EINVAL;