diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2017-02-21 16:09:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-21 13:30:14 -0500 |
| commit | 9d876e79df6a2f364b9f2737eacd72ceb27da53a (patch) | |
| tree | 954aa0e71dbb2fc5fad9d6a77ca6477a873ffbe6 /arch/x86/net/bpf_jit_comp.c | |
| parent | d2852a2240509e512712e25de2d0796cda435ecb (diff) | |
| download | linux-stable-9d876e79df6a2f364b9f2737eacd72ceb27da53a.tar.gz linux-stable-9d876e79df6a2f364b9f2737eacd72ceb27da53a.tar.bz2 linux-stable-9d876e79df6a2f364b9f2737eacd72ceb27da53a.zip | |
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>
Diffstat (limited to 'arch/x86/net/bpf_jit_comp.c')
| -rw-r--r-- | arch/x86/net/bpf_jit_comp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 18a62e208826..32322ce9b405 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -1165,7 +1165,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) if (image) { bpf_flush_icache(header, image + proglen); - set_memory_ro((unsigned long)header, header->pages); + bpf_jit_binary_lock_ro(header); prog->bpf_func = (void *)image; prog->jited = 1; } else { |