diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2018-05-09 11:40:44 -0400 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-05-09 11:40:44 -0400 |
| commit | 4c0330208f6bfe5285bae239fdb2a7ec1ce1f78d (patch) | |
| tree | 257c871b0be4c7eafa0e6911ab596bfb0f51a104 /kernel/bpf/arraymap.c | |
| parent | 7781edaed63e9396fc913e0899cb197562e6f1a0 (diff) | |
| parent | 76aa3de7095f15af7300012cb29ea8ab93eec348 (diff) | |
Merge tag 'at24-4.17-rc5-fixes-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-current
Single bug-fix for a regression introduced during the 4.17 merge window.
Diffstat (limited to 'kernel/bpf/arraymap.c')
| -rw-r--r-- | kernel/bpf/arraymap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 14750e7c5ee4..027107f4be53 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c | |||
| @@ -476,7 +476,7 @@ static u32 prog_fd_array_sys_lookup_elem(void *ptr) | |||
| 476 | } | 476 | } |
| 477 | 477 | ||
| 478 | /* decrement refcnt of all bpf_progs that are stored in this map */ | 478 | /* decrement refcnt of all bpf_progs that are stored in this map */ |
| 479 | void bpf_fd_array_map_clear(struct bpf_map *map) | 479 | static void bpf_fd_array_map_clear(struct bpf_map *map) |
| 480 | { | 480 | { |
| 481 | struct bpf_array *array = container_of(map, struct bpf_array, map); | 481 | struct bpf_array *array = container_of(map, struct bpf_array, map); |
| 482 | int i; | 482 | int i; |
| @@ -495,6 +495,7 @@ const struct bpf_map_ops prog_array_map_ops = { | |||
| 495 | .map_fd_get_ptr = prog_fd_array_get_ptr, | 495 | .map_fd_get_ptr = prog_fd_array_get_ptr, |
| 496 | .map_fd_put_ptr = prog_fd_array_put_ptr, | 496 | .map_fd_put_ptr = prog_fd_array_put_ptr, |
| 497 | .map_fd_sys_lookup_elem = prog_fd_array_sys_lookup_elem, | 497 | .map_fd_sys_lookup_elem = prog_fd_array_sys_lookup_elem, |
| 498 | .map_release_uref = bpf_fd_array_map_clear, | ||
| 498 | }; | 499 | }; |
| 499 | 500 | ||
| 500 | static struct bpf_event_entry *bpf_event_entry_gen(struct file *perf_file, | 501 | static struct bpf_event_entry *bpf_event_entry_gen(struct file *perf_file, |
