pull request (net): ipsec 2022-01-06
Subsystems (4)
Steffen Klassert
maintainer1) Fix xfrm policy lookups for ipv6 gre packets by initializing fl6_gre_key properly. From Ghalem Boudour.
2) Fix the dflt policy check on forwarding when there is no policy configured. The check was done for the wrong direction. From Nicolas Dichtel.
3) Use the correct 'struct xfrm_user_offload' when calculating netlink message lenghts in xfrm_sa_len(). From Eric Dumazet.
4) Tread inserting xfrm interface id 0 as an error. From Antony Antony.
5) Fail if xfrm state or policy is inserted with XFRMA_IF_ID 0, xfrm interfaces with id 0 are not allowed.
From Antony Antony.
6) Fix inner_ipproto setting in the sec_path for tunnel mode. From Raed Salem.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit 03a000bfd7193cacefb40e309283578c6ae207b5:
Merge branch 'nh-group-refcnt' (2021-11-22 15:44:49 +0000)
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 45a98ef4922def8c679ca7c454403d1957fe70e7:
net/xfrm: IPsec tunnel mode fix inner_ipproto setting in sec_path (2022-01-05 10:59:35 +0100)
----------------------------------------------------------------
Antony Antony (2):
xfrm: interface with if_id 0 should return error
xfrm: state and policy should fail if XFRMA_IF_ID 0
Eric Dumazet (1):
xfrm: fix a small bug in xfrm_sa_len()
Ghalem Boudour (1):
xfrm: fix policy lookup for ipv6 gre packets
Nicolas Dichtel (1):
xfrm: fix dflt policy check when there is no policy configured
Raed Salem (1):
net/xfrm: IPsec tunnel mode fix inner_ipproto setting in sec_path
include/net/xfrm.h | 2 +- net/ipv6/ip6_gre.c | 5 ++++- net/xfrm/xfrm_interface.c | 14 ++++++++++++-- net/xfrm/xfrm_output.c | 30 +++++++++++++++++++++++++----- net/xfrm/xfrm_policy.c | 21 +++++++++++++++++++++ net/xfrm/xfrm_user.c | 23 +++++++++++++++++++---- 6 files changed, 82 insertions(+), 13 deletions(-)
Steffen Klassert
maintainerPATCH 1/6 xfrm: fix policy lookup for ipv6 gre packets
From: Ghalem Boudour <[email protected]>
On egress side, xfrm lookup is called from __gre6_xmit() with the fl6_gre_key field not initialized leading to policies selectors check failure. Consequently, gre packets are sent without encryption.
On ingress side, INET6_PROTO_NOPOLICY was set, thus packets were not checked against xfrm policies. Like for egress side, fl6_gre_key should be correctly set, this is now done in decode_session6().
--- net/ipv6/ip6_gre.c | 5 ++++- net/xfrm/xfrm_policy.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-)
net/ipv6/ip6_gre.c +4 -1
@@ -755,6 +755,7 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb, fl6->daddr = key->u.ipv6.dst; fl6->flowlabel = key->label; fl6->flowi6_uid =sock_net_uid (dev_net (dev),NULL ); + fl6->fl6_gre_key =tunnel_id_to_key32 (key->tun_id); dsfield = key->tos; flags = key->tun_flags &
@@ -990,6 +991,7 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb, fl6.daddr = key->u.ipv6.dst; fl6.flowlabel = key->label; fl6.flowi6_uid =sock_net_uid (dev_net (dev),NULL ); + fl6.fl6_gre_key =tunnel_id_to_key32 (key->tun_id); dsfield = key->tos;if (!(tun_info->key.tun_flags &TUNNEL_ERSPAN_OPT ))
@@ -1098,6 +1100,7 @@ static void ip6gre_tnl_link_config_common(struct ip6_tnl *t) fl6->flowi6_oif = p->link; fl6->flowlabel =0 ; fl6->flowi6_proto =IPPROTO_GRE ; + fl6->fl6_gre_key = t->parms.o_key;if (!(p->flags&IP6_TNL_F_USE_ORIG_TCLASS )) fl6->flowlabel |=IPV6_TCLASS_MASK & p->flowinfo;
@@ -1544,7 +1547,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)static struct inet6_protocol ip6gre_protocol__read_mostly = { .handler = gre_rcv, .err_handler = ip6gre_err, - .flags =INET6_PROTO_NOPOLICY |INET6_PROTO_FINAL , + .flags =INET6_PROTO_FINAL , };static void ip6gre_destroy_tunnels (struct net *net,struct list_head *head)
net/xfrm/xfrm_policy.c +21 -0
@@ -33,6 +33,7 @@#include <net/flow.h> #include <net/xfrm.h> #include <net/ip.h> +#include <net/gre.h> #if IS_ENABLED (CONFIG_IPV6_MIP6 )#include <net/mip6.h> #endif
@@ -3422,6 +3423,26 @@ decode_session6(struct sk_buff *skb, struct flowi *fl, bool reverse) } fl6->flowi6_proto = nexthdr;return ; +case IPPROTO_GRE : +if (!onlyproto && + (nh + offset +12 < skb->data || +pskb_may_pull (skb, nh + offset +12 - skb->data))) { +struct gre_base_hdr *gre_hdr; +__be32 *gre_key; + + nh =skb_network_header (skb); + gre_hdr = (struct gre_base_hdr *)(nh + offset); + gre_key = (__be32 *)(gre_hdr +1 ); + +if (gre_hdr->flags &GRE_KEY ) { +if (gre_hdr->flags &GRE_CSUM ) + gre_key++; + fl6->fl6_gre_key = *gre_key; + } + } + fl6->flowi6_proto = nexthdr; +return ; +#if IS_ENABLED (CONFIG_IPV6_MIP6 )case IPPROTO_MH : offset +=ipv6_optlen (exthdr);
Signature · 1 line
2.25.1
Re: [PATCH 1/6] xfrm: fix policy lookup for ipv6 gre packets
This series was applied to netdev/net.git (master) by Steffen Klassert <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by Steffen Klassert <[email protected]>:
Quoted 11 lines · On Thu, 6 Jan 2022 10:36:01 +0100 you wrote:
From: Ghalem Boudour <[email protected]>
On egress side, xfrm lookup is called from
__gre6_xmit()with thefl6_gre_keyfield not initialized leading to policies selectors check failure. Consequently, gre packets are sent without encryption.On ingress side,
INET6_PROTO_NOPOLICYwas set, thus packets were not checked against xfrm policies. Like for egress side,fl6_gre_keyshould be correctly set, this is now done indecode_session6().[...]
Here is the summary with links:
- [1/6] xfrm: fix policy lookup for ipv6 gre packets
https://git.kernel.org/netdev/net/c/bcf141b2eb55 - [2/6] xfrm: fix dflt policy check when there is no policy configured https://git.kernel.org/netdev/net/c/ec3bb890817e - [3/6] xfrm: fix a small bug in xfrm_sa_len() https://git.kernel.org/netdev/net/c/7770a39d7c63 - [4/6] xfrm: interface with if_id 0 should return error https://git.kernel.org/netdev/net/c/8dce43919566 - [5/6] xfrm: state and policy should fail if XFRMA_IF_ID 0 https://git.kernel.org/netdev/net/c/68ac0f3810e7 - [6/6] net/xfrm: IPsec tunnel mode fix inner_ipproto setting in sec_path https://git.kernel.org/netdev/net/c/45a98ef4922d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Steffen Klassert
maintainerPATCH 2/6 xfrm: fix dflt policy check when there is no policy configured
In reply to Steffen KlassertFrom: Nicolas Dichtel <[email protected]>
When there is no policy configured on the system, the default policy is checked in xfrm_route_forward. However, it was done with the wrong direction (XFRM_POLICY_FWD instead of XFRM_POLICY_OUT).
The default policy for XFRM_POLICY_FWD was checked just before, with a call to xfrm[46]_policy_check().
--- include/net/xfrm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/xfrm.h +1 -1
@@ -1162,7 +1162,7 @@ static inline int xfrm_route_forward(struct sk_buff *skb, unsigned short family) {struct net *net =dev_net (skb->dev); -if (xfrm_default_allow (net,XFRM_POLICY_FWD )) +if (xfrm_default_allow (net,XFRM_POLICY_OUT ))return !net->xfrm.policy_count[XFRM_POLICY_OUT ] || (skb_dst (skb)->flags &DST_NOXFRM ) ||__xfrm_route_forward (skb, family);
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 3/6 xfrm: fix a small bug in xfrm_sa_len()
In reply to Steffen KlassertFrom: Eric Dumazet <[email protected]>
copy_user_offload() will actually push a struct struct xfrm_user_offload, which is different than (struct xfrm_state *)->xso
(struct xfrm_state_offload)
--- net/xfrm/xfrm_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_user.c +1 -1
@@ -3058,7 +3058,7 @@ static inline unsigned int xfrm_sa_len(struct xfrm_state *x)if (x->props.extra_flags) l +=nla_total_size (sizeof (x->props.extra_flags));if (x->xso.dev) - l +=nla_total_size (sizeof (x->xso)); + l +=nla_total_size (sizeof (struct xfrm_user_offload ));if (x->props.smark.v | x->props.smark.m) { l +=nla_total_size (sizeof (x->props.smark.v)); l +=nla_total_size (sizeof (x->props.smark.m));
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 4/6 xfrm: interface with if_id 0 should return error
In reply to Steffen KlassertFrom: Antony Antony <[email protected]>
xfrm interface if_id = 0 would cause xfrm policy lookup errors since Commit 9f8550e4bd9d.
Now explicitly fail to create an xfrm interface when if_id = 0
With this commit:
ip link add ipsec0 type xfrm dev lo if_id 0
Error: if_id must be non zero.
v1->v2 change:
- add Fixes: tag
--- net/xfrm/xfrm_interface.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
net/xfrm/xfrm_interface.c +12 -2
@@ -637,11 +637,16 @@ static int xfrmi_newlink(struct net *src_net, struct net_device *dev, struct netlink_ext_ack *extack) {struct net *net =dev_net (dev); -struct xfrm_if_parms p; +struct xfrm_if_parms p = {};struct xfrm_if *xi;int err;xfrmi_netlink_parms (data, &p); +if (!p.if_id) { +NL_SET_ERR_MSG (extack,"if_id must be non zero" ); +return -EINVAL ; + } + xi =xfrmi_locate (net, &p);if (xi)return -EEXIST ;
@@ -666,7 +671,12 @@ static int xfrmi_changelink(struct net_device *dev, struct nlattr *tb[], {struct xfrm_if *xi =netdev_priv (dev);struct net *net = xi->net; -struct xfrm_if_parms p; +struct xfrm_if_parms p = {}; + +if (!p.if_id) { +NL_SET_ERR_MSG (extack,"if_id must be non zero" ); +return -EINVAL ; + }xfrmi_netlink_parms (data, &p); xi =xfrmi_locate (net, &p);
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 5/6 xfrm: state and policy should fail if XFRMA_IF_ID 0
In reply to Steffen KlassertFrom: Antony Antony <[email protected]>
xfrm ineterface does not allow xfrm if_id = 0
fail to create or update xfrm state and policy.
With this commit:
ip xfrm policy add src 192.0.2.1 dst 192.0.2.2 dir out if_id 0 RTNETLINK answers: Invalid argument
ip xfrm state add src 192.0.2.1 dst 192.0.2.2 proto esp spi 1 \
reqid 1 mode tunnel aead 'rfc4106(gcm(aes))' \
0x1111111111111111111111111111111111111111 96 if_id 0RTNETLINK answers: Invalid argument
v1->v2 change:
- add Fixes: tag
--- net/xfrm/xfrm_user.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
net/xfrm/xfrm_user.c +18 -3
@@ -621,8 +621,13 @@ static struct xfrm_state *xfrm_state_construct(struct net *net,xfrm_smark_init (attrs, &x->props.smark); -if (attrs[XFRMA_IF_ID ]) +if (attrs[XFRMA_IF_ID ]) { x->if_id =nla_get_u32 (attrs[XFRMA_IF_ID ]); +if (!x->if_id) { + err = -EINVAL ; + goto error; + } + } err =__xfrm_init_state (x, false, attrs[XFRMA_OFFLOAD_DEV ]);if (err)
@@ -1413,8 +1418,13 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh, mark =xfrm_mark_get (attrs, &m); -if (attrs[XFRMA_IF_ID ]) +if (attrs[XFRMA_IF_ID ]) { if_id =nla_get_u32 (attrs[XFRMA_IF_ID ]); +if (!if_id) { + err = -EINVAL ; + goto out_noput; + } + }if (p->info.seq) { x =xfrm_find_acq_byseq (net, mark, p->info.seq);
@@ -1727,8 +1737,13 @@ static struct xfrm_policy *xfrm_policy_construct(struct net *net, struct xfrm_usxfrm_mark_get (attrs, &xp->mark); -if (attrs[XFRMA_IF_ID ]) +if (attrs[XFRMA_IF_ID ]) { xp->if_id =nla_get_u32 (attrs[XFRMA_IF_ID ]); +if (!xp->if_id) { + err = -EINVAL ; + goto error; + } + }return xp; error:
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 6/6 net/xfrm: IPsec tunnel mode fix inner_ipproto setting in sec_path
In reply to Steffen KlassertFrom: Raed Salem <[email protected]>
The inner_ipproto saves the inner IP protocol of the plain text packet. This allows vendor's IPsec feature making offload decision at skb's features_check and configuring hardware at ndo_start_xmit, current code implenetation did not handle the case where IPsec is used in tunnel mode.
Fix by handling the case when IPsec is used in tunnel mode by reading the protocol of the plain text packet IP protocol.
--- net/xfrm/xfrm_output.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-)
net/xfrm/xfrm_output.c +25 -5
@@ -647,10 +647,12 @@ static int xfrm_output_gso(struct net *net, struct sock *sk, struct sk_buff *skb* This requires hardware to know the inner packet type to calculate * the inner header checksum. Save inner ip protocol here to avoid * traversing the packet in the vendor's xmit code. -* If the encap type is IPIP, just save skb->inner_ipproto. Otherwise, -* get the ip protocol from the IP header. +* For IPsec tunnel mode save the ip protocol from the IP header of the +* plain text packet. Otherwise If the encap type is IPIP, just save +* skb->inner_ipproto in any other case get the ip protocol from the IP +* header. */ -static void xfrm_get_inner_ipproto (struct sk_buff *skb) +static void xfrm_get_inner_ipproto (struct sk_buff *skb,struct xfrm_state *x) {struct xfrm_offload *xo =xfrm_offload (skb);const struct ethhdr *eth;
@@ -658,6 +660,25 @@ static void xfrm_get_inner_ipproto(struct sk_buff *skb)if (!xo)return ; +if (x->outer_mode.encap ==XFRM_MODE_TUNNEL ) { +switch (x->outer_mode.family) { +case AF_INET : + xo->inner_ipproto =ip_hdr (skb)->protocol; +break ; +case AF_INET6 : + xo->inner_ipproto =ipv6_hdr (skb)->nexthdr; +break ; +default : +break ; + } + +return ; + } + +/* non-Tunnel Mode */ +if (!skb->encapsulation) +return ; +if (skb->inner_protocol_type ==ENCAP_TYPE_IPPROTO ) { xo->inner_ipproto = skb->inner_ipproto;return ;
@@ -712,8 +733,7 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb) sp->xvec[sp->len++] = x;xfrm_state_hold (x); -if (skb->encapsulation) -xfrm_get_inner_ipproto (skb); +xfrm_get_inner_ipproto (skb, x); skb->encapsulation =1 ;if (skb_is_gso (skb)) {
Signature · 1 line
2.25.1