xfrm: XFRM_MSG_MIGRATE_STATE new netlink message
Subsystems (4)
cover xfrm: XFRM_MSG_MIGRATE_STATE new netlink message
The current XFRM_MSG_MIGRATE interface is tightly coupled to policy and SA migration, and it lacks the information required to reliably migrate individual SAs. This makes it unsuitable for IKEv2 deployments, dual-stack setups (IPv4/IPv6), and scenarios where policies are managed externally (e.g., by other daemons than IKE daemon).
Mandatory SA selector list
The current API requires a non-empty SA selector list, which does not reflect IKEv2 use case. A single Child SA may correspond to multiple policies, and SA discovery already occurs via address and reqid matching. With dual-stack Child SAs this leads to excessive churn: the current method would have to be called up to six times (in/out/fwd × v4/v6) on SA, while the new method only requires two calls. While polices are migrated, first installing a block policy
Selectors lack SPI (and marks)XFRM_MSG_MIGRATE cannot uniquely identify an SA when multiple SAs share the same policies (per-CPU SAs, SELinux label-based SAs, etc.). Without the SPI, the kernel may update the wrong SA instance.
Reqid cannot be changed
Some implementations allocate reqids based on traffic selectors. In host-to-host or selector-changing scenarios, the reqid must change, which the current API cannot express.
Because strongSwan and other implementations manage policies independently of the kernel, an interface that updates only a specific SA — with complete and unambiguous identification — is required.
XFRM_MSG_MIGRATE_STATE provides that interface. It supports migration of a single SA via xfrm_usersa_id (including SPI) and we fix encap removal in this patch set, reqid updates, address changes, and other SA-specific parameters. It avoids the structural limitations of XFRM_MSG_MIGRATE and provides a simpler, extensible mechanism for precise per-SA migration without involving policies.
Antony Antony (5):
xfrm: migrate encap should be set in migrate call
xfrm: rename reqid in xfrm_migrate
xfrm: new method XFRM_MSG_MIGRATE_STATE
xfrm: reqid is invarient in old migration
xfrm: check that SA is in VALID state before use
include/net/xfrm.h | 7 +- include/uapi/linux/xfrm.h | 10 +++ net/key/af_key.c | 10 +-- net/xfrm/xfrm_policy.c | 4 +- net/xfrm/xfrm_replay.c | 16 ++++ net/xfrm/xfrm_state.c | 37 ++++---- net/xfrm/xfrm_user.c | 166 +++++++++++++++++++++++++++++++++++- security/selinux/nlmsgtab.c | 3 +- 8 files changed, 221 insertions(+), 32 deletions(-)
Antony
--
2.39.5
RFC PATCH 1/5 xfrm: migrate encap should be set in migrate call
The existing code does not allow migration from UDP encapsulation to non-encapsulation (ESP). This is useful when migrating from behind a NAT to no NAT, or from IPv4 with NAT to IPv6 without NAT.
With this fix, while migrating state, the existing encap will be copied only if the migrate call includes the encap attribute.
Which fixes tag should I add?
or
--- net/xfrm/xfrm_state.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
net/xfrm/xfrm_state.c +2 -8
@@ -2008,14 +2008,8 @@ static struct xfrm_state *xfrm_state_clone_and_setup(struct xfrm_state *orig, } x->props.calgo = orig->props.calgo; -if (encap || orig->encap) { -if (encap) - x->encap =kmemdup (encap,sizeof (*x->encap), -GFP_KERNEL ); -else - x->encap =kmemdup (orig->encap,sizeof (*x->encap), -GFP_KERNEL ); - +if (encap) { + x->encap =kmemdup (encap,sizeof (*x->encap),GFP_KERNEL );if (!x->encap) goto error; }
Signature · 1 line
2.39.5
RFC PATCH 2/5 xfrm: rename reqid in xfrm_migrate
In reply to Antony AntonyIn prepreation for the following patch rename s/reqid/old_reqid/.
--- include/net/xfrm.h | 2 +- net/key/af_key.c | 10 +++++----- net/xfrm/xfrm_policy.c | 4 ++-- net/xfrm/xfrm_state.c | 6 +++--- net/xfrm/xfrm_user.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-)
include/net/xfrm.h +1 -1
@@ -684,7 +684,7 @@ struct xfrm_migrate {u8 proto;u8 mode;u16 reserved; -u32 reqid; +u32 old_reqid;u16 old_family;u16 new_family; };
net/key/af_key.c +5 -5
@@ -2538,7 +2538,7 @@ static int ipsecrequests_to_migrate(struct sadb_x_ipsecrequest *rq1, int len,if ((mode =pfkey_mode_to_xfrm (rq1->sadb_x_ipsecrequest_mode)) <0 )return -EINVAL ; m->mode = mode; - m->reqid = rq1->sadb_x_ipsecrequest_reqid; + m->old_reqid = rq1->sadb_x_ipsecrequest_reqid;return ((int )(rq1->sadb_x_ipsecrequest_len + rq2->sadb_x_ipsecrequest_len));
@@ -3634,15 +3634,15 @@ static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,if (mode <0 ) goto err;if (set_ipsecrequest (skb, mp->proto, mode, - (mp->reqid ?IPSEC_LEVEL_UNIQUE :IPSEC_LEVEL_REQUIRE ), - mp->reqid, mp->old_family, + (mp->old_reqid ?IPSEC_LEVEL_UNIQUE :IPSEC_LEVEL_REQUIRE ), + mp->old_reqid, mp->old_family, &mp->old_saddr, &mp->old_daddr) <0 ) goto err;/* new ipsecrequest */ if (set_ipsecrequest (skb, mp->proto, mode, - (mp->reqid ?IPSEC_LEVEL_UNIQUE :IPSEC_LEVEL_REQUIRE ), - mp->reqid, mp->new_family, + (mp->old_reqid ?IPSEC_LEVEL_UNIQUE :IPSEC_LEVEL_REQUIRE ), + mp->old_reqid, mp->new_family, &mp->new_saddr, &mp->new_daddr) <0 ) goto err; }
net/xfrm/xfrm_policy.c +2 -2
@@ -4530,7 +4530,7 @@ static int migrate_tmpl_match(const struct xfrm_migrate *m, const struct xfrm_tmint match =0 ;if (t->mode == m->mode && t->id.proto == m->proto && - (m->reqid ==0 || t->reqid == m->reqid)) { + (m->old_reqid ==0 || t->reqid == m->old_reqid)) {switch (t->mode) {case XFRM_MODE_TUNNEL :case XFRM_MODE_BEET :
@@ -4624,7 +4624,7 @@ static int xfrm_migrate_check(const struct xfrm_migrate *m, int num_migrate, sizeof(m[i].old_saddr)) && m[i].proto == m[j].proto && m[i].mode == m[j].mode && - m[i].reqid == m[j].reqid && + m[i].old_reqid == m[j].old_reqid && m[i].old_family == m[j].old_family) {NL_SET_ERR_MSG (extack,"Entries in the MIGRATE attribute's list must be unique" );return -EINVAL ;
net/xfrm/xfrm_state.c +3 -3
@@ -2079,14 +2079,14 @@ struct xfrm_state *xfrm_migrate_state_find(struct xfrm_migrate *m, struct net *nspin_lock_bh (&net->xfrm.xfrm_state_lock); -if (m->reqid) { +if (m->old_reqid) { h =xfrm_dst_hash (net, &m->old_daddr, &m->old_saddr, - m->reqid, m->old_family); + m->old_reqid, m->old_family);hlist_for_each_entry (x, net->xfrm.state_bydst+h, bydst) {if (x->props.mode != m->mode || x->id.proto != m->proto)continue ; -if (m->reqid && x->props.reqid != m->reqid) +if (m->old_reqid && x->props.reqid != m->old_reqid)continue ;if (if_id !=0 && x->if_id != if_id)continue ;
net/xfrm/xfrm_user.c +2 -2
@@ -3081,7 +3081,7 @@ static int copy_from_user_migrate(struct xfrm_migrate *ma, ma->proto = um->proto; ma->mode = um->mode; - ma->reqid = um->reqid; + ma->old_reqid = um->reqid; ma->old_family = um->old_family; ma->new_family = um->new_family;
@@ -3164,7 +3164,7 @@ static int copy_to_user_migrate(const struct xfrm_migrate *m, struct sk_buff *skmemset (&um,0 ,sizeof (um)); um.proto = m->proto; um.mode = m->mode; - um.reqid = m->reqid; + um.reqid = m->old_reqid; um.old_family = m->old_family;memcpy (&um.old_daddr, &m->old_daddr,sizeof (um.old_daddr));memcpy (&um.old_saddr, &m->old_saddr,sizeof (um.old_saddr));
Signature · 1 line
2.39.5
RFC PATCH 3/5 xfrm: new method XFRM_MSG_MIGRATE_STATE
In reply to Antony Antonynew method to support single xfrm_state migration. Besides exiting migration (SA + policy), this also support changing reqid.
--- include/net/xfrm.h | 5 +- include/uapi/linux/xfrm.h | 10 +++ net/xfrm/xfrm_replay.c | 16 ++++ net/xfrm/xfrm_state.c | 18 ++-- net/xfrm/xfrm_user.c | 161 +++++++++++++++++++++++++++++++++++- security/selinux/nlmsgtab.c | 3 +- 6 files changed, 202 insertions(+), 11 deletions(-)
include/net/xfrm.h +3 -2
@@ -685,6 +685,7 @@ struct xfrm_migrate {u8 mode;u16 reserved;u32 old_reqid; +u32 new_reqid;u16 old_family;u16 new_family; };
@@ -1906,6 +1907,7 @@ int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, struct xfrm_encap_tmpl *encap, u32 if_id, struct netlink_ext_ack *extack, struct xfrm_user_offload *xuo); +void xfrm_sync_oseq (struct xfrm_state *x,struct xfrm_state *orig);#endif int km_new_mapping (struct xfrm_state *x,xfrm_address_t *ipaddr,__be16 sport);
@@ -2011,8 +2013,7 @@ static inline unsigned int xfrm_replay_state_esn_len(struct xfrm_replay_state_es }#ifdef CONFIG_XFRM_MIGRATE -static inline int xfrm_replay_clone (struct xfrm_state *x, -struct xfrm_state *orig) +static inline int xfrm_replay_clone (struct xfrm_state *x,struct xfrm_state *orig) { x->replay_esn = kmemdup(orig->replay_esn,
include/uapi/linux/xfrm.h +10 -0
@@ -227,6 +227,8 @@ enum {#define XFRM_MSG_SETDEFAULT XFRM_MSG_SETDEFAULT XFRM_MSG_GETDEFAULT,#define XFRM_MSG_GETDEFAULT XFRM_MSG_GETDEFAULT + XFRM_MSG_MIGRATE_STATE, +#define XFRM_MSG_MIGRATE_STATE XFRM_MSG_MIGRATE_STATE __XFRM_MSG_MAX };#define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)
@@ -507,6 +509,14 @@ struct xfrm_user_migrate {__u16 new_family; }; +struct xfrm_user_migrate_state { +struct xfrm_usersa_id id; +xfrm_address_t new_saddr; +xfrm_address_t new_daddr; +__u16 new_family; +__u32 new_reqid; +}; +struct xfrm_user_mapping {struct xfrm_usersa_id id;__u32 reqid;
net/xfrm/xfrm_replay.c +16 -0
@@ -797,3 +797,19 @@ int xfrm_init_replay(struct xfrm_state *x, struct netlink_ext_ack *extack)return 0 ; }EXPORT_SYMBOL (xfrm_init_replay); + +void xfrm_sync_oseq (struct xfrm_state *x,struct xfrm_state *orig) +{ +switch (x->repl_mode) { +case XFRM_REPLAY_MODE_LEGACY : + x->replay.oseq = orig->replay.oseq; +break ; + +case XFRM_REPLAY_MODE_BMP : +case XFRM_REPLAY_MODE_ESN : + x->replay_esn->oseq = orig->replay_esn->oseq; + x->replay_esn->oseq_hi = orig->replay_esn->oseq_hi; +break ; + } +} +EXPORT_SYMBOL (xfrm_sync_oseq);
net/xfrm/xfrm_state.c +11 -7
@@ -1966,7 +1966,8 @@ static inline int clone_security(struct xfrm_state *x, struct xfrm_sec_ctx *secustatic struct xfrm_state *xfrm_state_clone_and_setup (struct xfrm_state *orig,struct xfrm_encap_tmpl *encap, -struct xfrm_migrate *m) +struct xfrm_migrate *m, +struct netlink_ext_ack *extack) {struct net *net =xs_net (orig);struct xfrm_state *x =xfrm_state_alloc (net);
@@ -1978,7 +1979,6 @@ static struct xfrm_state *xfrm_state_clone_and_setup(struct xfrm_state *orig,memcpy (&x->lft, &orig->lft,sizeof (x->lft)); x->props.mode = orig->props.mode; x->props.replay_window = orig->props.replay_window; - x->props.reqid = orig->props.reqid; x->props.saddr = orig->props.saddr;if (orig->aalg) {
@@ -2058,7 +2058,10 @@ static struct xfrm_state *xfrm_state_clone_and_setup(struct xfrm_state *orig, goto error; } - +if (orig->props.reqid != m->new_reqid) + x->props.reqid = m->new_reqid; +else + x->props.reqid = orig->props.reqid; x->props.family = m->new_family;memcpy (&x->id.daddr, &m->new_daddr,sizeof (x->id.daddr));memcpy (&x->props.saddr, &m->new_saddr,sizeof (x->props.saddr));
@@ -2132,7 +2135,7 @@ struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x, {struct xfrm_state *xc; - xc =xfrm_state_clone_and_setup (x, encap, m); + xc =xfrm_state_clone_and_setup (x, encap, m, extack);if (!xc)return NULL ;
@@ -2144,9 +2147,10 @@ struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x, goto error;/* add state */ -if (xfrm_addr_equal (&x->id.daddr, &m->new_daddr, m->new_family)) { -/* a care is needed when the destination address of the -state is to be updated as it is a part of triplet */ +if (xfrm_addr_equal (&x->id.daddr, &m->new_daddr, m->new_family) || + x->props.reqid != xc->props.reqid) { +/* a care is needed when the destination address or the reqid +* of the state is to be updated as it is a part of triplet */ xfrm_state_insert (xc); }else {if (xfrm_state_add (xc) <0 )
net/xfrm/xfrm_user.c +160 -1
192 lines not on this page · raw message
security/selinux/nlmsgtab.c +2 -1
@@ -128,6 +128,7 @@ static const struct nlmsg_perm nlmsg_xfrm_perms[] = { { XFRM_MSG_MAPPING, NETLINK_XFRM_SOCKET__NLMSG_READ }, { XFRM_MSG_SETDEFAULT, NETLINK_XFRM_SOCKET__NLMSG_WRITE }, { XFRM_MSG_GETDEFAULT, NETLINK_XFRM_SOCKET__NLMSG_READ }, + { XFRM_MSG_MIGRATE_STATE, NETLINK_XFRM_SOCKET__NLMSG_WRITE }, }; static const struct nlmsg_perm nlmsg_audit_perms[] = {
@@ -203,7 +204,7 @@ int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm)* structures at the top of this file with the new mappings * before updating the BUILD_BUG_ON() macro! */ -BUILD_BUG_ON (XFRM_MSG_MAX !=XFRM_MSG_GETDEFAULT ); +BUILD_BUG_ON (XFRM_MSG_MAX !=XFRM_MSG_MIGRATE_STATE );if (selinux_policycap_netlink_xperm ()) { *perm =NETLINK_XFRM_SOCKET__NLMSG ;
Signature · 1 line
2.39.5
RFC PATCH 4/5 xfrm: reqid is invarient in old migration
In reply to Antony AntonyDuring the XFRM_MSG_MIGRATE the reqid remains invariant.
--- net/xfrm/xfrm_state.c | 2 +- net/xfrm/xfrm_user.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
net/xfrm/xfrm_state.c +1 -1
@@ -2148,7 +2148,7 @@ struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x,/* add state */ if (xfrm_addr_equal (&x->id.daddr, &m->new_daddr, m->new_family) || - x->props.reqid != xc->props.reqid) { + x->props.reqid != xc->props.reqid) {/* a care is needed when the destination address or the reqid * of the state is to be updated as it is a part of triplet */ xfrm_state_insert (xc);
net/xfrm/xfrm_user.c +2 -1
@@ -3098,6 +3098,7 @@ static int copy_from_user_migrate(struct xfrm_migrate *ma, ma->proto = um->proto; ma->mode = um->mode; ma->old_reqid = um->reqid; + ma->new_reqid = um->reqid;/* reqid is invariant in XFRM_MSG_MIGRATE */ ma->old_family = um->old_family; ma->new_family = um->new_family;
@@ -3285,7 +3286,7 @@ static int xfrm_do_migrate_state(struct sk_buff *skb, struct nlmsghdr *nlh,xfrm_send_migrate_state (um, encap, xuo); }else {if (extack && !extack->_msg) -NL_SET_ERR_MSG (extack,"State migration clone failed" ); +NL_SET_ERR_MSG (extack,"State migration clone failed" ); err = -EINVAL ; } }else {
Signature · 1 line
2.39.5
RFC PATCH 5/5 xfrm: check that SA is in VALID state before use
In reply to Antony AntonyDuring migration, a state/SA may have been deleted or become invalid. Since skb(s) may still hold a reference to this deleted state, it could be reused inadvertently. Using a migrated SA could result in reusing the same IV for AES-GCM, which must be avoided for an output SA.
Add a check to ensure the state is in XFRM_STATE_VALID before use. This check is useful for both output and input data paths.
Call chain:
xfrm_output_one()
xfrm_state_check_expire()
if (x->km.state != XFRM_STATE_VALID) ---> new check
return -EINVAL;
encapsulate the packet--- net/xfrm/xfrm_state.c | 3 +++ 1 file changed, 3 insertions(+)
net/xfrm/xfrm_state.c +3 -0
@@ -2265,6 +2265,9 @@ EXPORT_SYMBOL(xfrm_state_update);int xfrm_state_check_expire (struct xfrm_state *x) { +if (x->km.state !=XFRM_STATE_VALID ) +return -EINVAL ; +/* All counters which are needed to decide if state is expired * are handled by SW for non-packet offload modes. Simply skip * the following update and save extra boilerplate in drivers.
Signature · 1 line
2.39.5
Steffen Klassert
maintainerRe: [PATCH RFC ipsec-next 1/5] xfrm: migrate encap should be set in migrate call
In reply to Antony AntonyQuoted 11 lines · Antony Antony
The existing code does not allow migration from UDP encapsulation to non-encapsulation (ESP). This is useful when migrating from behind a NAT to no NAT, or from IPv4 with NAT to IPv6 without NAT.
With this fix, while migrating state, the existing encap will be copied only if the migrate call includes the encap attribute.
Which fixes tag should I add?
Fixes 80c9abaabf42 ("[XFRM]: Extension for dynamic update of endpoint address(es)") ?or
Fixes 4ab47d47af20 ("xfrm: extend MIGRATE with UDP encapsulation port") ?
If this is a fix, it should go to the ipsec tree, not to ipsec-next. But is this really a fix? Do we want to have that backported? It changes the behaviour when the original state used encapsulation.