| Message ID | 20180329071120.27353-1-steffen.klassert@secunet.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | pull request (net): ipsec 2018-03-29 | expand |
From: Steffen Klassert <steffen.klassert@secunet.com> Date: Thu, 29 Mar 2018 09:11:12 +0200 > 1) Fix a rcu_read_lock/rcu_read_unlock imbalance > in the error path of xfrm_local_error(). > From Taehee Yoo. > > 2) Some VTI MTU fixes. From Stefano Brivio. > > 3) Fix a too early overwritten skb control buffer > on xfrm transport mode. > > Please not that this pull request has a merge conflict > in net/ipv4/ip_tunnel.c. ... Pulled, and thanks for the conflict info.
1) Fix a rcu_read_lock/rcu_read_unlock imbalance in the error path of xfrm_local_error(). From Taehee Yoo. 2) Some VTI MTU fixes. From Stefano Brivio. 3) Fix a too early overwritten skb control buffer on xfrm transport mode. Please not that this pull request has a merge conflict in net/ipv4/ip_tunnel.c. The conflict is between commit f6cc9c054e77 ("ip_tunnel: Emit events for post-register MTU changes") from the net tree and commit 24fc79798b8d ("ip_tunnel: Clamp MTU to bounds on new link") from the ipsec tree. It can be solved as it is currently done in linux-next. Please pull or let me know if there are problems. Thanks! The following changes since commit 51d4740f88affd85d49c04e3c9cd129c0e33bcb9: net sched actions: return explicit error when tunnel_key mode is not specified (2018-03-15 14:43:41 -0400) 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 9a3fb9fb84cc30577c1b012a6a3efda944684291: xfrm: Fix transport mode skb control buffer usage. (2018-03-23 07:56:04 +0100) ---------------------------------------------------------------- Stefano Brivio (6): vti4: Don't count header length twice on tunnel setup ip_tunnel: Clamp MTU to bounds on new link vti4: Don't override MTU passed on link creation via IFLA_MTU vti6: Properly adjust vti6 MTU from MTU of lower device vti6: Keep set MTU on link creation or change, validate it vti6: Fix dev->max_mtu setting Steffen Klassert (1): xfrm: Fix transport mode skb control buffer usage. Taehee Yoo (1): xfrm: fix rcu_read_unlock usage in xfrm_local_error net/ipv4/ip_tunnel.c | 8 +++++++- net/ipv4/ip_vti.c | 2 -- net/ipv6/ip6_vti.c | 36 +++++++++++++++++++++++------------- net/xfrm/xfrm_input.c | 6 ++++++ net/xfrm/xfrm_output.c | 5 +++-- 5 files changed, 39 insertions(+), 18 deletions(-)