]> git.baikalelectronics.ru Git - kernel.git/commit
bpf: fix ri->map_owner pointer on bpf_prog_realloc
authorDaniel Borkmann <daniel@iogearbox.net>
Tue, 19 Sep 2017 22:44:21 +0000 (00:44 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Sep 2017 23:38:53 +0000 (16:38 -0700)
commit0516887a5854ec776be0b79657bcd6213ac35c6b
tree4ce9a1dd192a35dfb8a3ee4b66e37f2c8c9a90d2
parentad811fd29437201990c37a87b64b973a0b1db665
bpf: fix ri->map_owner pointer on bpf_prog_realloc

Commit ac6c9caed065 ("bpf: don't select potentially stale
ri->map from buggy xdp progs") passed the pointer to the prog
itself to be loaded into r4 prior on bpf_redirect_map() helper
call, so that we can store the owner into ri->map_owner out of
the helper.

Issue with that is that the actual address of the prog is still
subject to change when subsequent rewrites occur that require
slow path in bpf_prog_realloc() to alloc more memory, e.g. from
patching inlining helper functions or constant blinding. Thus,
we really need to take prog->aux as the address we're holding,
which also works with prog clones as they share the same aux
object.

Instead of then fetching aux->prog during runtime, which could
potentially incur cache misses due to false sharing, we are
going to just use aux for comparison on the map owner. This
will also keep the patchlet of the same size, and later check
in xdp_map_invalid() only accesses read-only aux pointer from
the prog, it's also in the same cacheline already from prior
access when calling bpf_func.

Fixes: ac6c9caed065 ("bpf: don't select potentially stale ri->map from buggy xdp progs")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
kernel/bpf/verifier.c
net/core/filter.c