Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80b0d86a authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Alexei Starovoitov
Browse files

bpf: fix direct packet write into pop/peek helpers 



Commit f1a2e44a ("bpf: add queue and stack maps") probably just
copy-pasted .pkt_access for bpf_map_{pop,peek}_elem() helpers, but
this is buggy in this context since it would allow writes into cloned
skbs which is invalid. Therefore, disable .pkt_access for the two.

Fixes: f1a2e44a ("bpf: add queue and stack maps")
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Cc: Mauricio Vasquez B <mauricio.vasquez@polito.it>
Acked-by: default avatarMauricio Vasquez <B&lt;mauricio.vasquez@polito.it>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent d5563d36

kernel/bpf/helpers.c

+0 −2
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ BPF_CALL_2(bpf_map_pop_elem, struct bpf_map *, map, void *, value) 
const struct bpf_func_proto bpf_map_pop_elem_proto = {

	.func		= bpf_map_pop_elem,

	.gpl_only	= false,

	.pkt_access	= true,

	.ret_type	= RET_INTEGER,

	.arg1_type	= ARG_CONST_MAP_PTR,

	.arg2_type	= ARG_PTR_TO_UNINIT_MAP_VALUE,
@@ -113,7 +112,6 @@ 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,

	.gpl_only	= false,

	.pkt_access	= true,

	.ret_type	= RET_INTEGER,

	.arg1_type	= ARG_CONST_MAP_PTR,

	.arg2_type	= ARG_PTR_TO_UNINIT_MAP_VALUE,