diff options
| author | David S. Miller <davem@davemloft.net> | 2016-07-01 16:00:52 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-01 16:00:52 -0400 |
| commit | 6bd3847bdc3ba97e642cb9af9d16b0f056da31a2 (patch) | |
| tree | 31d2c41c7af6991401c3aff11e7ade3317b4a614 /kernel/bpf/arraymap.c | |
| parent | 466fc793da3aea0caf365e7fadc67473e4cdaa80 (diff) | |
| parent | 113214be7f6c98dd6d0435e4765aea8dea91662c (diff) | |
| download | linux-6bd3847bdc3ba97e642cb9af9d16b0f056da31a2.tar.gz linux-6bd3847bdc3ba97e642cb9af9d16b0f056da31a2.tar.bz2 linux-6bd3847bdc3ba97e642cb9af9d16b0f056da31a2.zip | |
Merge branch 'bpf-robustify'
Daniel Borkmann says:
====================
Further robustify putting BPF progs
This series addresses a potential issue reported to us by Jann Horn
with regards to putting progs. First patch moves progs generally under
RCU destruction and second patch refactors getting of progs to simplify
code a bit. For details, please see individual patches. Note, we think
that addressing this one in net-next should be sufficient.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/arraymap.c')
| -rw-r--r-- | kernel/bpf/arraymap.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 5af30732697b..4ec57a649b1f 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -390,9 +390,7 @@ static void *prog_fd_array_get_ptr(struct bpf_map *map, static void prog_fd_array_put_ptr(void *ptr) { - struct bpf_prog *prog = ptr; - - bpf_prog_put_rcu(prog); + bpf_prog_put(ptr); } /* decrement refcnt of all bpf_progs that are stored in this map */ |