From: David S. Miller <davem@davemloft.net>
Date: Thu, 25 May 2017 17:44:29 +0000 (-0400)
Subject: Merge branch 'bpf-fixes'
X-Git-Tag: MMI-PSA29.97-13-9~5530^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ae08ea976862dcd058af89fcddc2ef4790b4a2bd;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

ae08ea976862dcd058af89fcddc2ef4790b4a2bd