diff options
| author | David S. Miller <davem@davemloft.net> | 2021-02-09 18:55:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-02-09 18:55:17 -0800 |
| commit | b8776f14a47046796fe078c4a2e691f58e00ae06 (patch) | |
| tree | 4dba5bc10eaf44a6d97223f0ec8a3972d9f8a772 /kernel/trace | |
| parent | 450bbc3395185963b133177a9ddae305dae7c5fa (diff) | |
| parent | e88b2c6e5a4d9ce30d75391e4d950da74bb2bd90 (diff) | |
| download | linux-next-b8776f14a47046796fe078c4a2e691f58e00ae06.tar.gz linux-next-b8776f14a47046796fe078c4a2e691f58e00ae06.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2021-02-10
The following pull-request contains BPF updates for your *net* tree.
We've added 5 non-merge commits during the last 8 day(s) which contain
a total of 3 files changed, 22 insertions(+), 21 deletions(-).
The main changes are:
1) Fix missed execution of kprobes BPF progs when kprobe is firing via
int3, from Alexei Starovoitov.
2) Fix potential integer overflow in map max_entries for stackmap on
32 bit archs, from Bui Quang Minh.
3) Fix a verifier pruning and a insn rewrite issue related to 32 bit ops,
from Daniel Borkmann.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
c# Please enter a commit message to explain why this merge is necessary,
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/bpf_trace.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 6c0018abe68a..764400260eb6 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -96,9 +96,6 @@ unsigned int trace_call_bpf(struct trace_event_call *call, void *ctx) { unsigned int ret; - if (in_nmi()) /* not supported yet */ - return 1; - cant_sleep(); if (unlikely(__this_cpu_inc_return(bpf_prog_active) != 1)) { |