diff options
author | David S. Miller <davem@davemloft.net> | 2016-05-16 13:49:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-05-16 13:49:33 -0400 |
commit | 485b777855ed74dfcde5c46cfc88e2bc1b7c0714 (patch) | |
tree | ec3eef1f80ae2f1d5fdbb9a5c12df5bf06025ad7 /kernel/bpf/syscall.c | |
parent | 553eb544444e28749e2d752dee11e2ae4a3ecfb6 (diff) | |
parent | d93a47f735f3455a896e46b18d0ac26fa19639e6 (diff) |
Merge branch 'bpf-blinding'
Daniel Borkmann says:
====================
BPF updates
This set implements constant blinding for BPF, first couple of
patches are some preparatory cleanups, followed by the blinding.
Please see individual patches for details.
Thanks a lot!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/syscall.c')
-rw-r--r-- | kernel/bpf/syscall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index cf5e9f7ad13a..46ecce4b79ed 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -762,7 +762,7 @@ static int bpf_prog_load(union bpf_attr *attr) fixup_bpf_calls(prog); /* eBPF program is ready to be JITed */ - err = bpf_prog_select_runtime(prog); + prog = bpf_prog_select_runtime(prog, &err); if (err < 0) goto free_used_maps; |