diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-25 13:44:29 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-25 13:44:29 -0400 |
| commit | ae08ea976862dcd058af89fcddc2ef4790b4a2bd (patch) | |
| tree | 0dc8e1e5384df1cdadfb109bbd191eafe24a594d /kernel/bpf/arraymap.c | |
| parent | arp: fixed -Wuninitialized compiler warning (diff) | |
| parent | bpf: add various verifier test cases (diff) | |
| download | linux-ae08ea976862dcd058af89fcddc2ef4790b4a2bd.tar.gz linux-ae08ea976862dcd058af89fcddc2ef4790b4a2bd.zip | |
Merge branch 'bpf-fixes'
Daniel Borkmann says:
====================
Various BPF fixes
Follow-up to fix incorrect pruning when alignment tracking is
in use and to properly clear regs after call to not leave stale
data behind, also a fix that adds bpf_clone_redirect to the
bpf_helper_changes_pkt_data helper and exposes correct map_flags
for lpm map into fdinfo. For details, please see individual
patches.
v1 -> v2:
- Reworked first patch so that env->strict_alignment is the
final indicator on whether we have to deal with strict
alignment rather than having CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
checks on various locations, so only checking env->strict_alignment
is sufficient after that. Thanks for spotting, Dave!
- Added patch 3 and 4.
- Rest as is.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/arraymap.c')
| -rw-r--r-- | kernel/bpf/arraymap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 5e00b2333c26..172dc8ee0e3b 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -86,6 +86,7 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr) array->map.key_size = attr->key_size; array->map.value_size = attr->value_size; array->map.max_entries = attr->max_entries; + array->map.map_flags = attr->map_flags; array->elem_size = elem_size; if (!percpu) |