Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Thu, 2 Nov 2017 07:52:41 +0000 (16:52 +0900)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Nov 2017 07:52:41 +0000 (16:52 +0900)
commit74784da82ff74379d0583a3ffe42835888705ac7
tree631b121a1e03ade9344ae61d7bbc9ea63f6ae123
parent18129a24983906eaf2a2d448ce4b83e27091ebe2
parent7400bb4b5800831581a82f71700af6a5e815c3c8
Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains two one-liner fixes for your net tree,
they are:

1) Disable fast hash operations for 2-bytes length keys which is leading
   to incorrect lookups in nf_tables, from Anatole Denis.

2) Reload pointer ipv4 header after ip_route_me_harder() given this may
   result in use-after-free due to skbuff header reallocation, patch
   from Tejaswi Tanikella.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>