tree d4ee44d28cf00a6a355f7f6eba870a3d1acaafcd
parent 62b0e9243fca257217ef72f383bd38ed5a542b5e
parent 73b9fc49b4c0116a04eda3979f64ed9b540b153c
author David S. Miller <davem@davemloft.net> 1509532066 +0900
committer David S. Miller <davem@davemloft.net> 1509532066 +0900

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

Steffen Klassert says:

====================
pull request (net): ipsec 2017-11-01

1) Fix a memleak when a packet matches a policy
   without a matching state.

2) Reset the socket cached dst_entry when inserting
   a socket policy, otherwise the policy might be
   ignored. From Jonathan Basseri.

3) Fix GSO for a IPsec, GRE tunnel combination.
   We reset the encapsulation field at the skb
   too erly, as a result GRE does not segment
   GSO packets. Fix this by resetting the the
   encapsulation field right before the
   transformation where the inner headers get
   invalid.

Please pull or let me know if there are problems.
====================

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