Merge branch 'bpf-lockdep-fixes'

Browse source

Alexei Starovoitov says:

====================
v1->v2:
- reworded 2nd patch. It's a real dead lock. Not a false positive
- dropped the lockdep fix for up_read_non_owner in bpf_get_stackid

In addition to preempt_disable patch for socket filters
https://patchwork.ozlabs.org/patch/1032437/
First patch fixes lockdep false positive in percpu_freelist
Second patch fixes potential deadlock in bpf_prog_register
Third patch fixes another potential deadlock in stackmap access
from tracing bpf prog and from syscall.
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

...

This commit is contained in:

Daniel Borkmann 2019-01-31 23:18:22 +01:00

parent 6cab5e90ab 7c4cd051ad

commit f01c280387

5 changed files with 47 additions and 28 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

kernel/bpf/hashtab.c

View file

41

kernel/bpf/percpu_freelist.c

View file

4

kernel/bpf/percpu_freelist.h

View file

12

kernel/bpf/syscall.c

View file

14

kernel/trace/bpf_trace.c

View file