diff options
| author | David S. Miller <davem@davemloft.net> | 2019-01-21 14:41:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-21 14:41:32 -0800 |
| commit | fa7f3a8d56b38a3ed1880a3780afba82387da277 (patch) | |
| tree | a4628ee966f21963e5e97a6d1a227a3e8138183e /kernel/bpf/map_in_map.c | |
| parent | 28f9d1a3d4fecdb2352d3984ddeec88146385885 (diff) | |
| parent | 49a57857aeea06ca831043acbb0fa5e0f50602fd (diff) | |
| download | kernel_replicant_linux-fa7f3a8d56b38a3ed1880a3780afba82387da277.tar.gz kernel_replicant_linux-fa7f3a8d56b38a3ed1880a3780afba82387da277.tar.bz2 kernel_replicant_linux-fa7f3a8d56b38a3ed1880a3780afba82387da277.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Completely minor snmp doc conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/map_in_map.c')
| -rw-r--r-- | kernel/bpf/map_in_map.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/kernel/bpf/map_in_map.c b/kernel/bpf/map_in_map.c index 99d243e1ad6e..52378d3e34b3 100644 --- a/kernel/bpf/map_in_map.c +++ b/kernel/bpf/map_in_map.c @@ -12,6 +12,7 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd) { struct bpf_map *inner_map, *inner_map_meta; + u32 inner_map_meta_size; struct fd f; f = fdget(inner_map_ufd); @@ -36,7 +37,12 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd) return ERR_PTR(-EINVAL); } - inner_map_meta = kzalloc(sizeof(*inner_map_meta), GFP_USER); + inner_map_meta_size = sizeof(*inner_map_meta); + /* In some cases verifier needs to access beyond just base map. */ + if (inner_map->ops == &array_map_ops) + inner_map_meta_size = sizeof(struct bpf_array); + + inner_map_meta = kzalloc(inner_map_meta_size, GFP_USER); if (!inner_map_meta) { fdput(f); return ERR_PTR(-ENOMEM); @@ -46,9 +52,16 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd) inner_map_meta->key_size = inner_map->key_size; inner_map_meta->value_size = inner_map->value_size; inner_map_meta->map_flags = inner_map->map_flags; - inner_map_meta->ops = inner_map->ops; inner_map_meta->max_entries = inner_map->max_entries; + /* Misc members not needed in bpf_map_meta_equal() check. */ + inner_map_meta->ops = inner_map->ops; + if (inner_map->ops == &array_map_ops) { + inner_map_meta->unpriv_array = inner_map->unpriv_array; + container_of(inner_map_meta, struct bpf_array, map)->index_mask = + container_of(inner_map, struct bpf_array, map)->index_mask; + } + fdput(f); return inner_map_meta; } |