summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorDaniel Borkmann <daniel@iogearbox.net>2018-05-04 16:27:53 +0200
committerAlexei Starovoitov <ast@kernel.org>2018-05-04 14:55:54 -0700
commite94fa1d93117e7f1eb783dc9cae6c70650944449 (patch)
treec49a617e7a4e12030e511cb5f296439e58155d37 /kernel/trace
parenta5458aa923be8960a78d6fdfa1c6ff769b34deb2 (diff)
downloadtalos-obmc-linux-e94fa1d93117e7f1eb783dc9cae6c70650944449.tar.gz
talos-obmc-linux-e94fa1d93117e7f1eb783dc9cae6c70650944449.zip
bpf, xskmap: fix crash in xsk_map_alloc error path handling
If bpf_map_precharge_memlock() did not fail, then we set err to zero. However, any subsequent failure from either alloc_percpu() or the bpf_map_area_alloc() will return ERR_PTR(0) which in find_and_alloc_map() will cause NULL pointer deref. In devmap we have the convention that we return -EINVAL on page count overflow, so keep the same logic here and just set err to -ENOMEM after successful bpf_map_precharge_memlock(). Fixes: fbfc504a24f5 ("bpf: introduce new bpf AF_XDP map type BPF_MAP_TYPE_XSKMAP") Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Cc: Björn Töpel <bjorn.topel@intel.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/trace')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud