Merge branch 'bpf-fixes'

Browse source

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>

...

This commit is contained in:

David S. Miller 2017-05-25 13:44:29 -04:00

parent 5990baaa6d 614d0d77b4

commit ae08ea9768

8 changed files with 285 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

include/linux/filter.h

View file

1

kernel/bpf/arraymap.c

View file

1

kernel/bpf/lpm_trie.c

View file

1

kernel/bpf/stackmap.c

View file

56

kernel/bpf/verifier.c

View file

1

net/core/filter.c

View file

10

tools/include/linux/filter.h

View file

239

tools/testing/selftests/bpf/test_verifier.c

View file