pull request (net-next): ipsec-next 2020-05-29
Subsystems (5)
Steffen Klassert
maintainer1) Add IPv6 encapsulation support for ESP over UDP and TCP. From Sabrina Dubroca.
2) Remove unneeded reference when initializing xfrm interfaces. From Nicolas Dichtel.
3) Remove some indirect calls from the state_afinfo. From Florian Westphal.
Please note that this pull request has two merge conflicts
between commit:
0c922a4850eb ("xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish")
from Linus' tree and commit:
2ab6096db2f1 ("xfrm: remove output_finish indirection from xfrm_state_afinfo")
from the ipsec-next tree.
and between commit:
3986912f6a9a ("ipv6: move SIOCADDRT and SIOCDELRT handling into ->compat_ioctl")
from the net-next tree and commit:
0146dca70b87 ("xfrm: add support for UDPv6 encapsulation of ESP")
from the ipsec-next tree.
Both conflicts can be resolved as done in linux-next.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit b6246f4d8d0778fd045b84dbd7fc5aadd8f3136e:
net: ipv4: remove redundant assignment to variable rc (2020-04-20 16:26:58 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master
for you to fetch changes up to 7d4343d501f9b5ddbc92f278adba339d16d010e1:
xfrm: fix unused variable warning if CONFIG_NETFILTER=n (2020-05-11 15:12:27 +0200)
----------------------------------------------------------------
Florian Westphal (8):
xfrm: avoid extract_output indirection for ipv4
xfrm: state: remove extract_input indirection from xfrm_state_afinfo
xfrm: move xfrm4_extract_header to common helper
xfrm: expose local_rxpmtu via ipv6_stubs
xfrm: place xfrm6_local_dontfrag in xfrm.h
xfrm: remove extract_output indirection from xfrm_state_afinfo
xfrm: remove output_finish indirection from xfrm_state_afinfo
xfrm: fix unused variable warning if CONFIG_NETFILTER=n
Nicolas Dichtel (1):
xfrm interface: don't take extra reference to netdev
Sabrina Dubroca (2):
xfrm: add support for UDPv6 encapsulation of ESP
xfrm: add IPv6 support for espintcp
include/net/ipv6_stubs.h | 6 + include/net/xfrm.h | 31 +++- net/ipv4/Kconfig | 1 + net/ipv4/udp.c | 10 +- net/ipv4/xfrm4_input.c | 5 - net/ipv4/xfrm4_output.c | 65 +------- net/ipv4/xfrm4_state.c | 24 --- net/ipv6/Kconfig | 12 ++ net/ipv6/af_inet6.c | 6 + net/ipv6/ah6.c | 1 + net/ipv6/esp6.c | 414 +++++++++++++++++++++++++++++++++++++++++++--- net/ipv6/esp6_offload.c | 7 +- net/ipv6/ip6_vti.c | 18 +- net/ipv6/ipcomp6.c | 1 + net/ipv6/xfrm6_input.c | 111 +++++++++++-- net/ipv6/xfrm6_output.c | 98 +---------- net/ipv6/xfrm6_protocol.c | 48 ++++++ net/ipv6/xfrm6_state.c | 26 --- net/xfrm/Kconfig | 3 + net/xfrm/Makefile | 2 +- net/xfrm/espintcp.c | 56 +++++-- net/xfrm/xfrm_inout.h | 32 ++++ net/xfrm/xfrm_input.c | 21 +-- net/xfrm/xfrm_interface.c | 5 +- net/xfrm/xfrm_output.c | 129 ++++++++++++++- 25 files changed, 836 insertions(+), 296 deletions(-)
Steffen Klassert
maintainerPATCH 1/11 xfrm interface: don't take extra reference to netdev
From: Nicolas Dichtel <[email protected]>
I don't see any reason to do this. Maybe needed before commit 56c5ee1a5823 ("xfrm interface: fix memory leak on creation").
--- net/xfrm/xfrm_interface.c | 2 -- 1 file changed, 2 deletions(-)
net/xfrm/xfrm_interface.c +0 -2
@@ -145,7 +145,6 @@ static int xfrmi_create(struct net_device *dev)if (err <0 ) goto out; -dev_hold (dev);xfrmi_link (xfrmn, xi);return 0 ;
@@ -175,7 +174,6 @@ static void xfrmi_dev_uninit(struct net_device *dev)struct xfrmi_net *xfrmn =net_generic (xi->net, xfrmi_net_id);xfrmi_unlink (xfrmn, xi); -dev_put (dev); }static void xfrmi_scrub_packet (struct sk_buff *skb,bool xnet)
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 2/11 xfrm: add support for UDPv6 encapsulation of ESP
In reply to Steffen KlassertFrom: Sabrina Dubroca <[email protected]>
This patch adds support for encapsulation of ESP over UDPv6. The code is very similar to the IPv4 encapsulation implementation, and allows to easily add espintcp on IPv6 as a follow-up.
--- include/net/ipv6_stubs.h | 3 + include/net/xfrm.h | 5 + net/ipv4/udp.c | 10 +- net/ipv6/af_inet6.c | 4 + net/ipv6/ah6.c | 1 + net/ipv6/esp6.c | 226 +++++++++++++++++++++++++++++++++----- net/ipv6/esp6_offload.c | 7 +- net/ipv6/ip6_vti.c | 18 ++- net/ipv6/ipcomp6.c | 1 + net/ipv6/xfrm6_input.c | 106 +++++++++++++++++- net/ipv6/xfrm6_protocol.c | 48 ++++++++ net/xfrm/xfrm_interface.c | 3 + 12 files changed, 395 insertions(+), 37 deletions(-)
include/net/ipv6_stubs.h +3 -0
@@ -56,6 +56,9 @@ struct ipv6_stub {void (*ndisc_send_na)(struct net_device *dev,const struct in6_addr *daddr,const struct in6_addr *solicited_addr,bool router,bool solicited,bool override,bool inc_opt); +#if IS_ENABLED (CONFIG_XFRM ) +int (*xfrm6_udp_encap_rcv)(struct sock *sk,struct sk_buff *skb); +#endif struct neigh_table *nd_tbl; };extern const struct ipv6_stub *ipv6_stub__read_mostly ;
include/net/xfrm.h +5 -0
@@ -1406,6 +1406,8 @@ struct xfrm4_protocol {struct xfrm6_protocol {int (*handler)(struct sk_buff *skb); +int (*input_handler)(struct sk_buff *skb,int nexthdr,__be32 spi, +int encap_type);int (*cb_handler)(struct sk_buff *skb,int err);int (*err_handler)(struct sk_buff *skb,struct inet6_skb_parm *opt,u8 type,u8 code,int offset,__be32 info);
@@ -1590,6 +1592,8 @@ int xfrm6_extract_header(struct sk_buff *skb);int xfrm6_extract_input (struct xfrm_state *x,struct sk_buff *skb);int xfrm6_rcv_spi (struct sk_buff *skb,int nexthdr,__be32 spi,struct ip6_tnl *t); +int xfrm6_rcv_encap (struct sk_buff *skb,int nexthdr,__be32 spi, +int encap_type);int xfrm6_transport_finish (struct sk_buff *skb,int async);int xfrm6_rcv_tnl (struct sk_buff *skb,struct ip6_tnl *t);int xfrm6_rcv (struct sk_buff *skb);
@@ -1610,6 +1614,7 @@ int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,#ifdef CONFIG_XFRM int xfrm4_udp_encap_rcv (struct sock *sk,struct sk_buff *skb); +int xfrm6_udp_encap_rcv (struct sock *sk,struct sk_buff *skb);int xfrm_user_policy (struct sock *sk,int optname,u8 __user *optval,int optlen);#else
net/ipv4/udp.c +9 -1
@@ -112,6 +112,9 @@#include <net/sock_reuseport.h> #include <net/addrconf.h> #include <net/udp_tunnel.h> +#if IS_ENABLED (CONFIG_IPV6 ) +#include <net/ipv6_stubs.h> +#endif struct udp_table udp_table__read_mostly ;EXPORT_SYMBOL (udp_table);
@@ -2563,7 +2566,12 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,#ifdef CONFIG_XFRM case UDP_ENCAP_ESPINUDP :case UDP_ENCAP_ESPINUDP_NON_IKE : - up->encap_rcv = xfrm4_udp_encap_rcv; +#if IS_ENABLED (CONFIG_IPV6 ) +if (sk->sk_family ==AF_INET6 ) + up->encap_rcv = ipv6_stub->xfrm6_udp_encap_rcv; + else +#endif + up->encap_rcv = xfrm4_udp_encap_rcv;#endif fallthrough;case UDP_ENCAP_L2TPINUDP :
net/ipv6/af_inet6.c +4 -0
@@ -60,6 +60,7 @@#include <net/calipso.h> #include <net/seg6.h> #include <net/rpl.h> +#include <net/xfrm.h> #include <linux/uaccess.h> #include <linux/mroute6.h>
@@ -961,6 +962,9 @@ static const struct ipv6_stub ipv6_stub_impl = { .ip6_del_rt = ip6_del_rt, .udpv6_encap_enable = udpv6_encap_enable, .ndisc_send_na = ndisc_send_na, +#if IS_ENABLED(CONFIG_XFRM) + .xfrm6_udp_encap_rcv = xfrm6_udp_encap_rcv, +#endif .nd_tbl = &nd_tbl, };
net/ipv6/ah6.c +1 -0
@@ -767,6 +767,7 @@ static const struct xfrm_type ah6_type = {static struct xfrm6_protocol ah6_protocol = { .handler = xfrm6_rcv, + .input_handler = xfrm_input, .cb_handler = ah6_rcv_cb, .err_handler = ah6_err, .priority =0 ,
net/ipv6/esp6.c +201 -25
403 lines not on this page · raw message
net/ipv6/esp6_offload.c +3 -4
@@ -271,7 +271,6 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_featuresint alen;int blksize;struct xfrm_offload *xo; -struct ip_esp_hdr *esph;struct crypto_aead *aead;struct esp_info esp;bool hw_offload = true;
@@ -312,13 +311,13 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features seq = xo->seq.low; - esph =ip_esp_hdr (skb); - esph->spi = x->id.spi; + esp.esph =ip_esp_hdr (skb); + esp.esph->spi = x->id.spi;skb_push (skb, -skb_network_offset (skb));if (xo->flags &XFRM_GSO_SEGMENT ) { - esph->seq_no =htonl (seq); + esp.esph->seq_no =htonl (seq);if (!skb_is_gso (skb)) xo->seq.low++;
net/ipv6/ip6_vti.c +16 -2
@@ -296,7 +296,8 @@ static void vti6_dev_uninit(struct net_device *dev)dev_put (dev); } -static int vti6_rcv (struct sk_buff *skb) +static int vti6_input_proto (struct sk_buff *skb,int nexthdr,__be32 spi, +int encap_type) {struct ip6_tnl *t;const struct ipv6hdr *ipv6h =ipv6_hdr (skb);
@@ -323,7 +324,10 @@ static int vti6_rcv(struct sk_buff *skb)rcu_read_unlock (); -return xfrm6_rcv_tnl (skb, t); +XFRM_TUNNEL_SKB_CB (skb)->tunnel.ip6 = t; +XFRM_SPI_SKB_CB (skb)->family =AF_INET6 ; +XFRM_SPI_SKB_CB (skb)->daddroff = offsetof(struct ipv6hdr , daddr); +return xfrm_input (skb, nexthdr, spi, encap_type); }rcu_read_unlock ();return -EINVAL ;
@@ -332,6 +336,13 @@ static int vti6_rcv(struct sk_buff *skb)return 0 ; } +static int vti6_rcv (struct sk_buff *skb) +{ +int nexthdr =skb_network_header (skb)[IP6CB (skb)->nhoff]; + +return vti6_input_proto (skb, nexthdr,0 ,0 ); +} +static int vti6_rcv_cb (struct sk_buff *skb,int err) {unsigned short family;
@@ -1185,6 +1196,7 @@ static struct pernet_operations vti6_net_ops = {static struct xfrm6_protocol vti_esp6_protocol__read_mostly = { .handler = vti6_rcv, + .input_handler = vti6_input_proto, .cb_handler = vti6_rcv_cb, .err_handler = vti6_err, .priority =100 ,
@@ -1192,6 +1204,7 @@ static struct xfrm6_protocol vti_esp6_protocol __read_mostly = {static struct xfrm6_protocol vti_ah6_protocol__read_mostly = { .handler = vti6_rcv, + .input_handler = vti6_input_proto, .cb_handler = vti6_rcv_cb, .err_handler = vti6_err, .priority =100 ,
@@ -1199,6 +1212,7 @@ static struct xfrm6_protocol vti_ah6_protocol __read_mostly = {static struct xfrm6_protocol vti_ipcomp6_protocol__read_mostly = { .handler = vti6_rcv, + .input_handler = vti6_input_proto, .cb_handler = vti6_rcv_cb, .err_handler = vti6_err, .priority =100 ,
net/ipv6/ipcomp6.c +1 -0
@@ -183,6 +183,7 @@ static const struct xfrm_type ipcomp6_type = {static struct xfrm6_protocol ipcomp6_protocol = { .handler = xfrm6_rcv, + .input_handler = xfrm_input, .cb_handler = ipcomp6_rcv_cb, .err_handler = ipcomp6_err, .priority =0 ,
net/ipv6/xfrm6_input.c +101 -5
123 lines not on this page · raw message
net/ipv6/xfrm6_protocol.c +48 -0
60 lines not on this page · raw message
net/xfrm/xfrm_interface.c +3 -0
@@ -755,6 +755,7 @@ static struct pernet_operations xfrmi_net_ops = {static struct xfrm6_protocol xfrmi_esp6_protocol__read_mostly = { .handler = xfrm6_rcv, + .input_handler = xfrm_input, .cb_handler = xfrmi_rcv_cb, .err_handler = xfrmi6_err, .priority =10 ,
@@ -762,6 +763,7 @@ static struct xfrm6_protocol xfrmi_esp6_protocol __read_mostly = {static struct xfrm6_protocol xfrmi_ah6_protocol__read_mostly = { .handler = xfrm6_rcv, + .input_handler = xfrm_input, .cb_handler = xfrmi_rcv_cb, .err_handler = xfrmi6_err, .priority =10 ,
@@ -769,6 +771,7 @@ static struct xfrm6_protocol xfrmi_ah6_protocol __read_mostly = {static struct xfrm6_protocol xfrmi_ipcomp6_protocol__read_mostly = { .handler = xfrm6_rcv, + .input_handler = xfrm_input, .cb_handler = xfrmi_rcv_cb, .err_handler = xfrmi6_err, .priority =10 ,
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 3/11 xfrm: add IPv6 support for espintcp
In reply to Steffen KlassertFrom: Sabrina Dubroca <[email protected]>
This extends espintcp to support IPv6, building on the existing code and the new UDPv6 encapsulation support. Most of the code is either reused directly (stream parser, ULP) or very similar to the IPv4 variant (net/ipv6/esp6.c changes).
The separation of config options for IPv4 and IPv6 espintcp requires a bit of Kconfig gymnastics to enable the core code.
--- include/net/ipv6_stubs.h | 2 + net/ipv4/Kconfig | 1 + net/ipv6/Kconfig | 12 +++ net/ipv6/af_inet6.c | 1 + net/ipv6/esp6.c | 188 ++++++++++++++++++++++++++++++++++++++- net/xfrm/Kconfig | 3 + net/xfrm/Makefile | 2 +- net/xfrm/espintcp.c | 56 +++++++++--- 8 files changed, 252 insertions(+), 13 deletions(-)
include/net/ipv6_stubs.h +2 -0
@@ -58,6 +58,8 @@ struct ipv6_stub { bool router, bool solicited, bool override, bool inc_opt);#if IS_ENABLED (CONFIG_XFRM )int (*xfrm6_udp_encap_rcv)(struct sock *sk,struct sk_buff *skb); +int (*xfrm6_rcv_encap)(struct sk_buff *skb,int nexthdr,__be32 spi, +int encap_type);#endif struct neigh_table *nd_tbl; };
net/ipv4/Kconfig +1 -0
@@ -384,6 +384,7 @@ config INET_ESPINTCP depends on XFRM && INET_ESP select STREAM_PARSER select NET_SOCK_MSG + select XFRM_ESPINTCP help Support for RFC 8229 encapsulation of ESP and IKE over TCP/IPv4 sockets.
net/ipv6/Kconfig +12 -0
@@ -88,6 +88,18 @@ config INET6_ESP_OFFLOAD If unsure, say N. +config INET6_ESPINTCP + bool "IPv6: ESP in TCP encapsulation (RFC 8229)" + depends on XFRM && INET6_ESP + select STREAM_PARSER + select NET_SOCK_MSG + select XFRM_ESPINTCP + help + Support for RFC 8229 encapsulation of ESP and IKE over + TCP/IPv6 sockets. + + If unsure, say N. + config INET6_IPCOMP tristate "IPv6: IPComp transformation" select INET6_XFRM_TUNNEL
net/ipv6/af_inet6.c +1 -0
@@ -964,6 +964,7 @@ static const struct ipv6_stub ipv6_stub_impl = { .ndisc_send_na = ndisc_send_na, #if IS_ENABLED(CONFIG_XFRM) .xfrm6_udp_encap_rcv = xfrm6_udp_encap_rcv, + .xfrm6_rcv_encap = xfrm6_rcv_encap, #endif .nd_tbl = &nd_tbl, };
net/ipv6/esp6.c +187 -1
239 lines not on this page · raw message
net/xfrm/Kconfig +3 -0
@@ -99,4 +99,7 @@ config NET_KEY_MIGRATE If unsure, say N. +config XFRM_ESPINTCP + bool + endif # INET
net/xfrm/Makefile +1 -1
@@ -11,4 +11,4 @@ obj-$(CONFIG_XFRM_ALGO) += xfrm_algo.o obj-$(CONFIG_XFRM_USER) += xfrm_user.o obj-$(CONFIG_XFRM_IPCOMP) += xfrm_ipcomp.o obj-$(CONFIG_XFRM_INTERFACE) += xfrm_interface.o -obj-$(CONFIG_INET_ESPINTCP) += espintcp.o +obj-$(CONFIG_XFRM_ESPINTCP) += espintcp.o
net/xfrm/espintcp.c +45 -11
101 lines not on this page · raw message
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 4/11 xfrm: avoid extract_output indirection for ipv4
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
We can use a direct call for ipv4, so move the needed functions to net/xfrm/xfrm_output.c and call them directly.
For ipv6 the indirection can be avoided as well but it will need a bit more work -- to ease review it will be done in another patch.
--- include/net/xfrm.h | 1 - net/ipv4/xfrm4_output.c | 40 ----------------------------------- net/ipv4/xfrm4_state.c | 1 - net/xfrm/xfrm_output.c | 46 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 42 deletions(-)
include/net/xfrm.h +0 -1
@@ -1580,7 +1580,6 @@ static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi)return xfrm_input (skb, nexthdr, spi,0 ); } -int xfrm4_extract_output (struct xfrm_state *x,struct sk_buff *skb);int xfrm4_output (struct net *net,struct sock *sk,struct sk_buff *skb);int xfrm4_output_finish (struct sock *sk,struct sk_buff *skb);int xfrm4_protocol_register (struct xfrm4_protocol *handler,unsigned char protocol);
net/ipv4/xfrm4_output.c +0 -40
@@ -14,46 +14,6 @@#include <net/xfrm.h> #include <net/icmp.h> -static int xfrm4_tunnel_check_size (struct sk_buff *skb) -{ -int mtu, ret =0 ; - -if (IPCB (skb)->flags &IPSKB_XFRM_TUNNEL_SIZE ) - goto out; - -if (!(ip_hdr (skb)->frag_off &htons (IP_DF )) || skb->ignore_df) - goto out; - - mtu =dst_mtu (skb_dst (skb)); -if ((!skb_is_gso (skb) && skb->len > mtu) || - (skb_is_gso (skb) && - !skb_gso_validate_network_len (skb,ip_skb_dst_mtu (skb->sk, skb)))) { - skb->protocol =htons (ETH_P_IP ); - -if (skb->sk) -xfrm_local_error (skb, mtu); -else -icmp_send (skb,ICMP_DEST_UNREACH , -ICMP_FRAG_NEEDED ,htonl (mtu)); - ret = -EMSGSIZE ; - } -out: -return ret; -} - -int xfrm4_extract_output (struct xfrm_state *x,struct sk_buff *skb) -{ -int err; - - err =xfrm4_tunnel_check_size (skb); -if (err) -return err; - -XFRM_MODE_SKB_CB (skb)->protocol =ip_hdr (skb)->protocol; - -return xfrm4_extract_header (skb); -} -int xfrm4_output_finish (struct sock *sk,struct sk_buff *skb) {memset (IPCB (skb),0 ,sizeof (*IPCB (skb)));
net/ipv4/xfrm4_state.c +0 -1
@@ -37,7 +37,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { .output = xfrm4_output, .output_finish = xfrm4_output_finish, .extract_input = xfrm4_extract_input, - .extract_output = xfrm4_extract_output, .transport_finish = xfrm4_transport_finish, .local_error = xfrm4_local_error, };
net/xfrm/xfrm_output.c +46 -0
64 lines not on this page · raw message
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 5/11 xfrm: state: remove extract_input indirection from xfrm_state_afinfo
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
In order to keep CONFIG_IPV6=m working, xfrm6_extract_header needs to be duplicated. It will be removed again in a followup change when the remaining caller is moved to net/xfrm as well.
--- include/net/xfrm.h | 3 --- net/ipv4/xfrm4_input.c | 5 ----- net/ipv4/xfrm4_state.c | 1 - net/ipv6/xfrm6_input.c | 5 ----- net/ipv6/xfrm6_output.c | 17 ++++++++++++++++- net/ipv6/xfrm6_state.c | 24 ------------------------ net/xfrm/xfrm_inout.h | 18 ++++++++++++++++++ net/xfrm/xfrm_input.c | 21 +++++++++++---------- 8 files changed, 45 insertions(+), 49 deletions(-)
include/net/xfrm.h +0 -3
@@ -362,8 +362,6 @@ struct xfrm_state_afinfo {int (*output)(struct net *net,struct sock *sk,struct sk_buff *skb);int (*output_finish)(struct sock *sk,struct sk_buff *skb); -int (*extract_input)(struct xfrm_state *x, -struct sk_buff *skb);int (*extract_output)(struct xfrm_state *x,struct sk_buff *skb); int (*transport_finish)(struct sk_buff *skb,
@@ -1587,7 +1585,6 @@ int xfrm4_protocol_deregister(struct xfrm4_protocol *handler, unsigned char protint xfrm4_tunnel_register (struct xfrm_tunnel *handler,unsigned short family);int xfrm4_tunnel_deregister (struct xfrm_tunnel *handler,unsigned short family);void xfrm4_local_error (struct sk_buff *skb,u32 mtu); -int xfrm6_extract_header (struct sk_buff *skb);int xfrm6_extract_input (struct xfrm_state *x,struct sk_buff *skb);int xfrm6_rcv_spi (struct sk_buff *skb,int nexthdr,__be32 spi,struct ip6_tnl *t);
net/ipv4/xfrm4_input.c +0 -5
@@ -18,11 +18,6 @@#include <net/ip.h> #include <net/xfrm.h> -int xfrm4_extract_input (struct xfrm_state *x,struct sk_buff *skb) -{ -return xfrm4_extract_header (skb); -} -static int xfrm4_rcv_encap_finish2 (struct net *net,struct sock *sk,struct sk_buff *skb) {
net/ipv4/xfrm4_state.c +0 -1
@@ -36,7 +36,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { .proto = IPPROTO_IPIP, .output = xfrm4_output, .output_finish = xfrm4_output_finish, - .extract_input = xfrm4_extract_input, .transport_finish = xfrm4_transport_finish, .local_error = xfrm4_local_error, };
net/ipv6/xfrm6_input.c +0 -5
@@ -17,11 +17,6 @@#include <net/ipv6.h> #include <net/xfrm.h> -int xfrm6_extract_input (struct xfrm_state *x,struct sk_buff *skb) -{ -return xfrm6_extract_header (skb); -} -int xfrm6_rcv_spi (struct sk_buff *skb,int nexthdr,__be32 spi,struct ip6_tnl *t) {
net/ipv6/xfrm6_output.c +16 -1
@@ -94,6 +94,20 @@ static int xfrm6_tunnel_check_size(struct sk_buff *skb)return ret; } +static void __xfrm6_extract_header (struct sk_buff *skb) +{ +struct ipv6hdr *iph =ipv6_hdr (skb); + +XFRM_MODE_SKB_CB (skb)->ihl =sizeof (*iph); +XFRM_MODE_SKB_CB (skb)->id =0 ; +XFRM_MODE_SKB_CB (skb)->frag_off =htons (IP_DF ); +XFRM_MODE_SKB_CB (skb)->tos =ipv6_get_dsfield (iph); +XFRM_MODE_SKB_CB (skb)->ttl = iph->hop_limit; +XFRM_MODE_SKB_CB (skb)->optlen =0 ; +memcpy (XFRM_MODE_SKB_CB (skb)->flow_lbl, iph->flow_lbl, +sizeof (XFRM_MODE_SKB_CB (skb)->flow_lbl)); +} +int xfrm6_extract_output (struct xfrm_state *x,struct sk_buff *skb) {int err;
@@ -104,7 +118,8 @@ int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb)XFRM_MODE_SKB_CB (skb)->protocol =ipv6_hdr (skb)->nexthdr; -return xfrm6_extract_header (skb); +__xfrm6_extract_header (skb); +return 0 ; }int xfrm6_output_finish (struct sock *sk,struct sk_buff *skb)
net/ipv6/xfrm6_state.c +0 -24
@@ -13,36 +13,12 @@*/ #include <net/xfrm.h> -#include <linux/pfkeyv2.h> -#include <linux/ipsec.h> -#include <linux/netfilter_ipv6.h> -#include <linux/export.h> -#include <net/dsfield.h> -#include <net/ipv6.h> -#include <net/addrconf.h> - -int xfrm6_extract_header (struct sk_buff *skb) -{ -struct ipv6hdr *iph =ipv6_hdr (skb); - -XFRM_MODE_SKB_CB (skb)->ihl =sizeof (*iph); -XFRM_MODE_SKB_CB (skb)->id =0 ; -XFRM_MODE_SKB_CB (skb)->frag_off =htons (IP_DF ); -XFRM_MODE_SKB_CB (skb)->tos =ipv6_get_dsfield (iph); -XFRM_MODE_SKB_CB (skb)->ttl = iph->hop_limit; -XFRM_MODE_SKB_CB (skb)->optlen =0 ; -memcpy (XFRM_MODE_SKB_CB (skb)->flow_lbl, iph->flow_lbl, -sizeof (XFRM_MODE_SKB_CB (skb)->flow_lbl)); - -return 0 ; -}static struct xfrm_state_afinfo xfrm6_state_afinfo = { .family =AF_INET6 , .proto =IPPROTO_IPV6 , .output = xfrm6_output, .output_finish = xfrm6_output_finish, - .extract_input = xfrm6_extract_input, .extract_output = xfrm6_extract_output, .transport_finish = xfrm6_transport_finish, .local_error = xfrm6_local_error,
net/xfrm/xfrm_inout.h +18 -0
@@ -6,6 +6,24 @@#ifndef XFRM_INOUT_H #define XFRM_INOUT_H 1 +static inline void xfrm6_extract_header (struct sk_buff *skb) +{ +#if IS_ENABLED (CONFIG_IPV6 ) +struct ipv6hdr *iph =ipv6_hdr (skb); + +XFRM_MODE_SKB_CB (skb)->ihl =sizeof (*iph); +XFRM_MODE_SKB_CB (skb)->id =0 ; +XFRM_MODE_SKB_CB (skb)->frag_off =htons (IP_DF ); +XFRM_MODE_SKB_CB (skb)->tos =ipv6_get_dsfield (iph); +XFRM_MODE_SKB_CB (skb)->ttl = iph->hop_limit; +XFRM_MODE_SKB_CB (skb)->optlen =0 ; +memcpy (XFRM_MODE_SKB_CB (skb)->flow_lbl, iph->flow_lbl, +sizeof (XFRM_MODE_SKB_CB (skb)->flow_lbl)); +#else +WARN_ON_ONCE (1 ); +#endif +} +static inline void xfrm6_beet_make_header (struct sk_buff *skb) {struct ipv6hdr *iph =ipv6_hdr (skb);
net/xfrm/xfrm_input.c +11 -10
@@ -353,17 +353,18 @@ xfrm_inner_mode_encap_remove(struct xfrm_state *x,static int xfrm_prepare_input (struct xfrm_state *x,struct sk_buff *skb) {const struct xfrm_mode *inner_mode = &x->inner_mode; -const struct xfrm_state_afinfo *afinfo; -int err = -EAFNOSUPPORT ; - -rcu_read_lock (); - afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode.family); -if (likely (afinfo)) - err = afinfo->extract_input (x, skb); -rcu_read_unlock (); -if (err) -return err; +switch (x->outer_mode.family) { +case AF_INET : +xfrm4_extract_header (skb); +break ; +case AF_INET6 : +xfrm6_extract_header (skb); +break ; +default : +WARN_ON_ONCE (1 ); +return -EAFNOSUPPORT ; + }if (x->sel.family ==AF_UNSPEC ) { inner_mode =xfrm_ip2inner_mode (x,XFRM_MODE_SKB_CB (skb)->protocol);
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 6/11 xfrm: move xfrm4_extract_header to common helper
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
The function only initializes the XFRM CB in the skb.
After previous patch xfrm4_extract_header is only called from net/xfrm/xfrm_{input,output}.c.
Because of IPV6=m linker errors the ipv6 equivalent (xfrm6_extract_header) was already placed in xfrm_inout.h because we can't call functions residing in a module from the core.
So do the same for the ipv4 helper and place it next to the ipv6 one.
--- include/net/xfrm.h | 1 - net/ipv4/xfrm4_state.c | 21 --------------------- net/xfrm/xfrm_inout.h | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 22 deletions(-)
include/net/xfrm.h +0 -1
@@ -1562,7 +1562,6 @@ int pktgen_xfrm_outer_mode_output(struct xfrm_state *x, struct sk_buff *skb);#endif void xfrm_local_error (struct sk_buff *skb,int mtu); -int xfrm4_extract_header (struct sk_buff *skb);int xfrm4_extract_input (struct xfrm_state *x,struct sk_buff *skb);int xfrm4_rcv_encap (struct sk_buff *skb,int nexthdr,__be32 spi,int encap_type);
net/ipv4/xfrm4_state.c +0 -21
@@ -8,28 +8,7 @@* */ -#include <net/ip.h> #include <net/xfrm.h> -#include <linux/pfkeyv2.h> -#include <linux/ipsec.h> -#include <linux/netfilter_ipv4.h> -#include <linux/export.h> - -int xfrm4_extract_header (struct sk_buff *skb) -{ -const struct iphdr *iph =ip_hdr (skb); - -XFRM_MODE_SKB_CB (skb)->ihl =sizeof (*iph); -XFRM_MODE_SKB_CB (skb)->id = iph->id; -XFRM_MODE_SKB_CB (skb)->frag_off = iph->frag_off; -XFRM_MODE_SKB_CB (skb)->tos = iph->tos; -XFRM_MODE_SKB_CB (skb)->ttl = iph->ttl; -XFRM_MODE_SKB_CB (skb)->optlen = iph->ihl *4 -sizeof (*iph); -memset (XFRM_MODE_SKB_CB (skb)->flow_lbl,0 , -sizeof (XFRM_MODE_SKB_CB (skb)->flow_lbl)); - -return 0 ; -}static struct xfrm_state_afinfo xfrm4_state_afinfo = { .family =AF_INET ,
net/xfrm/xfrm_inout.h +14 -0
@@ -6,6 +6,20 @@#ifndef XFRM_INOUT_H #define XFRM_INOUT_H 1 +static inline void xfrm4_extract_header (struct sk_buff *skb) +{ +const struct iphdr *iph =ip_hdr (skb); + +XFRM_MODE_SKB_CB (skb)->ihl =sizeof (*iph); +XFRM_MODE_SKB_CB (skb)->id = iph->id; +XFRM_MODE_SKB_CB (skb)->frag_off = iph->frag_off; +XFRM_MODE_SKB_CB (skb)->tos = iph->tos; +XFRM_MODE_SKB_CB (skb)->ttl = iph->ttl; +XFRM_MODE_SKB_CB (skb)->optlen = iph->ihl *4 -sizeof (*iph); +memset (XFRM_MODE_SKB_CB (skb)->flow_lbl,0 , +sizeof (XFRM_MODE_SKB_CB (skb)->flow_lbl)); +} +static inline void xfrm6_extract_header (struct sk_buff *skb) {#if IS_ENABLED (CONFIG_IPV6 )
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 7/11 xfrm: expose local_rxpmtu via ipv6_stubs
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
We cannot call this function from the core kernel unless we would force CONFIG_IPV6=y.
Therefore expose this via ipv6_stubs so we can call it from net/xfrm in the followup patch.
Since the call is expected to be unlikely, no extra code for the IPV6=y case is added and we will always eat the indirection cost.
--- include/net/ipv6_stubs.h | 1 + include/net/xfrm.h | 1 + net/ipv6/af_inet6.c | 1 + net/ipv6/xfrm6_output.c | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-)
include/net/ipv6_stubs.h +1 -0
@@ -57,6 +57,7 @@ struct ipv6_stub {const struct in6_addr *solicited_addr, bool router, bool solicited, bool override, bool inc_opt);#if IS_ENABLED (CONFIG_XFRM ) +void (*xfrm6_local_rxpmtu)(struct sk_buff *skb,u32 mtu);int (*xfrm6_udp_encap_rcv)(struct sock *sk,struct sk_buff *skb);int (*xfrm6_rcv_encap)(struct sk_buff *skb,int nexthdr,__be32 spi,int encap_type);
include/net/xfrm.h +1 -0
@@ -1608,6 +1608,7 @@ int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb, u8 **prevhdr);#ifdef CONFIG_XFRM +void xfrm6_local_rxpmtu (struct sk_buff *skb,u32 mtu);int xfrm4_udp_encap_rcv (struct sock *sk,struct sk_buff *skb);int xfrm6_udp_encap_rcv (struct sock *sk,struct sk_buff *skb); int xfrm_user_policy(struct sock *sk, int optname,
net/ipv6/af_inet6.c +1 -0
@@ -963,6 +963,7 @@ static const struct ipv6_stub ipv6_stub_impl = { .udpv6_encap_enable = udpv6_encap_enable, .ndisc_send_na = ndisc_send_na,#if IS_ENABLED (CONFIG_XFRM ) + .xfrm6_local_rxpmtu = xfrm6_local_rxpmtu, .xfrm6_udp_encap_rcv = xfrm6_udp_encap_rcv, .xfrm6_rcv_encap = xfrm6_rcv_encap,#endif
net/ipv6/xfrm6_output.c +1 -1
@@ -40,7 +40,7 @@ static int xfrm6_local_dontfrag(struct sk_buff *skb)return 0 ; } -static void xfrm6_local_rxpmtu (struct sk_buff *skb,u32 mtu) +void xfrm6_local_rxpmtu (struct sk_buff *skb,u32 mtu) {struct flowi6 fl6;struct sock *sk = skb->sk;
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 8/11 xfrm: place xfrm6_local_dontfrag in xfrm.h
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
so next patch can re-use it from net/xfrm/xfrm_output.c without causing a linker error when IPV6 is a module.
--- include/net/xfrm.h | 16 ++++++++++++++++ net/ipv6/xfrm6_output.c | 21 ++------------------- 2 files changed, 18 insertions(+), 19 deletions(-)
include/net/xfrm.h +16 -0
@@ -1993,4 +1993,20 @@ static inline int xfrm_tunnel_check(struct sk_buff *skb, struct xfrm_state *x, return 0; } + +#if IS_ENABLED (CONFIG_IPV6 ) +static inline bool xfrm6_local_dontfrag (const struct sock *sk) +{ +int proto; + +if (!sk || sk->sk_family !=AF_INET6 ) +return false; + + proto = sk->sk_protocol; +if (proto ==IPPROTO_UDP || proto ==IPPROTO_RAW ) +return inet6_sk (sk)->dontfrag; + +return false; +} +#endif #endif /* _NET_XFRM_H */
net/ipv6/xfrm6_output.c +2 -19
@@ -23,23 +23,6 @@ int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb, }EXPORT_SYMBOL (xfrm6_find_1stfragopt); -static int xfrm6_local_dontfrag (struct sk_buff *skb) -{ -int proto; -struct sock *sk = skb->sk; - -if (sk) { -if (sk->sk_family !=AF_INET6 ) -return 0 ; - - proto = sk->sk_protocol; -if (proto ==IPPROTO_UDP || proto ==IPPROTO_RAW ) -return inet6_sk (sk)->dontfrag; - } - -return 0 ; -} -void xfrm6_local_rxpmtu (struct sk_buff *skb,u32 mtu) {struct flowi6 fl6;
@@ -82,7 +65,7 @@ static int xfrm6_tunnel_check_size(struct sk_buff *skb) skb->dev = dst->dev; skb->protocol =htons (ETH_P_IPV6 ); -if (xfrm6_local_dontfrag (skb)) +if (xfrm6_local_dontfrag (skb->sk))xfrm6_local_rxpmtu (skb, mtu);else if (skb->sk)xfrm_local_error (skb, mtu);
@@ -181,7 +164,7 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb) toobig = skb->len > mtu && !skb_is_gso (skb); -if (toobig &&xfrm6_local_dontfrag (skb)) { +if (toobig &&xfrm6_local_dontfrag (skb->sk)) {xfrm6_local_rxpmtu (skb, mtu);kfree_skb (skb);return -EMSGSIZE ;
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 9/11 xfrm: remove extract_output indirection from xfrm_state_afinfo
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
Move this to xfrm_output.c. This avoids the state->extract_output indirection.
This patch also removes the duplicated __xfrm6_extract_header helper added in an earlier patch, we can now use the one from xfrm_inout.h .
--- include/net/xfrm.h | 3 -- net/ipv6/xfrm6_output.c | 58 ----------------------------------- net/ipv6/xfrm6_state.c | 1 - net/xfrm/xfrm_output.c | 67 ++++++++++++++++++++++++++++++++++++----- 4 files changed, 59 insertions(+), 70 deletions(-)
include/net/xfrm.h +0 -3
@@ -362,8 +362,6 @@ struct xfrm_state_afinfo {int (*output)(struct net *net,struct sock *sk,struct sk_buff *skb);int (*output_finish)(struct sock *sk,struct sk_buff *skb); -int (*extract_output)(struct xfrm_state *x, -struct sk_buff *skb);int (*transport_finish)(struct sk_buff *skb,int async);void (*local_error)(struct sk_buff *skb,u32 mtu);
@@ -1601,7 +1599,6 @@ int xfrm6_tunnel_register(struct xfrm6_tunnel *handler, unsigned short family);int xfrm6_tunnel_deregister (struct xfrm6_tunnel *handler,unsigned short family);__be32 xfrm6_tunnel_alloc_spi (struct net *net,xfrm_address_t *saddr);__be32 xfrm6_tunnel_spi_lookup (struct net *net,const xfrm_address_t *saddr); -int xfrm6_extract_output (struct xfrm_state *x,struct sk_buff *skb);int xfrm6_output (struct net *net,struct sock *sk,struct sk_buff *skb);int xfrm6_output_finish (struct sock *sk,struct sk_buff *skb); int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,
net/ipv6/xfrm6_output.c +0 -58
64 lines not on this page · raw message
net/ipv6/xfrm6_state.c +0 -1
@@ -19,7 +19,6 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = { .proto = IPPROTO_IPV6, .output = xfrm6_output, .output_finish = xfrm6_output_finish, - .extract_output = xfrm6_extract_output, .transport_finish = xfrm6_transport_finish, .local_error = xfrm6_local_error, };
net/xfrm/xfrm_output.c +59 -8
90 lines not on this page · raw message
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 10/11 xfrm: remove output_finish indirection from xfrm_state_afinfo
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
There are only two implementaions, one for ipv4 and one for ipv6.
Both are almost identical, they clear skb->cb[], set the TRANSFORMED flag in IP(6)CB and then call the common xfrm_output() function.
By placing the IPCB handling into the common function, we avoid the need for the output_finish indirection as the output functions can simply use xfrm_output().
--- include/net/xfrm.h | 1 - net/ipv4/xfrm4_output.c | 23 +---------------------- net/ipv4/xfrm4_state.c | 1 - net/ipv6/xfrm6_output.c | 34 ++-------------------------------- net/ipv6/xfrm6_state.c | 1 - net/xfrm/xfrm_output.c | 16 ++++++++++++++++ 6 files changed, 19 insertions(+), 57 deletions(-)
include/net/xfrm.h +0 -1
@@ -361,7 +361,6 @@ struct xfrm_state_afinfo {const struct xfrm_type *type_dstopts;int (*output)(struct net *net,struct sock *sk,struct sk_buff *skb); -int (*output_finish)(struct sock *sk,struct sk_buff *skb);int (*transport_finish)(struct sk_buff *skb,int async);void (*local_error)(struct sk_buff *skb,u32 mtu);
net/ipv4/xfrm4_output.c +1 -22
@@ -14,22 +14,9 @@#include <net/xfrm.h> #include <net/icmp.h> -int xfrm4_output_finish (struct sock *sk,struct sk_buff *skb) -{ -memset (IPCB (skb),0 ,sizeof (*IPCB (skb))); - -#ifdef CONFIG_NETFILTER -IPCB (skb)->flags |=IPSKB_XFRM_TRANSFORMED ; -#endif - -return xfrm_output (sk, skb); -} -static int __xfrm4_output (struct net *net,struct sock *sk,struct sk_buff *skb) {struct xfrm_state *x =skb_dst (skb)->xfrm; -const struct xfrm_state_afinfo *afinfo; -int ret = -EAFNOSUPPORT ;#ifdef CONFIG_NETFILTER if (!x) {
@@ -38,15 +25,7 @@ static int __xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb) }#endif -rcu_read_lock (); - afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode.family); -if (likely (afinfo)) - ret = afinfo->output_finish (sk, skb); -else -kfree_skb (skb); -rcu_read_unlock (); - -return ret; +return xfrm_output (sk, skb); }int xfrm4_output (struct net *net,struct sock *sk,struct sk_buff *skb)
net/ipv4/xfrm4_state.c +0 -1
@@ -14,7 +14,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { .family = AF_INET, .proto = IPPROTO_IPIP, .output = xfrm4_output, - .output_finish = xfrm4_output_finish, .transport_finish = xfrm4_transport_finish, .local_error = xfrm4_local_error, };
net/ipv6/xfrm6_output.c +2 -32
@@ -47,39 +47,9 @@ void xfrm6_local_error(struct sk_buff *skb, u32 mtu)ipv6_local_error (sk,EMSGSIZE , &fl6, mtu); } -int xfrm6_output_finish (struct sock *sk,struct sk_buff *skb) -{ -memset (IP6CB (skb),0 ,sizeof (*IP6CB (skb))); - -#ifdef CONFIG_NETFILTER -IP6CB (skb)->flags |=IP6SKB_XFRM_TRANSFORMED ; -#endif - -return xfrm_output (sk, skb); -} - -static int __xfrm6_output_state_finish (struct xfrm_state *x,struct sock *sk, -struct sk_buff *skb) -{ -const struct xfrm_state_afinfo *afinfo; -int ret = -EAFNOSUPPORT ; - -rcu_read_lock (); - afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode.family); -if (likely (afinfo)) - ret = afinfo->output_finish (sk, skb); -else -kfree_skb (skb); -rcu_read_unlock (); - -return ret; -} -static int __xfrm6_output_finish (struct net *net,struct sock *sk,struct sk_buff *skb) { -struct xfrm_state *x =skb_dst (skb)->xfrm; - -return __xfrm6_output_state_finish (x, sk, skb); +return xfrm_output (sk, skb); }static int __xfrm6_output (struct net *net,struct sock *sk,struct sk_buff *skb)
@@ -121,7 +91,7 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb) __xfrm6_output_finish); skip_frag: -return __xfrm6_output_state_finish (x, sk, skb); +return xfrm_output (sk, skb); }int xfrm6_output (struct net *net,struct sock *sk,struct sk_buff *skb)
net/ipv6/xfrm6_state.c +0 -1
@@ -18,7 +18,6 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = { .family = AF_INET6, .proto = IPPROTO_IPV6, .output = xfrm6_output, - .output_finish = xfrm6_output_finish, .transport_finish = xfrm6_transport_finish, .local_error = xfrm6_local_error, };
net/xfrm/xfrm_output.c +16 -0
@@ -571,6 +571,22 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb)struct xfrm_state *x =skb_dst (skb)->xfrm;int err; +switch (x->outer_mode.family) { +case AF_INET : +memset (IPCB (skb),0 ,sizeof (*IPCB (skb))); +#ifdef CONFIG_NETFILTER +IPCB (skb)->flags |=IPSKB_XFRM_TRANSFORMED ; +#endif +break ; +case AF_INET6 : +memset (IP6CB (skb),0 ,sizeof (*IP6CB (skb))); + +#ifdef CONFIG_NETFILTER +IP6CB (skb)->flags |=IP6SKB_XFRM_TRANSFORMED ; +#endif +break ; + } +secpath_reset (skb);if (xfrm_dev_offload_ok (skb, x)) {
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 11/11 xfrm: fix unused variable warning if CONFIG_NETFILTER=n
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
After recent change 'x' is only used when CONFIG_NETFILTER is set:
net/ipv4/xfrm4_output.c: In function '__xfrm4_output':net/ipv4/xfrm4_output.c:19:21: warning: unused variable 'x' [-Wunused-variable]
19 | struct xfrm_state *x = skb_dst(skb)->xfrm;
Expand the CONFIG_NETFILTER scope to avoid this.
--- net/ipv4/xfrm4_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/xfrm4_output.c +1 -1
@@ -16,9 +16,9 @@static int __xfrm4_output (struct net *net,struct sock *sk,struct sk_buff *skb) { +#ifdef CONFIG_NETFILTER struct xfrm_state *x =skb_dst (skb)->xfrm; -#ifdef CONFIG_NETFILTER if (!x) {IPCB (skb)->flags |=IPSKB_REROUTED ;return dst_output (net, sk, skb);
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Steffen Klassert <[email protected]>
Date: Fri, 29 May 2020 12:30:00 +0200
Quoted 10 lines
1) Add IPv6 encapsulation support for ESP over UDP and TCP. From Sabrina Dubroca.
2) Remove unneeded reference when initializing xfrm interfaces. From Nicolas Dichtel.
3) Remove some indirect calls from the
state_afinfo. From Florian Westphal.Please note that this pull request has two merge conflicts
...
Quoted 3 lines
Both conflicts can be resolved as done in linux-next.
Please pull or let me know if there are problems.
Pulled, thanks Steffen.