diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2016-07-16 02:15:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-17 08:03:39 +0300 |
| commit | 858d68f10238fdd1ebdd0096f912f063e97c6766 (patch) | |
| tree | a8ec4a97a18b1c5671f178bad48b84337ec81259 /kernel/bpf | |
| parent | c5c4e45c4b79acb23f07e43dac1348e67b4ddf91 (diff) | |
| download | linux-858d68f10238fdd1ebdd0096f912f063e97c6766.tar.xz | |
bpf: bpf_event_entry_gen's alloc needs to be in atomic context
Should have been obvious, only called from bpf() syscall via map_update_elem()
that calls bpf_fd_array_map_update_elem() under RCU read lock and thus this
must also be in GFP_ATOMIC, of course.
Fixes: 3b1efb196eee ("bpf, maps: flush own entries on perf map release")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/arraymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index db1a743e3db2..633a650d7aeb 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -430,7 +430,7 @@ static struct bpf_event_entry *bpf_event_entry_gen(struct file *perf_file, { struct bpf_event_entry *ee; - ee = kzalloc(sizeof(*ee), GFP_KERNEL); + ee = kzalloc(sizeof(*ee), GFP_ATOMIC); if (ee) { ee->event = perf_file->private_data; ee->perf_file = perf_file; |