diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-13 11:13:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-13 11:13:45 -0700 |
| commit | 242a6df688dcad7c55105280a79aaff83addf7ce (patch) | |
| tree | f9adee4a9f9cc9e55bcace5b5ae91fdc032c0699 /kernel/trace | |
| parent | 0d81a3f29c0afb18ba2b1275dcccf21e0dd4da38 (diff) | |
| parent | 90db6d772f749e38171d04619a5e3cd8804a6d02 (diff) | |
| download | linux-242a6df688dcad7c55105280a79aaff83addf7ce.tar.gz linux-242a6df688dcad7c55105280a79aaff83addf7ce.tar.bz2 linux-242a6df688dcad7c55105280a79aaff83addf7ce.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2020-03-12
The following pull-request contains BPF updates for your *net* tree.
We've added 12 non-merge commits during the last 8 day(s) which contain
a total of 12 files changed, 161 insertions(+), 15 deletions(-).
The main changes are:
1) Andrii fixed two bugs in cgroup-bpf.
2) John fixed sockmap.
3) Luke fixed x32 jit.
4) Martin fixed two issues in struct_ops.
5) Yonghong fixed bpf_send_signal.
6) Yoshiki fixed BTF enum.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/bpf_trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 19e793aa441a..68250d433bd7 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -732,7 +732,7 @@ static int bpf_send_signal_common(u32 sig, enum pid_type type) if (unlikely(!nmi_uaccess_okay())) return -EPERM; - if (in_nmi()) { + if (irqs_disabled()) { /* Do an early check on signal validity. Otherwise, * the error is lost in deferred irq_work. */ |