diff options
author | Rob Herring <robh@kernel.org> | 2018-03-08 09:21:07 -0600 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2018-03-08 09:21:07 -0600 |
commit | c679fa6e3aaa5c58fc514b5b88cfa82774b8d390 (patch) | |
tree | 0c10b339368bd1795152a66a4e245e6f654fb3ec /kernel/bpf/core.c | |
parent | bdb7013df910681f84eff27b07791d4c160cb76f (diff) | |
parent | 4fd98e374fd377ae0458a9dc44aa779cf9631ddd (diff) |
Merge branch 'dtc-update' into dt/next
Diffstat (limited to 'kernel/bpf/core.c')
-rw-r--r-- | kernel/bpf/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 29ca9208dcfa..d315b393abdd 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -1590,7 +1590,7 @@ int bpf_prog_array_copy_to_user(struct bpf_prog_array __rcu *progs, * so always copy 'cnt' prog_ids to the user. * In a rare race the user will see zero prog_ids */ - ids = kcalloc(cnt, sizeof(u32), GFP_USER); + ids = kcalloc(cnt, sizeof(u32), GFP_USER | __GFP_NOWARN); if (!ids) return -ENOMEM; rcu_read_lock(); |