Commit 301a33d5 authored by Mircea Cirjaliu's avatar Mircea Cirjaliu Committed by Daniel Borkmann
Browse files

bpf: Fix helper bpf_map_peek_elem_proto pointing to wrong callback 



I assume this was obtained by copy/paste. Point it to bpf_map_peek_elem()
instead of bpf_map_pop_elem(). In practice it may have been less likely
hit when under JIT given shielded via 84430d42 ("bpf, verifier: avoid
retpoline for map push/pop/peek operation").

Fixes: f1a2e44a ("bpf: add queue and stack maps")
Signed-off-by: default avatarMircea Cirjaliu <mcirjaliu@bitdefender.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Cc: Mauricio Vasquez <mauriciovasquezbernal@gmail.com>
Link: https://lore.kernel.org/bpf/AM7PR02MB6082663DFDCCE8DA7A6DD6B1BBA30@AM7PR02MB6082.eurprd02.prod.outlook.com
parent f7b9820d

kernel/bpf/helpers.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ BPF_CALL_2(bpf_map_peek_elem, struct bpf_map *, map, void *, value) 
}



const struct bpf_func_proto bpf_map_peek_elem_proto = {

	.func		= bpf_map_pop_elem,

	.func		= bpf_map_peek_elem,

	.gpl_only	= false,

	.ret_type	= RET_INTEGER,

	.arg1_type	= ARG_CONST_MAP_PTR,