| Message ID | 20190221082204.10134-1-steffen.klassert@secunet.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | pull request (net): ipsec 2019-02-21 | expand |
From: Steffen Klassert <steffen.klassert@secunet.com> Date: Thu, 21 Feb 2019 09:22:00 +0100 > 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. Pulled, thanks.
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. Thanks! The following changes since commit 6fb6e6371f8c463020a41cc0ed1915e140219c3d: net: dsa: mv88e6xxx: Fix serdes irq setup going recursive (2019-01-27 23:19:19 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master for you to fetch changes up to 660899ddf06ae8bb5bbbd0a19418b739375430c5: xfrm: Fix inbound traffic via XFRM interfaces across network namespaces (2019-02-18 10:58:54 +0100) ---------------------------------------------------------------- Cong Wang (1): xfrm: destroy xfrm_state synchronously on net exit path Martin Willi (1): esp: Skip TX bytes accounting when sending from a request socket Sean Tranchetti (1): af_key: unconditionally clone on broadcast Tobias Brunner (1): xfrm: Fix inbound traffic via XFRM interfaces across network namespaces include/net/xfrm.h | 12 +++++++++--- net/ipv4/esp4.c | 2 +- net/ipv6/esp6.c | 2 +- net/ipv6/xfrm6_tunnel.c | 2 +- net/key/af_key.c | 42 ++++++++++++++++-------------------------- net/xfrm/xfrm_interface.c | 4 ++-- net/xfrm/xfrm_policy.c | 4 +++- net/xfrm/xfrm_state.c | 30 +++++++++++++++++++----------- net/xfrm/xfrm_user.c | 2 +- 9 files changed, 53 insertions(+), 47 deletions(-)