Merge branch 'bpf-flow-dissector-fixes'
authorDaniel Borkmann <daniel@iogearbox.net>
Wed, 3 Apr 2019 14:49:49 +0000 (16:49 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 3 Apr 2019 14:49:49 +0000 (16:49 +0200)
commita090dbf25c566a9db5b4a994f564a7fc6031c2ad
tree4f595cbfdcdb2361364777ce030c5af577be007c
parentb2e54b09a3d29c4db883b920274ca8dca4d9f04d
parentae82899bbe92a7777ded9a562ee602dd5917bcd8
Merge branch 'bpf-flow-dissector-fixes'

Stanislav Fomichev says:

====================
This patch series fixes the existing BPF flow dissector API to
support calling BPF progs from the eth_get_headlen context (the
support itself will be added in bpf-next tree).

The summary of the changes:

  * fix VLAN handling in bpf_flow.c, we don't need to peek back and look
    at skb->vlan_present; add selftests
  * pass and use flow_keys->n_proto instead of skb->protocol
  * fix clamping of flow_keys->nhoff for packets with nhoff > 0
  * prohibit access to most of the __sk_buff fields from BPF flow
    dissector progs; only data/data_end/flow_keys are allowed (all input
    is now passed via flow_keys)
  * finally, document BPF flow dissector program environment
====================

Acked-by: Willem de Bruijn <willemb@google.com>
Acked-by: Petar Penkov <peterpenkov96@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>