xfrm: Add Direction to the SA in or out
Subsystems (3)
PATCH v8 1/1 xfrm: Add Direction to the SA in or out
This patch introduces the 'dir' attribute, 'in' or 'out', to the xfrm_state, SA, enhancing usability by delineating the scope of values based on direction. An input SA will now exclusively encompass values pertinent to input, effectively segregating them from output-related values. This change aims to streamline the configuration process and improve the overall clarity of SA attributes.
This feature sets the groundwork for future patches, including the upcoming IP-TFS patch.
v7->v8:
- add extra validation check on replay window and seq
- XFRM_MSG_UPDSA old and new SA should match "dir"
v6->v7:
- add replay-window check non-esn 0 and ESN 1.
- remove :XFRMA_SA_DIR only allowed with HW OFFLOAD
v5->v6:
- XFRMA_SA_DIR only allowed with HW OFFLOAD
v4->v5:
- add details to commit message
v3->v4:
- improve HW OFFLOAD DIR check add the other direction
v2->v3:
- delete redundant XFRM_SA_DIR_USE
- use u8 for "dir"
- fix HW OFFLOAD DIR check
v1->v2:
- use .strict_start_type in struct nla_policy xfrma_policy
- delete redundant XFRM_SA_DIR_MAX enum
--- include/net/xfrm.h | 1 + include/uapi/linux/xfrm.h | 6 +++ net/xfrm/xfrm_compat.c | 7 +++- net/xfrm/xfrm_device.c | 6 +++ net/xfrm/xfrm_state.c | 4 ++ net/xfrm/xfrm_user.c | 85 +++++++++++++++++++++++++++++++++++++-- 6 files changed, 103 insertions(+), 6 deletions(-)
include/net/xfrm.h +1 -0
@@ -291,6 +291,7 @@ struct xfrm_state {/* Private data of this transformer, format is opaque, * interpreted by xfrm_type methods. */ void *data; +u8 dir; };static inline struct net *xs_net (struct xfrm_state *x)
include/uapi/linux/xfrm.h +6 -0
@@ -141,6 +141,11 @@ enum {XFRM_POLICY_MAX =3 }; +enum xfrm_sa_dir { +XFRM_SA_DIR_IN =1 , +XFRM_SA_DIR_OUT =2 +}; +enum {XFRM_SHARE_ANY ,/* No limitations */ XFRM_SHARE_SESSION ,/* For this session only */
@@ -315,6 +320,7 @@ enum xfrm_attr_type_t {XFRMA_SET_MARK_MASK ,/* __u32 */ XFRMA_IF_ID ,/* __u32 */ XFRMA_MTIMER_THRESH ,/* __u32 in seconds for input SA */ +XFRMA_SA_DIR ,/* __u8 */ __XFRMA_MAX#define XFRMA_OUTPUT_MARK XFRMA_SET_MARK/* Compatibility */
net/xfrm/xfrm_compat.c +5 -2
@@ -98,6 +98,7 @@ static const int compat_msg_min[XFRM_NR_MSGTYPES] = { };static const struct nla_policy compat_policy[XFRMA_MAX +1 ] = { + [XFRMA_UNSPEC ] = { .strict_start_type =XFRMA_SA_DIR }, [XFRMA_SA ] = { .len =XMSGSIZE (compat_xfrm_usersa_info)}, [XFRMA_POLICY ] = { .len =XMSGSIZE (compat_xfrm_userpolicy_info)}, [XFRMA_LASTUSED ] = { .type =NLA_U64 },
@@ -129,6 +130,7 @@ static const struct nla_policy compat_policy[XFRMA_MAX+1] = { [XFRMA_SET_MARK_MASK] = { .type = NLA_U32 }, [XFRMA_IF_ID] = { .type = NLA_U32 }, [XFRMA_MTIMER_THRESH] = { .type = NLA_U32 }, + [XFRMA_SA_DIR] = { .type = NLA_U8} }; static struct nlmsghdr *xfrm_nlmsg_put_compat(struct sk_buff *skb,
@@ -277,9 +279,10 @@ static int xfrm_xlate64_attr(struct sk_buff *dst, const struct nlattr *src)case XFRMA_SET_MARK_MASK :case XFRMA_IF_ID :case XFRMA_MTIMER_THRESH : +case XFRMA_SA_DIR :return xfrm_nla_cpy (dst, src,nla_len (src));default : -BUILD_BUG_ON (XFRMA_MAX !=XFRMA_MTIMER_THRESH ); +BUILD_BUG_ON (XFRMA_MAX !=XFRMA_SA_DIR );pr_warn_once ("unsupported nla_type %d\n" , src->nla_type);return -EOPNOTSUPP ; }
@@ -434,7 +437,7 @@ static int xfrm_xlate32_attr(void *dst, const struct nlattr *nla,int err;if (type >XFRMA_MAX ) { -BUILD_BUG_ON (XFRMA_MAX !=XFRMA_MTIMER_THRESH ); +BUILD_BUG_ON (XFRMA_MAX !=XFRMA_SA_DIR );NL_SET_ERR_MSG (extack,"Bad attribute" );return -EOPNOTSUPP ; }
net/xfrm/xfrm_device.c +6 -0
@@ -253,6 +253,12 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x,return -EINVAL ; } +if ((xuo->flags &XFRM_OFFLOAD_INBOUND && x->dir ==XFRM_SA_DIR_OUT ) || + (!(xuo->flags &XFRM_OFFLOAD_INBOUND ) && x->dir ==XFRM_SA_DIR_IN )) { +NL_SET_ERR_MSG (extack,"Mismatched SA and offload direction" ); +return -EINVAL ; + } + is_packet_offload = xuo->flags &XFRM_OFFLOAD_PACKET ;/* We don't yet support UDP encapsulation and TFC padding. */
net/xfrm/xfrm_state.c +4 -0
@@ -1744,6 +1744,7 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, x->lastused = orig->lastused; x->new_mapping =0 ; x->new_mapping_sport =0 ; + x->dir = orig->dir;return x;
@@ -1857,6 +1858,9 @@ int xfrm_state_update(struct xfrm_state *x)if (!x1) goto out; +if (x1->dir != x->dir) + goto out; +if (xfrm_state_kern (x1)) { to_put = x1; err = -EEXIST ;
net/xfrm/xfrm_user.c +81 -4
152 lines not on this page · raw message
Signature · 1 line
2.30.2
Quoted 7 lines · Antony Antony via Devel
This patch introduces the 'dir' attribute, 'in' or 'out', to the
xfrm_state, SA, enhancing usability by delineating the scope of values based on direction. An input SA will now exclusively encompass values pertinent to input, effectively segregating them from output-related values. This change aims to streamline the configuration process and improve the overall clarity of SA attributes.
Quoted 6 lines
This feature sets the groundwork for future patches, including the upcoming IP-TFS patch.
v7->v8:
- add extra validation check on replay window and seq
-XFRM_MSG_UPDSAold and new SA should match "dir"
Why? Update is add and delete operation, and one can update any field he/she wants, including direction.
Quoted 14 lines
v6->v7:
- add replay-window check non-esn 0 and ESN 1.
- remove :XFRMA_SA_DIR only allowed with HW OFFLOAD
v5->v6:
-XFRMA_SA_DIRonly allowed with HW OFFLOAD
v4->v5:
- add details to commit message
v3->v4:
- improve HW OFFLOAD DIR check add the other direction
Quoted 8 lines
v2->v3:
- delete redundantXFRM_SA_DIR_USE
- use u8 for "dir"
- fix HW OFFLOAD DIR check
v1->v2:
- use .strict_start_type in structnla_policyxfrma_policy
- delete redundantXFRM_SA_DIR_MAXenum
Please put changelog after --- trailer.
Thanks
Quoted 16 lines
Signed-off-by Antony Antony <[email protected]>--- include/net/xfrm.h | 1 + include/uapi/linux/xfrm.h | 6 +++ net/xfrm/xfrm_compat.c | 7 +++- net/xfrm/xfrm_device.c | 6 +++ net/xfrm/xfrm_state.c | 4 ++ net/xfrm/xfrm_user.c | 85 +++++++++++++++++++++++++++++++++++++-- 6 files changed, 103 insertions(+), 6 deletions(-)include/net/xfrm.h +0
-0
include/net/xfrm.h struct xfrm_state { · line 295
Quoted 5 lines
include/net/xfrm.h +1
-0@@ -291,6 +291,7 @@ struct xfrm_state {/* Private data of this transformer, format is opaque, * interpreted by xfrm_type methods. */ void *data; +u8 dir;
};
Quoted 280 lines
include/net/xfrm.h +0
-0static inline struct net *xs_net (struct xfrm_state *x)include/uapi/linux/xfrm.h +6
-0@@ -141,6 +141,11 @@ enum {XFRM_POLICY_MAX =3 }; +enum xfrm_sa_dir { +XFRM_SA_DIR_IN =1 , +XFRM_SA_DIR_OUT =2 +}; +enum {XFRM_SHARE_ANY ,/* No limitations */ XFRM_SHARE_SESSION ,/* For this session only */ @@ -315,6 +320,7 @@ enum xfrm_attr_type_t {XFRMA_SET_MARK_MASK ,/* __u32 */ XFRMA_IF_ID ,/* __u32 */ XFRMA_MTIMER_THRESH ,/* __u32 in seconds for input SA */ +XFRMA_SA_DIR ,/* __u8 */ __XFRMA_MAX#define XFRMA_OUTPUT_MARK XFRMA_SET_MARK/* Compatibility */ net/xfrm/xfrm_compat.c +5
-2@@ -98,6 +98,7 @@ static const int compat_msg_min[XFRM_NR_MSGTYPES] = { };static const struct nla_policy compat_policy[XFRMA_MAX +1 ] = { + [XFRMA_UNSPEC ] = { .strict_start_type =XFRMA_SA_DIR }, [XFRMA_SA ] = { .len =XMSGSIZE (compat_xfrm_usersa_info)}, [XFRMA_POLICY ] = { .len =XMSGSIZE (compat_xfrm_userpolicy_info)}, [XFRMA_LASTUSED ] = { .type =NLA_U64 },@@ -129,6 +130,7 @@ static const struct nla_policy compat_policy[XFRMA_MAX+1] = { [XFRMA_SET_MARK_MASK] = { .type = NLA_U32 }, [XFRMA_IF_ID] = { .type = NLA_U32 }, [XFRMA_MTIMER_THRESH] = { .type = NLA_U32 }, + [XFRMA_SA_DIR] = { .type = NLA_U8} }; static struct nlmsghdr *xfrm_nlmsg_put_compat(struct sk_buff *skb,@@ -277,9 +279,10 @@ static int xfrm_xlate64_attr(struct sk_buff *dst, const struct nlattr *src)case XFRMA_SET_MARK_MASK :case XFRMA_IF_ID :case XFRMA_MTIMER_THRESH : +case XFRMA_SA_DIR :return xfrm_nla_cpy (dst, src,nla_len (src));default : -BUILD_BUG_ON (XFRMA_MAX !=XFRMA_MTIMER_THRESH ); +BUILD_BUG_ON (XFRMA_MAX !=XFRMA_SA_DIR );pr_warn_once ("unsupported nla_type %d\n" , src->nla_type);return -EOPNOTSUPP ; }@@ -434,7 +437,7 @@ static int xfrm_xlate32_attr(void *dst, const struct nlattr *nla,int err;if (type >XFRMA_MAX ) { -BUILD_BUG_ON (XFRMA_MAX !=XFRMA_MTIMER_THRESH ); +BUILD_BUG_ON (XFRMA_MAX !=XFRMA_SA_DIR );NL_SET_ERR_MSG (extack,"Bad attribute" );return -EOPNOTSUPP ; }net/xfrm/xfrm_device.c +6
-0@@ -253,6 +253,12 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x,return -EINVAL ; } +if ((xuo->flags &XFRM_OFFLOAD_INBOUND && x->dir ==XFRM_SA_DIR_OUT ) || + (!(xuo->flags &XFRM_OFFLOAD_INBOUND ) && x->dir ==XFRM_SA_DIR_IN )) { +NL_SET_ERR_MSG (extack,"Mismatched SA and offload direction" ); +return -EINVAL ; + } + is_packet_offload = xuo->flags &XFRM_OFFLOAD_PACKET ;/* We don't yet support UDP encapsulation and TFC padding. */ net/xfrm/xfrm_state.c +4
-0@@ -1744,6 +1744,7 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, x->lastused = orig->lastused; x->new_mapping =0 ; x->new_mapping_sport =0 ; + x->dir = orig->dir;return x;@@ -1857,6 +1858,9 @@ int xfrm_state_update(struct xfrm_state *x)if (!x1) goto out; +if (x1->dir != x->dir) + goto out; +if (xfrm_state_kern (x1)) { to_put = x1; err = -EEXIST ;net/xfrm/xfrm_user.c +81
-4@@ -360,6 +360,55 @@ static int verify_newsa_info(struct xfrm_usersa_info *p, } } +if (attrs[XFRMA_SA_DIR ]) { +u8 sa_dir =nla_get_u8 (attrs[XFRMA_SA_DIR ]); + +if (sa_dir !=XFRM_SA_DIR_IN && sa_dir !=XFRM_SA_DIR_OUT ) { +NL_SET_ERR_MSG (extack,"XFRMA_SA_DIR attribute is out of range" ); + err = -EINVAL ; + goto out; + } + +if (sa_dir ==XFRM_SA_DIR_OUT ) { +if (p->replay_window >0 ) { +NL_SET_ERR_MSG (extack,"Replay window should not be set for OUT SA" ); + err = -EINVAL ; + goto out; + } + +if (attrs[XFRMA_REPLAY_VAL ]) { +struct xfrm_replay_state *rp; + + rp =nla_data (attrs[XFRMA_REPLAY_VAL ]); +if (rp->oseq || rp->seq || rp->bitmap) { +NL_SET_ERR_MSG (extack, +"Replay seq, oseq, or bitmap should not be set for OUT SA with ESN" ); + err = -EINVAL ; + goto out; + } + } + +if (attrs[XFRMA_REPLAY_ESN_VAL ]) { +struct xfrm_replay_state_esn *esn; + + esn =nla_data (attrs[XFRMA_REPLAY_ESN_VAL ]); +if (esn->replay_window >1 ) { +NL_SET_ERR_MSG (extack, +"Replay window should be 1 for OUT SA with ESN" ); + err = -EINVAL ; + goto out; + } + +if (esn->seq || esn->seq_hi || esn->bmp_len) { +NL_SET_ERR_MSG (extack, +"Replay seq, seq_hi, bmp_len should not be set for OUT SA with ESN" ); + err = -EINVAL ; + goto out; + } + } + } + } + out:return err; }@@ -627,6 +676,7 @@ static void xfrm_update_ae_params(struct xfrm_state *x, struct nlattr **attrs,struct nlattr *et = attrs[XFRMA_ETIMER_THRESH ];struct nlattr *rt = attrs[XFRMA_REPLAY_THRESH ];struct nlattr *mt = attrs[XFRMA_MTIMER_THRESH ]; +struct nlattr *dir = attrs[XFRMA_SA_DIR ];if (re && x->replay_esn && x->preplay_esn) {struct xfrm_replay_state_esn *replay_esn;@@ -661,6 +711,9 @@ static void xfrm_update_ae_params(struct xfrm_state *x, struct nlattr **attrs,if (mt) x->mapping_maxage =nla_get_u32 (mt); + +if (dir) + x->dir =nla_get_u8 (dir); }static void xfrm_smark_init (struct nlattr **attrs,struct xfrm_mark *m)@@ -1182,8 +1235,13 @@ static int copy_to_user_state_extra(struct xfrm_state *x,if (ret) goto out; } -if (x->mapping_maxage) +if (x->mapping_maxage) { ret =nla_put_u32 (skb,XFRMA_MTIMER_THRESH , x->mapping_maxage); +if (ret) + goto out; + } +if (x->dir) + ret =nla_put_u8 (skb,XFRMA_SA_DIR , x->dir); out:return ret; }@@ -2402,7 +2460,8 @@ static inline unsigned int xfrm_aevent_msgsize(struct xfrm_state *x) +nla_total_size_64bit (sizeof (struct xfrm_lifetime_cur )) +nla_total_size (sizeof (struct xfrm_mark )) +nla_total_size (4 )/* XFRM_AE_RTHR */ - +nla_total_size (4 );/* XFRM_AE_ETHR */ + +nla_total_size (4 )/* XFRM_AE_ETHR */ + +nla_total_size (sizeof (x->dir));/* XFRMA_SA_DIR */ }static int build_aevent (struct sk_buff *skb,struct xfrm_state *x,const struct km_event *c)@@ -2459,6 +2518,12 @@ static int build_aevent(struct sk_buff *skb, struct xfrm_state *x, const structif (err) goto out_cancel; +if (x->dir) { + err =nla_put_u8 (skb,XFRMA_SA_DIR , x->dir); +if (err) + goto out_cancel; + } +nlmsg_end (skb, nlh);return 0 ;@@ -3018,6 +3083,7 @@ EXPORT_SYMBOL_GPL(xfrm_msg_min);#undef XMSGSIZEconst struct nla_policy xfrma_policy[XFRMA_MAX +1 ] = { + [XFRMA_UNSPEC ] = { .strict_start_type =XFRMA_SA_DIR }, [XFRMA_SA ] = { .len =sizeof (struct xfrm_usersa_info )}, [XFRMA_POLICY ] = { .len =sizeof (struct xfrm_userpolicy_info )}, [XFRMA_LASTUSED ] = { .type =NLA_U64 },@@ -3049,6 +3115,7 @@ const struct nla_policy xfrma_policy[XFRMA_MAX+1] = { [XFRMA_SET_MARK_MASK] = { .type = NLA_U32 }, [XFRMA_IF_ID] = { .type = NLA_U32 }, [XFRMA_MTIMER_THRESH] = { .type = NLA_U32 }, + [XFRMA_SA_DIR] = { .type = NLA_U8 } };EXPORT_SYMBOL_GPL (xfrma_policy);@@ -3189,8 +3256,9 @@ static void xfrm_netlink_rcv(struct sk_buff *skb)static inline unsigned int xfrm_expire_msgsize (void ) { -return NLMSG_ALIGN (sizeof (struct xfrm_user_expire )) - +nla_total_size (sizeof (struct xfrm_mark )); +return NLMSG_ALIGN (sizeof (struct xfrm_user_expire )) + +nla_total_size (sizeof (struct xfrm_mark )) + + nla_total_size(sizeof_field(struct xfrm_state, dir)); }static int build_expire (struct sk_buff *skb,struct xfrm_state *x,const struct km_event *c)@@ -3217,6 +3285,12 @@ static int build_expire(struct sk_buff *skb, struct xfrm_state *x, const structif (err)return err; +if (x->dir) { + err =nla_put_u8 (skb,XFRMA_SA_DIR , x->dir); +if (err) +return err; + } +nlmsg_end (skb, nlh);return 0 ; }@@ -3324,6 +3398,9 @@ static inline unsigned int xfrm_sa_len(struct xfrm_state *x)if (x->mapping_maxage) l +=nla_total_size (sizeof (x->mapping_maxage)); +if (x->dir) + l +=nla_total_size (sizeof (x->dir)); +return l; }Signature · 6 lines
2.30.2 -- Devel mailing list [email protected] https://linux-ipsec.org/mailman/listinfo/devel
PATCH v8 1/1 xfrm: Add Direction to the SA in or out
Quoted 11 lines · Leon Romanovsky via Devel
Quoted 10 lines · Antony Antony via Devel
This patch introduces the 'dir' attribute, 'in' or 'out', to the
xfrm_state, SA, enhancing usability by delineating the scope of values based on direction. An input SA will now exclusively encompass values pertinent to input, effectively segregating them from output-related values. This change aims to streamline the configuration process and improve the overall clarity of SA attributes.This feature sets the groundwork for future patches, including the upcoming IP-TFS patch.
Quoted 6 lines
Quoted 3 lines
v7->v8:
- add extra validation check on replay window and seq
-XFRM_MSG_UPDSAold and new SA should match "dir"Why? Update is add and delete operation, and one can update any field he/she wants, including direction.
Update operations are not strictly necessary without IKEv2. However, during IKEv2 negotiation, updating "in" SA becomes essential.
Here's what I figured out. initially getting confused watching "ip xfrm monitor". During the IKE negotiation, specifically at the IKE_AUTH exchange, userspace calls ALLOCSPI for the "in" SA. The kernel creates an xfrm_state with the allocated SPI but without cryptographic parameters, as user space hasn't added any SAs, either "in" or "out", at this point. Also, userspace hasn't derived crypto and other parameters for the SAs. The negotiation then proceeds. Upon successful negotiation, the "in" SA can only be updated, which is why *swan will send an xfrm update for the "in" SA and add_sa for the "out" SA.
Also, as I understand it, ALLOCSPI states are with:
km.state = XFRM_STATE_VOID
So you won't see it in "ip xfrm state" or in "ip xfrm monitor", just see he Update message. The km.state for ALLOCSPI state can also be XFRM_STATE_ACQ. I haven't seen this exactly in operation. Note in v10 of this patch set I fixed ALLOCSPI to work with DIR and UPDSA.
Quoted 20 lines
Quoted 20 lines
v6->v7:
- add replay-window check non-esn 0 and ESN 1.
- remove :XFRMA_SA_DIR only allowed with HW OFFLOAD
v5->v6:
-XFRMA_SA_DIRonly allowed with HW OFFLOAD
v4->v5:
- add details to commit message
v3->v4:
- improve HW OFFLOAD DIR check add the other direction
v2->v3:
- delete redundantXFRM_SA_DIR_USE
- use u8 for "dir"
- fix HW OFFLOAD DIR check
Quoted 5 lines
Quoted 3 lines
v1->v2:
- use .strict_start_type in structnla_policyxfrma_policy
- delete redundantXFRM_SA_DIR_MAXenumPlease put changelog after --- trailer.
ack! I will be more carefull.
thanks,
-antony
Quoted 298 lines
Quoted 16 lines
Signed-off-by Antony Antony <[email protected]>--- include/net/xfrm.h | 1 + include/uapi/linux/xfrm.h | 6 +++ net/xfrm/xfrm_compat.c | 7 +++- net/xfrm/xfrm_device.c | 6 +++ net/xfrm/xfrm_state.c | 4 ++ net/xfrm/xfrm_user.c | 85 +++++++++++++++++++++++++++++++++++++-- 6 files changed, 103 insertions(+), 6 deletions(-)include/net/xfrm.h +0
-0include/net/xfrm.h struct xfrm_state { · line 295
Quoted 5 lines
include/net/xfrm.h +1
-0@@ -291,6 +291,7 @@ struct xfrm_state {/* Private data of this transformer, format is opaque, * interpreted by xfrm_type methods. */ void *data; +u8 dir;};
Quoted 276 lines
include/net/xfrm.h +0
-0static inline struct net *xs_net (struct xfrm_state *x)include/uapi/linux/xfrm.h +6
-0@@ -141,6 +141,11 @@ enum {XFRM_POLICY_MAX =3 }; +enum xfrm_sa_dir { +XFRM_SA_DIR_IN =1 , +XFRM_SA_DIR_OUT =2 +}; +enum {XFRM_SHARE_ANY ,/* No limitations */ XFRM_SHARE_SESSION ,/* For this session only */ @@ -315,6 +320,7 @@ enum xfrm_attr_type_t {XFRMA_SET_MARK_MASK ,/* __u32 */ XFRMA_IF_ID ,/* __u32 */ XFRMA_MTIMER_THRESH ,/* __u32 in seconds for input SA */ +XFRMA_SA_DIR ,/* __u8 */ __XFRMA_MAX#define XFRMA_OUTPUT_MARK XFRMA_SET_MARK/* Compatibility */ net/xfrm/xfrm_compat.c +5
-2@@ -98,6 +98,7 @@ static const int compat_msg_min[XFRM_NR_MSGTYPES] = { };static const struct nla_policy compat_policy[XFRMA_MAX +1 ] = { + [XFRMA_UNSPEC ] = { .strict_start_type =XFRMA_SA_DIR }, [XFRMA_SA ] = { .len =XMSGSIZE (compat_xfrm_usersa_info)}, [XFRMA_POLICY ] = { .len =XMSGSIZE (compat_xfrm_userpolicy_info)}, [XFRMA_LASTUSED ] = { .type =NLA_U64 },@@ -129,6 +130,7 @@ static const struct nla_policy compat_policy[XFRMA_MAX+1] = { [XFRMA_SET_MARK_MASK] = { .type = NLA_U32 }, [XFRMA_IF_ID] = { .type = NLA_U32 }, [XFRMA_MTIMER_THRESH] = { .type = NLA_U32 }, + [XFRMA_SA_DIR] = { .type = NLA_U8} }; static struct nlmsghdr *xfrm_nlmsg_put_compat(struct sk_buff *skb,@@ -277,9 +279,10 @@ static int xfrm_xlate64_attr(struct sk_buff *dst, const struct nlattr *src)case XFRMA_SET_MARK_MASK :case XFRMA_IF_ID :case XFRMA_MTIMER_THRESH : +case XFRMA_SA_DIR :return xfrm_nla_cpy (dst, src,nla_len (src));default : -BUILD_BUG_ON (XFRMA_MAX !=XFRMA_MTIMER_THRESH ); +BUILD_BUG_ON (XFRMA_MAX !=XFRMA_SA_DIR );pr_warn_once ("unsupported nla_type %d\n" , src->nla_type);return -EOPNOTSUPP ; }@@ -434,7 +437,7 @@ static int xfrm_xlate32_attr(void *dst, const struct nlattr *nla,int err;if (type >XFRMA_MAX ) { -BUILD_BUG_ON (XFRMA_MAX !=XFRMA_MTIMER_THRESH ); +BUILD_BUG_ON (XFRMA_MAX !=XFRMA_SA_DIR );NL_SET_ERR_MSG (extack,"Bad attribute" );return -EOPNOTSUPP ; }net/xfrm/xfrm_device.c +6
-0@@ -253,6 +253,12 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x,return -EINVAL ; } +if ((xuo->flags &XFRM_OFFLOAD_INBOUND && x->dir ==XFRM_SA_DIR_OUT ) || + (!(xuo->flags &XFRM_OFFLOAD_INBOUND ) && x->dir ==XFRM_SA_DIR_IN )) { +NL_SET_ERR_MSG (extack,"Mismatched SA and offload direction" ); +return -EINVAL ; + } + is_packet_offload = xuo->flags &XFRM_OFFLOAD_PACKET ;/* We don't yet support UDP encapsulation and TFC padding. */ net/xfrm/xfrm_state.c +4
-0@@ -1744,6 +1744,7 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, x->lastused = orig->lastused; x->new_mapping =0 ; x->new_mapping_sport =0 ; + x->dir = orig->dir;return x;@@ -1857,6 +1858,9 @@ int xfrm_state_update(struct xfrm_state *x)if (!x1) goto out; +if (x1->dir != x->dir) + goto out; +if (xfrm_state_kern (x1)) { to_put = x1; err = -EEXIST ;net/xfrm/xfrm_user.c +81
-4@@ -360,6 +360,55 @@ static int verify_newsa_info(struct xfrm_usersa_info *p, } } +if (attrs[XFRMA_SA_DIR ]) { +u8 sa_dir =nla_get_u8 (attrs[XFRMA_SA_DIR ]); + +if (sa_dir !=XFRM_SA_DIR_IN && sa_dir !=XFRM_SA_DIR_OUT ) { +NL_SET_ERR_MSG (extack,"XFRMA_SA_DIR attribute is out of range" ); + err = -EINVAL ; + goto out; + } + +if (sa_dir ==XFRM_SA_DIR_OUT ) { +if (p->replay_window >0 ) { +NL_SET_ERR_MSG (extack,"Replay window should not be set for OUT SA" ); + err = -EINVAL ; + goto out; + } + +if (attrs[XFRMA_REPLAY_VAL ]) { +struct xfrm_replay_state *rp; + + rp =nla_data (attrs[XFRMA_REPLAY_VAL ]); +if (rp->oseq || rp->seq || rp->bitmap) { +NL_SET_ERR_MSG (extack, +"Replay seq, oseq, or bitmap should not be set for OUT SA with ESN" ); + err = -EINVAL ; + goto out; + } + } + +if (attrs[XFRMA_REPLAY_ESN_VAL ]) { +struct xfrm_replay_state_esn *esn; + + esn =nla_data (attrs[XFRMA_REPLAY_ESN_VAL ]); +if (esn->replay_window >1 ) { +NL_SET_ERR_MSG (extack, +"Replay window should be 1 for OUT SA with ESN" ); + err = -EINVAL ; + goto out; + } + +if (esn->seq || esn->seq_hi || esn->bmp_len) { +NL_SET_ERR_MSG (extack, +"Replay seq, seq_hi, bmp_len should not be set for OUT SA with ESN" ); + err = -EINVAL ; + goto out; + } + } + } + } + out:return err; }@@ -627,6 +676,7 @@ static void xfrm_update_ae_params(struct xfrm_state *x, struct nlattr **attrs,struct nlattr *et = attrs[XFRMA_ETIMER_THRESH ];struct nlattr *rt = attrs[XFRMA_REPLAY_THRESH ];struct nlattr *mt = attrs[XFRMA_MTIMER_THRESH ]; +struct nlattr *dir = attrs[XFRMA_SA_DIR ];if (re && x->replay_esn && x->preplay_esn) {struct xfrm_replay_state_esn *replay_esn;@@ -661,6 +711,9 @@ static void xfrm_update_ae_params(struct xfrm_state *x, struct nlattr **attrs,if (mt) x->mapping_maxage =nla_get_u32 (mt); + +if (dir) + x->dir =nla_get_u8 (dir); }static void xfrm_smark_init (struct nlattr **attrs,struct xfrm_mark *m)@@ -1182,8 +1235,13 @@ static int copy_to_user_state_extra(struct xfrm_state *x,if (ret) goto out; } -if (x->mapping_maxage) +if (x->mapping_maxage) { ret =nla_put_u32 (skb,XFRMA_MTIMER_THRESH , x->mapping_maxage); +if (ret) + goto out; + } +if (x->dir) + ret =nla_put_u8 (skb,XFRMA_SA_DIR , x->dir); out:return ret; }@@ -2402,7 +2460,8 @@ static inline unsigned int xfrm_aevent_msgsize(struct xfrm_state *x) +nla_total_size_64bit (sizeof (struct xfrm_lifetime_cur )) +nla_total_size (sizeof (struct xfrm_mark )) +nla_total_size (4 )/* XFRM_AE_RTHR */ - +nla_total_size (4 );/* XFRM_AE_ETHR */ + +nla_total_size (4 )/* XFRM_AE_ETHR */ + +nla_total_size (sizeof (x->dir));/* XFRMA_SA_DIR */ }static int build_aevent (struct sk_buff *skb,struct xfrm_state *x,const struct km_event *c)@@ -2459,6 +2518,12 @@ static int build_aevent(struct sk_buff *skb, struct xfrm_state *x, const structif (err) goto out_cancel; +if (x->dir) { + err =nla_put_u8 (skb,XFRMA_SA_DIR , x->dir); +if (err) + goto out_cancel; + } +nlmsg_end (skb, nlh);return 0 ;@@ -3018,6 +3083,7 @@ EXPORT_SYMBOL_GPL(xfrm_msg_min);#undef XMSGSIZEconst struct nla_policy xfrma_policy[XFRMA_MAX +1 ] = { + [XFRMA_UNSPEC ] = { .strict_start_type =XFRMA_SA_DIR }, [XFRMA_SA ] = { .len =sizeof (struct xfrm_usersa_info )}, [XFRMA_POLICY ] = { .len =sizeof (struct xfrm_userpolicy_info )}, [XFRMA_LASTUSED ] = { .type =NLA_U64 },@@ -3049,6 +3115,7 @@ const struct nla_policy xfrma_policy[XFRMA_MAX+1] = { [XFRMA_SET_MARK_MASK] = { .type = NLA_U32 }, [XFRMA_IF_ID] = { .type = NLA_U32 }, [XFRMA_MTIMER_THRESH] = { .type = NLA_U32 }, + [XFRMA_SA_DIR] = { .type = NLA_U8 } };EXPORT_SYMBOL_GPL (xfrma_policy);@@ -3189,8 +3256,9 @@ static void xfrm_netlink_rcv(struct sk_buff *skb)static inline unsigned int xfrm_expire_msgsize (void ) { -return NLMSG_ALIGN (sizeof (struct xfrm_user_expire )) - +nla_total_size (sizeof (struct xfrm_mark )); +return NLMSG_ALIGN (sizeof (struct xfrm_user_expire )) + +nla_total_size (sizeof (struct xfrm_mark )) + + nla_total_size(sizeof_field(struct xfrm_state, dir)); }static int build_expire (struct sk_buff *skb,struct xfrm_state *x,const struct km_event *c)@@ -3217,6 +3285,12 @@ static int build_expire(struct sk_buff *skb, struct xfrm_state *x, const structif (err)return err; +if (x->dir) { + err =nla_put_u8 (skb,XFRMA_SA_DIR , x->dir); +if (err) +return err; + } +nlmsg_end (skb, nlh);return 0 ; }@@ -3324,6 +3398,9 @@ static inline unsigned int xfrm_sa_len(struct xfrm_state *x)if (x->mapping_maxage) l +=nla_total_size (sizeof (x->mapping_maxage)); +if (x->dir) + l +=nla_total_size (sizeof (x->dir)); +return l; }Signature · 1 line
2.30.2
Quoted 16 lines · Antony Antony via Devel
Quoted 15 lines · Leon Romanovsky via Devel
Quoted 13 lines · Antony Antony via Devel
This patch introduces the 'dir' attribute, 'in' or 'out', to the
xfrm_state, SA, enhancing usability by delineating the scope of values based on direction. An input SA will now exclusively encompass values pertinent to input, effectively segregating them from output-related values. This change aims to streamline the configuration process and improve the overall clarity of SA attributes.This feature sets the groundwork for future patches, including the upcoming IP-TFS patch.
v7->v8:
- add extra validation check on replay window and seq
-XFRM_MSG_UPDSAold and new SA should match "dir"
Quoted 5 lines
Quoted 2 lines
Why? Update is add and delete operation, and one can update any field he/she wants, including direction.
Update operations are not strictly necessary without IKEv2. However, during IKEv2 negotiation, updating "in" SA becomes essential.
The thing is if you want to limit update routine to fit IKEv2 only, or continue to allow users to do whatever they want with netlink and their own applications without *swan.
I don't have knowledge about such users, just remember seeking tons of guides how to setup IPsec tunnel with iproute2 and scripts, one of them can be potentially broken by this change.
Thanks
Quoted 23 lines · Leon Romanovsky
Quoted 16 lines · Antony Antony via Devel
Quoted 15 lines · Leon Romanovsky via Devel
Quoted 13 lines · Antony Antony via Devel
This patch introduces the 'dir' attribute, 'in' or 'out', to the
xfrm_state, SA, enhancing usability by delineating the scope of values based on direction. An input SA will now exclusively encompass values pertinent to input, effectively segregating them from output-related values. This change aims to streamline the configuration process and improve the overall clarity of SA attributes.This feature sets the groundwork for future patches, including the upcoming IP-TFS patch.
v7->v8:
- add extra validation check on replay window and seq
-XFRM_MSG_UPDSAold and new SA should match "dir"Quoted 5 lines
Quoted 2 lines
Why? Update is add and delete operation, and one can update any field he/she wants, including direction.
Update operations are not strictly necessary without IKEv2. However, during IKEv2 negotiation, updating "in" SA becomes essential.
Quoted 7 lines
The thing is if you want to limit update routine to fit IKEv2 only, or continue to allow users to do whatever they want with netlink and their own applications without *swan.
I don't have knowledge about such users, just remember seeking tons of guides how to setup IPsec tunnel with iproute2 and scripts, one of them can be potentially broken by this change.
Nothing is going to break with this change. Old scripts and old userspace software are not providing XFRMA_SA_DIR, so none of the new checks apply.
Signature · 1 line
Sabrina
Quoted 28 lines · Sabrina Dubroca
Quoted 27 lines · Leon Romanovsky
Quoted 16 lines · Antony Antony via Devel
Quoted 15 lines · Leon Romanovsky via Devel
Quoted 13 lines · Antony Antony via Devel
This patch introduces the 'dir' attribute, 'in' or 'out', to the
xfrm_state, SA, enhancing usability by delineating the scope of values based on direction. An input SA will now exclusively encompass values pertinent to input, effectively segregating them from output-related values. This change aims to streamline the configuration process and improve the overall clarity of SA attributes.This feature sets the groundwork for future patches, including the upcoming IP-TFS patch.
v7->v8:
- add extra validation check on replay window and seq
-XFRM_MSG_UPDSAold and new SA should match "dir"Quoted 5 lines
Quoted 2 lines
Why? Update is add and delete operation, and one can update any field he/she wants, including direction.
Update operations are not strictly necessary without IKEv2. However, during IKEv2 negotiation, updating "in" SA becomes essential.
The thing is if you want to limit update routine to fit IKEv2 only, or continue to allow users to do whatever they want with netlink and their own applications without *swan.
Quoted 7 lines
Quoted 3 lines
I don't have knowledge about such users, just remember seeking tons of guides how to setup IPsec tunnel with iproute2 and scripts, one of them can be potentially broken by this change.
Nothing is going to break with this change. Old scripts and old userspace software are not providing
XFRMA_SA_DIR, so none of the new checks apply.
Right, but what about new iproute2, which eventually will users get after system update and old scripts?
Thanks
Quoted 5 lines
Signature · 2 lines
-- Sabrina
Quoted 33 lines · Leon Romanovsky
Quoted 32 lines · Sabrina Dubroca
Quoted 30 lines · Leon Romanovsky
Quoted 16 lines · Antony Antony via Devel
Quoted 15 lines · Leon Romanovsky via Devel
Quoted 13 lines · Antony Antony via Devel
This patch introduces the 'dir' attribute, 'in' or 'out', to the
xfrm_state, SA, enhancing usability by delineating the scope of values based on direction. An input SA will now exclusively encompass values pertinent to input, effectively segregating them from output-related values. This change aims to streamline the configuration process and improve the overall clarity of SA attributes.This feature sets the groundwork for future patches, including the upcoming IP-TFS patch.
v7->v8:
- add extra validation check on replay window and seq
-XFRM_MSG_UPDSAold and new SA should match "dir"Quoted 5 lines
Quoted 2 lines
Why? Update is add and delete operation, and one can update any field he/she wants, including direction.
Update operations are not strictly necessary without IKEv2. However, during IKEv2 negotiation, updating "in" SA becomes essential.
The thing is if you want to limit update routine to fit IKEv2 only, or continue to allow users to do whatever they want with netlink and their own applications without *swan.
I don't have knowledge about such users, just remember seeking tons of guides how to setup IPsec tunnel with iproute2 and scripts, one of them can be potentially broken by this change.
Quoted 6 lines
Quoted 3 lines
Nothing is going to break with this change. Old scripts and old userspace software are not providing
XFRMA_SA_DIR, so none of the new checks apply.Right, but what about new iproute2, which eventually will users get after system update and old scripts?
I suspect that new iproute2 will add an option to set the direction (otherwise it'd have to guess a value, that's not the goal of xfrm support in iproute), and only pass XFRMA_SA_DIR when the user gave that extra argument, so nothing will change there either?
Signature · 1 line
Sabrina
Quoted 8 lines · Sabrina Dubroca via Devel
Quoted 2 lines · Leon Romanovsky
Right, but what about new iproute2, which eventually will users get after system update and old scripts?
I suspect that new iproute2 will add an option to set the direction (otherwise it'd have to guess a value, that's not the goal of xfrm support in iproute), and only pass
XFRMA_SA_DIRwhen the user gave that extra argument, so nothing will change there either?
Indeed.
I have a set of iproute2 changes for iptfs, and I was going to update those with the "in"/"out" keyword if it hadn't been added by the time I submit them, I would associate the corresponding iptfs attributes with one of those flags.
I hadn't planned on changing any restrictions for existing iproute2 options/flags as doing so might break user scripts etc :)
Thanks,
Chris.
Quoted 3 lines
--
Sabrina
Quoted 38 lines · Sabrina Dubroca
Quoted 37 lines · Leon Romanovsky
Quoted 35 lines · Sabrina Dubroca
Quoted 23 lines · Leon Romanovsky
Quoted 16 lines · Antony Antony via Devel
Quoted 15 lines · Leon Romanovsky via Devel
Quoted 13 lines · Antony Antony via Devel
This patch introduces the 'dir' attribute, 'in' or 'out', to the
xfrm_state, SA, enhancing usability by delineating the scope of values based on direction. An input SA will now exclusively encompass values pertinent to input, effectively segregating them from output-related values. This change aims to streamline the configuration process and improve the overall clarity of SA attributes.This feature sets the groundwork for future patches, including the upcoming IP-TFS patch.
v7->v8:
- add extra validation check on replay window and seq
-XFRM_MSG_UPDSAold and new SA should match "dir"Quoted 5 lines
Quoted 2 lines
Why? Update is add and delete operation, and one can update any field he/she wants, including direction.
Update operations are not strictly necessary without IKEv2. However, during IKEv2 negotiation, updating "in" SA becomes essential.
Quoted 7 lines
The thing is if you want to limit update routine to fit IKEv2 only, or continue to allow users to do whatever they want with netlink and their own applications without *swan.
I don't have knowledge about such users, just remember seeking tons of guides how to setup IPsec tunnel with iproute2 and scripts, one of them can be potentially broken by this change.
Nothing is going to break with this change. Old scripts and old userspace software are not providing
XFRMA_SA_DIR, so none of the new checks apply.
Quoted 7 lines
Quoted 2 lines
Right, but what about new iproute2, which eventually will users get after system update and old scripts?
I suspect that new iproute2 will add an option to set the direction (otherwise it'd have to guess a value, that's not the goal of xfrm support in iproute), and only pass
XFRMA_SA_DIRwhen the user gave that extra argument, so nothing will change there either?
Correct, thanks for the clarification.
Quoted 4 lines
Signature · 2 lines
-- Sabrina