]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
bpf: fix unlocking of jited image when module ronx not set
authorDaniel Borkmann <daniel@iogearbox.net>
Tue, 21 Feb 2017 15:09:34 +0000 (16:09 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Feb 2017 18:30:14 +0000 (13:30 -0500)
commit9d876e79df6a2f364b9f2737eacd72ceb27da53a
tree954aa0e71dbb2fc5fad9d6a77ca6477a873ffbe6
parentd2852a2240509e512712e25de2d0796cda435ecb
bpf: fix unlocking of jited image when module ronx not set

Eric and Willem reported that they recently saw random crashes when
JIT was in use and bisected this to 74451e66d516 ("bpf: make jited
programs visible in traces"). Issue was that the consolidation part
added bpf_jit_binary_unlock_ro() that would unlock previously made
read-only memory back to read-write. However, DEBUG_SET_MODULE_RONX
cannot be used for this to test for presence of set_memory_*()
functions. We need to use ARCH_HAS_SET_MEMORY instead to fix this;
also add the corresponding bpf_jit_binary_lock_ro() to filter.h.

Fixes: 74451e66d516 ("bpf: make jited programs visible in traces")
Reported-by: Eric Dumazet <edumazet@google.com>
Reported-by: Willem de Bruijn <willemb@google.com>
Bisected-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/arm64/net/bpf_jit_comp.c
arch/s390/net/bpf_jit_comp.c
arch/x86/net/bpf_jit_comp.c
include/linux/filter.h