Commit dc1508a5 authored by Yonghong Song's avatar Yonghong Song Committed by Daniel Borkmann

bpf: fix bpffs non-array map seq_show issue

In function map_seq_next() of kernel/bpf/inode.c,
the first key will be the "0" regardless of the map type.
This works for array. But for hash type, if it happens
key "0" is in the map, the bpffs map show will miss
some items if the key "0" is not the first element of
the first bucket.

This patch fixed the issue by guaranteeing to get
the first element, if the seq_show is just started,
by passing NULL pointer key to map_get_next_key() callback.
This way, no missing elements will occur for
bpffs hash table show even if key "0" is in the map.

Fixes: a26ca7c9 ("bpf: btf: Add pretty print support to the basic arraymap")
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarYonghong Song <yhs@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 60afdf06
...@@ -196,19 +196,21 @@ static void *map_seq_next(struct seq_file *m, void *v, loff_t *pos) ...@@ -196,19 +196,21 @@ static void *map_seq_next(struct seq_file *m, void *v, loff_t *pos)
{ {
struct bpf_map *map = seq_file_to_map(m); struct bpf_map *map = seq_file_to_map(m);
void *key = map_iter(m)->key; void *key = map_iter(m)->key;
void *prev_key;
if (map_iter(m)->done) if (map_iter(m)->done)
return NULL; return NULL;
if (unlikely(v == SEQ_START_TOKEN)) if (unlikely(v == SEQ_START_TOKEN))
goto done; prev_key = NULL;
else
prev_key = key;
if (map->ops->map_get_next_key(map, key, key)) { if (map->ops->map_get_next_key(map, prev_key, key)) {
map_iter(m)->done = true; map_iter(m)->done = true;
return NULL; return NULL;
} }
done:
++(*pos); ++(*pos);
return key; return key;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment