diff options
author | David S. Miller <davem@davemloft.net> | 2019-02-21 16:08:52 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-02-21 16:08:52 -0800 |
commit | b35560e485cb3a10bfe631732bcb75fe1a568da7 (patch) | |
tree | e46d5e1cf9f056f894a83076ea2fdac1d803f97b /net/phonet | |
parent | 31088cb5ca6e4b8fda36f8686d15f037bd039f2a (diff) | |
parent | 660899ddf06ae8bb5bbbd0a19418b739375430c5 (diff) | |
download | linux-b35560e485cb3a10bfe631732bcb75fe1a568da7.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2019-02-21
1) Don't do TX bytes accounting for the esp trailer when sending
from a request socket as this will result in an out of bounds
memory write. From Martin Willi.
2) Destroy xfrm_state synchronously on net exit path to
avoid nested gc flush callbacks that may trigger a
warning in xfrm6_tunnel_net_exit(). From Cong Wang.
3) Do an unconditionally clone in pfkey_broadcast_one()
to avoid a race when freeing the skb.
From Sean Tranchetti.
4) Fix inbound traffic via XFRM interfaces across network
namespaces. We did the lookup for interfaces and policies
in the wrong namespace. From Tobias Brunner.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet')
0 files changed, 0 insertions, 0 deletions