Daniel Borkmann 33ba43ed0a bpf: fix map value attribute for hash of maps ... Currently, iproute2's BPF ELF loader works fine with array of maps when retrieving the fd from a pinned node and doing a selfcheck against the provided map attributes from the object file, but we fail to do the same for hash of maps and thus refuse to get the map from pinned node. Reason is that when allocating hash of maps, fd_htab_map_alloc() will set the value size to sizeof(void *), and any user space map creation requests are forced to set 4 bytes as value size. Thus, selfcheck will complain about exposed 8 bytes on 64 bit archs vs. 4 bytes from object file as value size. Contract is that fdinfo or BPF_MAP_GET_FD_BY_ID returns the value size used to create the map. Fix it by handling it the same way as we do for array of maps, which means that we leave value size at 4 bytes and in the allocation phase round up value size to 8 bytes. alloc_htab_elem() needs an adjustment in order to copy rounded up 8 bytes due to bpf_fd_htab_map_update_elem() calling into htab_map_update_elem() with the pointer of the map pointer as value. Unlike array of maps where we just xchg(), we're using the generic htab_map_update_elem() callback also used from helper calls, which published the key/value already on return, so we need to ensure to memcpy() the right size. Fixes: bcc6b1b7eb ("bpf: Add hash of maps support") Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Alexei Starovoitov <ast@kernel.org> Acked-by: Martin KaFai Lau <kafai@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-22 16:32:02 -07:00
..
arraymap.c	bpf: Add syscall lookup support for fd array and htab	2017-06-29 13:13:25 -04:00
bpf_lru_list.c	bpf: lru: Lower the PERCPU_NR_SCANS from 16 to 4	2017-04-17 13:55:52 -04:00
bpf_lru_list.h	bpf: Add percpu LRU list	2016-11-15 11:50:20 -05:00
cgroup.c	bpf: BPF support for sock_ops	2017-07-01 16:15:13 -07:00
core.c	bpf: Fix out-of-bound access on interpreters[]	2017-06-29 15:37:04 -04:00
hashtab.c	bpf: fix map value attribute for hash of maps	2017-08-22 16:32:02 -07:00
helpers.c	bpf: rename ARG_PTR_TO_STACK	2017-01-09 16:56:27 -05:00
inode.c	bpf: Implement show_options	2017-07-06 03:31:46 -04:00
lpm_trie.c	bpf: fix wrong exposure of map_flags into fdinfo for lpm	2017-05-25 13:44:28 -04:00
Makefile	bpf: Add array of maps support	2017-03-22 15:45:45 -07:00
map_in_map.c	bpf: Add syscall lookup support for fd array and htab	2017-06-29 13:13:25 -04:00
map_in_map.h	bpf: Add syscall lookup support for fd array and htab	2017-06-29 13:13:25 -04:00
percpu_freelist.c	bpf: introduce percpu_freelist	2016-03-08 15:28:31 -05:00
percpu_freelist.h	bpf: introduce percpu_freelist	2016-03-08 15:28:31 -05:00
stackmap.c	bpf: fix wrong exposure of map_flags into fdinfo for lpm	2017-05-25 13:44:28 -04:00
syscall.c	bpf: fix bpf_prog_get_info_by_fd to dump correct xlated_prog_len	2017-07-29 23:29:41 -07:00
verifier.c	bpf/verifier: fix min/max handling in BPF_SUB	2017-07-24 14:02:55 -07:00