bpf: Return EINVAL instead of NULL for map_lookup_elem of queue
PATCH 1/1 bpf: Return EINVAL instead of NULL for map_lookup_elem of queue
Programs should use map_peek_elem over map_lookup_elem for queues. NULL is also not a valid queue return nor a proper error, that could be handled.
--- kernel/bpf/queue_stack_maps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/queue_stack_maps.c +2 -1
@@ -234,7 +234,8 @@ static long queue_stack_map_push_elem(struct bpf_map *map, void *value,/* Called from syscall or from eBPF program */ static void *queue_stack_map_lookup_elem (struct bpf_map *map,void *key) { -return NULL ; +/* The eBPF program should use map_peek_elem instead */ +return ERR_PTR (-EINVAL ); }/* Called from syscall or from eBPF program */
Signature · 1 line
2.45.2
Quoted 4 lines · Florian Lehner
Programs should use
map_peek_elemovermap_lookup_elemfor queues. NULL is also not a valid queue return nor a proper error, that could be handled.Signed-off-by Florian Lehner <[email protected]>
Quoted 18 lines
--- kernel/bpf/queue_stack_maps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)kernel/bpf/queue_stack_maps.c +2
-1@@ -234,7 +234,8 @@ static long queue_stack_map_push_elem(struct bpf_map *map, void *value,/* Called from syscall or from eBPF program */ static void *queue_stack_map_lookup_elem (struct bpf_map *map,void *key) { -return NULL ; +/* The eBPF program should use map_peek_elem instead */ +return ERR_PTR (-EINVAL ); }/* Called from syscall or from eBPF program */
Quoted 14 lines · Florian Lehner
Programs should use
map_peek_elemovermap_lookup_elemfor queues. NULL is also not a valid queue return nor a proper error, that could be handled.Signed-off-by Florian Lehner <[email protected]>--- kernel/bpf/queue_stack_maps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)kernel/bpf/queue_stack_maps.c +0
-0
kernel/bpf/queue_stack_maps.c static long queue_stack_map_push_elem(struct bpf_map *map, void *value, · line 238
Quoted 6 lines
kernel/bpf/queue_stack_maps.c +2
-1@@ -234,7 +234,8 @@ static long queue_stack_map_push_elem(struct bpf_map *map, void *value,/* Called from syscall or from eBPF program */ static void *queue_stack_map_lookup_elem (struct bpf_map *map,void *key) { -return NULL ; +/* The eBPF program should use map_peek_elem instead */ +return ERR_PTR (-EINVAL );
The commit log, the code change and comment are highly misleading. bpf prog cannot call this function due to the verifier restrictions. bpf syscall cannot reach this code path either.
This is effectively a dead code.
But if there is a verifier bug or obscure sequence of events and bpf prog manages to call this function then it must return NULL. ERR_PTR(-EINVAL) will look like a valid addr to a prog and it will crash.
pw-bot: cr