mbox series

pull request (net): ipsec 2018-01-24

Message ID 20180124094713.27913-1-steffen.klassert@secunet.com
State Accepted, archived
Delegated to: David Miller
Headers show
Series pull request (net): ipsec 2018-01-24 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master

Message

Steffen Klassert Jan. 24, 2018, 9:47 a.m. UTC
1) Only offloads SAs after they are fully initialized.
   Otherwise a NIC may receive packets on a SA we can
   not yet handle in the stack.
   From Yossi Kuperman.

2) Fix negative refcount in case of a failing offload.
   From Aviad Yehezkel.

3) Fix inner IP ptoro version when decapsulating
   from interaddress family tunnels.
   From Yossi Kuperman.

4) Use true or false for boolean variables instead of an
   integer value in xfrm_get_type_offload.
   From Gustavo A. R. Silva.

Please pull or let me know if there are problems.

Thanks!

The following changes since commit ad9294dbc227cbc8e173b3b963e7dd9af5314f77:

  bpf: fix cls_bpf on filter replace (2018-01-17 17:14:06 -0500)

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 545d8ae7affff7fb4f8bfd327c7c7790056535c4:

  xfrm: fix boolean assignment in xfrm_get_type_offload (2018-01-23 10:56:36 +0100)

----------------------------------------------------------------
Aviad Yehezkel (1):
      xfrm: fix error flow in case of add state fails

Gustavo A. R. Silva (1):
      xfrm: fix boolean assignment in xfrm_get_type_offload

Yossi Kuperman (2):
      xfrm: Add SA to hardware at the end of xfrm_state_construct()
      xfrm: Fix eth_hdr(skb)->h_proto to reflect inner IP version

 net/ipv4/xfrm4_mode_tunnel.c |  1 +
 net/ipv6/xfrm6_mode_tunnel.c |  1 +
 net/xfrm/xfrm_device.c       |  1 +
 net/xfrm/xfrm_state.c        | 12 ++++++++----
 net/xfrm/xfrm_user.c         | 18 +++++++++++-------
 5 files changed, 22 insertions(+), 11 deletions(-)

Comments

David Miller Jan. 24, 2018, 3:32 p.m. UTC | #1
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Wed, 24 Jan 2018 10:47:09 +0100

> 1) Only offloads SAs after they are fully initialized.
>    Otherwise a NIC may receive packets on a SA we can
>    not yet handle in the stack.
>    From Yossi Kuperman.
> 
> 2) Fix negative refcount in case of a failing offload.
>    From Aviad Yehezkel.
> 
> 3) Fix inner IP ptoro version when decapsulating
>    from interaddress family tunnels.
>    From Yossi Kuperman.
> 
> 4) Use true or false for boolean variables instead of an
>    integer value in xfrm_get_type_offload.
>    From Gustavo A. R. Silva.
> 
> Please pull or let me know if there are problems.

Pulled, thanks.