summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMircea Cirjaliu <mcirjaliu@bitdefender.com>2021-01-19 21:53:18 +0100
committerDaniel Borkmann <daniel@iogearbox.net>2021-01-19 22:04:08 +0100
commit301a33d51880619d0c5a581b5a48d3a5248fa84b (patch)
tree52653445fbe86d9614777afe8a4ff95f35acadd1 /kernel
parentMerge branch 'sh_eth-fix-reboot-crash' (diff)
downloadlinux-301a33d51880619d0c5a581b5a48d3a5248fa84b.tar.xz
linux-301a33d51880619d0c5a581b5a48d3a5248fa84b.zip
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 84430d4232c3 ("bpf, verifier: avoid retpoline for map push/pop/peek operation"). Fixes: f1a2e44a3aec ("bpf: add queue and stack maps") Signed-off-by: Mircea Cirjaliu <mcirjaliu@bitdefender.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Cc: Mauricio Vasquez <mauriciovasquezbernal@gmail.com> Link: https://lore.kernel.org/bpf/AM7PR02MB6082663DFDCCE8DA7A6DD6B1BBA30@AM7PR02MB6082.eurprd02.prod.outlook.com
Diffstat (limited to 'kernel')
-rw-r--r--kernel/bpf/helpers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
index bd8a3183d030..41ca280b1dc1 100644
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@ -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,