pull request (net-next): ipsec-next 2022-11-26
Subsystems (3)
Steffen Klassert
maintainercover pull request (net-next): ipsec-next 2022-11-26
1) Remove redundant variable in esp6.
From Colin Ian King.
2) Update x->lastused for every packet. It was used only for outgoing mobile IPv6 packets, but showed to be usefull to check if the a SA is still in use in general. From Antony Antony.
3) Remove unused variable in xfrm_byidx_resize.
From Leon Romanovsky.
4) Finalize extack support for xfrm.
From Sabrina Dubroca.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit e2ac2a00dae10997b71870ecf26ca69f4d726537:
enic: define constants for legacy interrupts offset (2022-10-18 19:34:28 -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 b198d7b40ad946206217224b8379626a089f73ed:
Merge branch 'xfrm: add extack support to some more message types' (2022-11-26 11:32:19 +0100)
----------------------------------------------------------------
Antony Antony (1):
xfrm: update x->lastused for every packet
Colin Ian King (1):
esp6: remove redundant variable err
Leon Romanovsky (1):
xfrm: Remove not-used total variable
Sabrina Dubroca (7):
xfrm: a few coding style clean ups
xfrm: add extack to xfrm_add_sa_expire
xfrm: add extack to xfrm_del_sa
xfrm: add extack to xfrm_new_ae and xfrm_replay_verify_len
xfrm: add extack to xfrm_do_migrate
xfrm: add extack to xfrm_alloc_userspi
xfrm: add extack to xfrm_set_spdinfo
Steffen Klassert (1):
Merge branch 'xfrm: add extack support to some more message types'
include/net/xfrm.h | 8 +++-- net/ipv6/esp6_offload.c | 3 +- net/key/af_key.c | 6 ++-- net/xfrm/xfrm_input.c | 1 + net/xfrm/xfrm_output.c | 3 +- net/xfrm/xfrm_policy.c | 37 +++++++++++++++------- net/xfrm/xfrm_state.c | 21 ++++++++++--- net/xfrm/xfrm_user.c | 84 +++++++++++++++++++++++++++++++++++-------------- 8 files changed, 114 insertions(+), 49 deletions(-)
Steffen Klassert
maintainerPATCH 1/10 esp6: remove redundant variable err
From: Colin Ian King <[email protected]>
Variable err is being assigned a value that is not read, the assignment is redundant and so is the variable. Remove it.
Cleans up clang scan warning:net/ipv6/esp6_offload.c:64:7: warning: Although the value stored to 'err' is used in the enclosing expression, the value is never actually read from 'err' [deadcode.DeadStores]
--- net/ipv6/esp6_offload.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/ipv6/esp6_offload.c +1 -2
@@ -56,12 +56,11 @@ static struct sk_buff *esp6_gro_receive(struct list_head *head,__be32 seq;__be32 spi;int nhoff; -int err;if (!pskb_pull (skb, offset))return NULL ; -if ((err =xfrm_parse_spi (skb,IPPROTO_ESP , &spi, &seq)) !=0 ) +if (xfrm_parse_spi (skb,IPPROTO_ESP , &spi, &seq) !=0 ) goto out; xo =xfrm_offload (skb);
Signature · 1 line
2.25.1
Re: [PATCH 01/10] esp6: remove redundant variable err
This series was applied to netdev/net-next.git (master) by Steffen Klassert <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Steffen Klassert <[email protected]>:
Quoted 11 lines · On Sat, 26 Nov 2022 12:02:54 +0100 you wrote:
From: Colin Ian King <[email protected]>
Variable err is being assigned a value that is not read, the assignment is redundant and so is the variable. Remove it.
Cleans up clang scan warning:
net/ipv6/esp6_offload.c:64:7: warning: Although the value stored to 'err' is used in the enclosing expression, the value is never actually read from 'err' [deadcode.DeadStores][...]
Here is the summary with links:
- [01/10] esp6: remove redundant variable err
https://git.kernel.org/netdev/net-next/c/e91001bae0d1 - [02/10] xfrm: update x->lastused for every packet https://git.kernel.org/netdev/net-next/c/f7fe25a6f005 - [03/10] xfrm: Remove not-used total variable https://git.kernel.org/netdev/net-next/c/cc2bbbfd9a50 - [04/10] xfrm: a few coding style clean ups https://git.kernel.org/netdev/net-next/c/f157c416c51a - [05/10] xfrm: add extack to xfrm_add_sa_expire https://git.kernel.org/netdev/net-next/c/a25b19f36f92 - [06/10] xfrm: add extack to xfrm_del_sa https://git.kernel.org/netdev/net-next/c/880e475d2b0b - [07/10] xfrm: add extack to xfrm_new_ae and xfrm_replay_verify_len https://git.kernel.org/netdev/net-next/c/643bc1a2ee30 - [08/10] xfrm: add extack to xfrm_do_migrate https://git.kernel.org/netdev/net-next/c/bd12240337f4 - [09/10] xfrm: add extack to xfrm_alloc_userspi https://git.kernel.org/netdev/net-next/c/c2dad11e0466 - [10/10] xfrm: add extack to xfrm_set_spdinfo https://git.kernel.org/netdev/net-next/c/a74172168009
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/10 xfrm: update x->lastused for every packet
In reply to Steffen KlassertFrom: Antony Antony <[email protected]>
x->lastused was only updated for outgoing mobile IPv6 packet. With this fix update it for every, in and out, packet.
This is useful to check if the a SA is still in use, or when was the last time an SA was used. lastused time of in SA can used to check IPsec path is functional.
--- net/xfrm/xfrm_input.c | 1 + net/xfrm/xfrm_output.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-)
net/xfrm/xfrm_input.c +1 -0
@@ -671,6 +671,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) x->curlft.bytes += skb->len; x->curlft.packets++; + x->lastused =ktime_get_real_seconds ();spin_unlock (&x->lock);
net/xfrm/xfrm_output.c +1 -2
@@ -209,8 +209,6 @@ static int xfrm6_ro_output(struct xfrm_state *x, struct sk_buff *skb)__skb_pull (skb, hdr_len);memmove (ipv6_hdr (skb), iph, hdr_len); - x->lastused =ktime_get_real_seconds (); -return 0 ;#else WARN_ON_ONCE (1 );
@@ -534,6 +532,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err) x->curlft.bytes += skb->len; x->curlft.packets++; + x->lastused =ktime_get_real_seconds ();spin_unlock_bh (&x->lock);
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 3/10 xfrm: Remove not-used total variable
In reply to Steffen KlassertFrom: Leon Romanovsky <[email protected]>
Total variable is not used in xfrm_byidx_resize() and can be safely removed.
--- net/xfrm/xfrm_policy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/xfrm/xfrm_policy.c +2 -2
@@ -605,7 +605,7 @@ static void xfrm_bydst_resize(struct net *net, int dir)xfrm_hash_free (odst, (hmask +1 ) *sizeof (struct hlist_head )); } -static void xfrm_byidx_resize (struct net *net,int total) +static void xfrm_byidx_resize (struct net *net) {unsigned int hmask = net->xfrm.policy_idx_hmask;unsigned int nhashmask =xfrm_new_hash_mask (hmask);
@@ -683,7 +683,7 @@ static void xfrm_hash_resize(struct work_struct *work)xfrm_bydst_resize (net, dir); }if (xfrm_byidx_should_resize (net, total)) -xfrm_byidx_resize (net, total); +xfrm_byidx_resize (net);mutex_unlock (&hash_resize_mutex); }
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 4/10 xfrm: a few coding style clean ups
In reply to Steffen KlassertFrom: Sabrina Dubroca <[email protected]>
--- net/xfrm/xfrm_policy.c | 9 ++++++--- net/xfrm/xfrm_user.c | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-)
net/xfrm/xfrm_policy.c +6 -3
@@ -4414,7 +4414,8 @@ int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,struct xfrm_migrate *mp;/* Stage 0 - sanity checks */ -if ((err =xfrm_migrate_check (m, num_migrate)) <0 ) + err =xfrm_migrate_check (m, num_migrate); +if (err <0 ) goto out;if (dir >=XFRM_POLICY_MAX ) {
@@ -4423,7 +4424,8 @@ int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, }/* Stage 1 - find policy */ -if ((pol =xfrm_migrate_policy_find (sel, dir, type, net, if_id)) ==NULL ) { + pol =xfrm_migrate_policy_find (sel, dir, type, net, if_id); +if (!pol) { err = -ENOENT ; goto out; }
@@ -4445,7 +4447,8 @@ int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, }/* Stage 3 - update policy */ -if ((err =xfrm_policy_migrate (pol, m, num_migrate)) <0 ) + err =xfrm_policy_migrate (pol, m, num_migrate); +if (err <0 ) goto restore_state;/* Stage 4 - delete old state(s) */
net/xfrm/xfrm_user.c +3 -3
@@ -1538,7 +1538,7 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh, &p->info.saddr,1 , family); err = -ENOENT ; -if (x ==NULL ) +if (!x) goto out_noput; err =xfrm_alloc_spi (x, p->min, p->max);
@@ -2718,7 +2718,7 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh,struct xfrm_encap_tmpl *encap =NULL ;u32 if_id =0 ; -if (attrs[XFRMA_MIGRATE ] ==NULL ) +if (!attrs[XFRMA_MIGRATE ])return -EINVAL ; kmp = attrs[XFRMA_KMADDRESS ] ? &km :NULL ;
@@ -2727,7 +2727,7 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh,if (err)return err; - err =copy_from_user_migrate ((struct xfrm_migrate *)m, kmp, attrs, &n); + err =copy_from_user_migrate (m, kmp, attrs, &n);if (err)return err;
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 5/10 xfrm: add extack to xfrm_add_sa_expire
In reply to Steffen KlassertFrom: Sabrina Dubroca <[email protected]>
--- net/xfrm/xfrm_user.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/xfrm/xfrm_user.c +4 -1
@@ -2584,8 +2584,11 @@ static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh,spin_lock_bh (&x->lock); err = -EINVAL ; -if (x->km.state !=XFRM_STATE_VALID ) +if (x->km.state !=XFRM_STATE_VALID ) { +NL_SET_ERR_MSG (extack,"SA must be in VALID state" ); goto out; + } +km_state_expired (x, ue->hard, nlh->nlmsg_pid);if (ue->hard) {
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 6/10 xfrm: add extack to xfrm_del_sa
In reply to Steffen KlassertFrom: Sabrina Dubroca <[email protected]>
--- net/xfrm/xfrm_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_user.c +1 -1
@@ -862,12 +862,12 @@ static int xfrm_del_sa(struct sk_buff *skb, struct nlmsghdr *nlh, goto out;if (xfrm_state_kern (x)) { +NL_SET_ERR_MSG (extack,"SA is in use by tunnels" ); err = -EPERM ; goto out; } err =xfrm_state_delete (x); -if (err <0 ) goto out;
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 7/10 xfrm: add extack to xfrm_new_ae and xfrm_replay_verify_len
In reply to Steffen KlassertFrom: Sabrina Dubroca <[email protected]>
--- net/xfrm/xfrm_user.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-)
net/xfrm/xfrm_user.c +28 -9
@@ -515,7 +515,8 @@ static int attach_aead(struct xfrm_state *x, struct nlattr *rta, }static inline int xfrm_replay_verify_len (struct xfrm_replay_state_esn *replay_esn, -struct nlattr *rp) +struct nlattr *rp, +struct netlink_ext_ack *extack) {struct xfrm_replay_state_esn *up;unsigned int ulen;
@@ -528,13 +529,25 @@ static inline int xfrm_replay_verify_len(struct xfrm_replay_state_esn *replay_es/* Check the overall length and the internal bitmap length to avoid * potential overflow. */ -if (nla_len (rp) < (int )ulen || -xfrm_replay_state_esn_len (replay_esn) != ulen || - replay_esn->bmp_len != up->bmp_len) +if (nla_len (rp) < (int )ulen) { +NL_SET_ERR_MSG (extack,"ESN attribute is too short" );return -EINVAL ; + } -if (up->replay_window > up->bmp_len *sizeof (__u32) *8 ) +if (xfrm_replay_state_esn_len (replay_esn) != ulen) { +NL_SET_ERR_MSG (extack,"New ESN size doesn't match the existing SA's ESN size" );return -EINVAL ; + } + +if (replay_esn->bmp_len != up->bmp_len) { +NL_SET_ERR_MSG (extack,"New ESN bitmap size doesn't match the existing SA's ESN bitmap" ); +return -EINVAL ; + } + +if (up->replay_window > up->bmp_len *sizeof (__u32) *8 ) { +NL_SET_ERR_MSG (extack,"ESN replay window is longer than the bitmap" ); +return -EINVAL ; + }return 0 ; }
@@ -2433,12 +2446,16 @@ static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh,struct nlattr *et = attrs[XFRMA_ETIMER_THRESH ];struct nlattr *rt = attrs[XFRMA_REPLAY_THRESH ]; -if (!lt && !rp && !re && !et && !rt) +if (!lt && !rp && !re && !et && !rt) { +NL_SET_ERR_MSG (extack,"Missing required attribute for AE" );return err; + }/* pedantic mode - thou shalt sayeth replaceth */ -if (!(nlh->nlmsg_flags&NLM_F_REPLACE )) +if (!(nlh->nlmsg_flags &NLM_F_REPLACE )) { +NL_SET_ERR_MSG (extack,"NLM_F_REPLACE flag is required" );return err; + } mark =xfrm_mark_get (attrs, &m);
@@ -2446,10 +2463,12 @@ static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh,if (x ==NULL )return -ESRCH ; -if (x->km.state !=XFRM_STATE_VALID ) +if (x->km.state !=XFRM_STATE_VALID ) { +NL_SET_ERR_MSG (extack,"SA must be in VALID state" ); goto out; + } - err =xfrm_replay_verify_len (x->replay_esn, re); + err =xfrm_replay_verify_len (x->replay_esn, re, extack);if (err) goto out;
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 8/10 xfrm: add extack to xfrm_do_migrate
In reply to Steffen KlassertFrom: Sabrina Dubroca <[email protected]>
--- include/net/xfrm.h | 3 ++- net/key/af_key.c | 2 +- net/xfrm/xfrm_policy.c | 28 ++++++++++++++++++++-------- net/xfrm/xfrm_user.c | 16 +++++++++++----- 4 files changed, 34 insertions(+), 15 deletions(-)
include/net/xfrm.h +2 -1
@@ -1703,7 +1703,8 @@ struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x,int xfrm_migrate (const struct xfrm_selector *sel,u8 dir,u8 type,struct xfrm_migrate *m,int num_bundles,struct xfrm_kmaddress *k,struct net *net, -struct xfrm_encap_tmpl *encap,u32 if_id); +struct xfrm_encap_tmpl *encap,u32 if_id, +struct netlink_ext_ack *extack);#endif int km_new_mapping (struct xfrm_state *x,xfrm_address_t *ipaddr,__be16 sport);
net/key/af_key.c +1 -1
@@ -2626,7 +2626,7 @@ static int pfkey_migrate(struct sock *sk, struct sk_buff *skb, }return xfrm_migrate (&sel, dir,XFRM_POLICY_TYPE_MAIN , m, i, - kma ? &k :NULL , net,NULL ,0 ); + kma ? &k :NULL , net,NULL ,0 ,NULL ); out:return err;
net/xfrm/xfrm_policy.c +20 -8
@@ -4333,7 +4333,8 @@ static int migrate_tmpl_match(const struct xfrm_migrate *m, const struct xfrm_tm/* update endpoint address(es) of template(s) */ static int xfrm_policy_migrate (struct xfrm_policy *pol, -struct xfrm_migrate *m,int num_migrate) +struct xfrm_migrate *m,int num_migrate, +struct netlink_ext_ack *extack) {struct xfrm_migrate *mp;int i, j, n =0 ;
@@ -4341,6 +4342,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,write_lock_bh (&pol->lock);if (unlikely (pol->walk.dead)) {/* target policy has been deleted */ +NL_SET_ERR_MSG (extack,"Target policy not found" );write_unlock_bh (&pol->lock);return -ENOENT ; }
@@ -4372,17 +4374,22 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,return 0 ; } -static int xfrm_migrate_check (const struct xfrm_migrate *m,int num_migrate) +static int xfrm_migrate_check (const struct xfrm_migrate *m,int num_migrate, +struct netlink_ext_ack *extack) {int i, j; -if (num_migrate <1 || num_migrate >XFRM_MAX_DEPTH ) +if (num_migrate <1 || num_migrate >XFRM_MAX_DEPTH ) { +NL_SET_ERR_MSG (extack,"Invalid number of SAs to migrate, must be 0 < num <= XFRM_MAX_DEPTH (6)" );return -EINVAL ; + }for (i =0 ; i < num_migrate; i++) {if (xfrm_addr_any (&m[i].new_daddr, m[i].new_family) || -xfrm_addr_any (&m[i].new_saddr, m[i].new_family)) +xfrm_addr_any (&m[i].new_saddr, m[i].new_family)) { +NL_SET_ERR_MSG (extack,"Addresses in the MIGRATE attribute's list cannot be null" );return -EINVAL ; + }/* check if there is any duplicated entry */ for (j = i +1 ; j < num_migrate; j++) {
@@ -4393,8 +4400,10 @@ static int xfrm_migrate_check(const struct xfrm_migrate *m, int num_migrate) m[i].proto == m[j].proto && m[i].mode == m[j].mode && m[i].reqid == m[j].reqid && - m[i].old_family == m[j].old_family) + 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 ; + } } }
@@ -4404,7 +4413,8 @@ static int xfrm_migrate_check(const struct xfrm_migrate *m, int num_migrate)int xfrm_migrate (const struct xfrm_selector *sel,u8 dir,u8 type,struct xfrm_migrate *m,int num_migrate,struct xfrm_kmaddress *k,struct net *net, -struct xfrm_encap_tmpl *encap,u32 if_id) +struct xfrm_encap_tmpl *encap,u32 if_id, +struct netlink_ext_ack *extack) {int i, err, nx_cur =0 , nx_new =0 ;struct xfrm_policy *pol =NULL ;
@@ -4414,11 +4424,12 @@ int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,struct xfrm_migrate *mp;/* Stage 0 - sanity checks */ - err =xfrm_migrate_check (m, num_migrate); + err =xfrm_migrate_check (m, num_migrate, extack);if (err <0 ) goto out;if (dir >=XFRM_POLICY_MAX ) { +NL_SET_ERR_MSG (extack,"Invalid policy direction" ); err = -EINVAL ; goto out; }
@@ -4426,6 +4437,7 @@ int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,/* Stage 1 - find policy */ pol =xfrm_migrate_policy_find (sel, dir, type, net, if_id);if (!pol) { +NL_SET_ERR_MSG (extack,"Target policy not found" ); err = -ENOENT ; goto out; }
@@ -4447,7 +4459,7 @@ int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, }/* Stage 3 - update policy */ - err =xfrm_policy_migrate (pol, m, num_migrate); + err =xfrm_policy_migrate (pol, m, num_migrate, extack);if (err <0 ) goto restore_state;
net/xfrm/xfrm_user.c +11 -5
@@ -2687,7 +2687,8 @@ static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh,#ifdef CONFIG_XFRM_MIGRATE static int copy_from_user_migrate (struct xfrm_migrate *ma,struct xfrm_kmaddress *k, -struct nlattr **attrs,int *num) +struct nlattr **attrs,int *num, +struct netlink_ext_ack *extack) {struct nlattr *rt = attrs[XFRMA_MIGRATE ];struct xfrm_user_migrate *um;
@@ -2706,8 +2707,10 @@ static int copy_from_user_migrate(struct xfrm_migrate *ma, um =nla_data (rt); num_migrate =nla_len (rt) /sizeof (*um); -if (num_migrate <=0 || num_migrate >XFRM_MAX_DEPTH ) +if (num_migrate <=0 || num_migrate >XFRM_MAX_DEPTH ) { +NL_SET_ERR_MSG (extack,"Invalid number of SAs to migrate, must be 0 < num <= XFRM_MAX_DEPTH (6)" );return -EINVAL ; + }for (i =0 ; i < num_migrate; i++, um++, ma++) {memcpy (&ma->old_daddr, &um->old_daddr,sizeof (ma->old_daddr));
@@ -2740,8 +2743,10 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh,struct xfrm_encap_tmpl *encap =NULL ;u32 if_id =0 ; -if (!attrs[XFRMA_MIGRATE ]) +if (!attrs[XFRMA_MIGRATE ]) { +NL_SET_ERR_MSG (extack,"Missing required MIGRATE attribute" );return -EINVAL ; + } kmp = attrs[XFRMA_KMADDRESS ] ? &km :NULL ;
@@ -2749,7 +2754,7 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh,if (err)return err; - err =copy_from_user_migrate (m, kmp, attrs, &n); + err =copy_from_user_migrate (m, kmp, attrs, &n, extack);if (err)return err;
@@ -2766,7 +2771,8 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh,if (attrs[XFRMA_IF_ID ]) if_id =nla_get_u32 (attrs[XFRMA_IF_ID ]); - err =xfrm_migrate (&pi->sel, pi->dir, type, m, n, kmp, net, encap, if_id); + err =xfrm_migrate (&pi->sel, pi->dir, type, m, n, kmp, net, encap, + if_id, extack);kfree (encap);
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 9/10 xfrm: add extack to xfrm_alloc_userspi
In reply to Steffen KlassertFrom: Sabrina Dubroca <[email protected]>
--- include/net/xfrm.h | 5 +++-- net/key/af_key.c | 4 ++-- net/xfrm/xfrm_state.c | 21 ++++++++++++++++----- net/xfrm/xfrm_user.c | 8 +++++--- 4 files changed, 26 insertions(+), 12 deletions(-)
include/net/xfrm.h +3 -2
@@ -1681,8 +1681,9 @@ struct xfrm_policy *xfrm_policy_byid(struct net *net,int xfrm_policy_flush (struct net *net,u8 type,bool task_valid);void xfrm_policy_hash_rebuild (struct net *net);u32 xfrm_get_acqseq (void ); -int verify_spi_info (u8 proto,u32 min,u32 max); -int xfrm_alloc_spi (struct xfrm_state *x,u32 minspi,u32 maxspi); +int verify_spi_info (u8 proto,u32 min,u32 max,struct netlink_ext_ack *extack); +int xfrm_alloc_spi (struct xfrm_state *x,u32 minspi,u32 maxspi, +struct netlink_ext_ack *extack); struct xfrm_state *xfrm_find_acq(struct net *net, const struct xfrm_mark *mark, u8 mode, u32 reqid, u32 if_id, u8 proto, const xfrm_address_t *daddr,
net/key/af_key.c +2 -2
@@ -1377,13 +1377,13 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, const struct sadb_ max_spi = range->sadb_spirange_max; } - err =verify_spi_info (x->id.proto, min_spi, max_spi); + err =verify_spi_info (x->id.proto, min_spi, max_spi,NULL );if (err) {xfrm_state_put (x);return err; } - err =xfrm_alloc_spi (x, min_spi, max_spi); + err =xfrm_alloc_spi (x, min_spi, max_spi,NULL ); resp_skb = err ?ERR_PTR (err) :pfkey_xfrm_state2msg (x);if (IS_ERR (resp_skb)) {
net/xfrm/xfrm_state.c +16 -5
@@ -2017,7 +2017,7 @@ u32 xfrm_get_acqseq(void) }EXPORT_SYMBOL (xfrm_get_acqseq); -int verify_spi_info (u8 proto,u32 min,u32 max) +int verify_spi_info (u8 proto,u32 min,u32 max,struct netlink_ext_ack *extack) {switch (proto) {case IPPROTO_AH :
@@ -2026,22 +2026,28 @@ int verify_spi_info(u8 proto, u32 min, u32 max)case IPPROTO_COMP :/* IPCOMP spi is 16-bits. */ -if (max >=0x10000 ) +if (max >=0x10000 ) { +NL_SET_ERR_MSG (extack,"IPCOMP SPI must be <= 65535" );return -EINVAL ; + }break ;default : +NL_SET_ERR_MSG (extack,"Invalid protocol, must be one of AH, ESP, IPCOMP" );return -EINVAL ; } -if (min > max) +if (min > max) { +NL_SET_ERR_MSG (extack,"Invalid SPI range: min > max" );return -EINVAL ; + }return 0 ; }EXPORT_SYMBOL (verify_spi_info); -int xfrm_alloc_spi (struct xfrm_state *x,u32 low,u32 high) +int xfrm_alloc_spi (struct xfrm_state *x,u32 low,u32 high, +struct netlink_ext_ack *extack) {struct net *net =xs_net (x);unsigned int h;
@@ -2053,8 +2059,10 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high)u32 mark = x->mark.v & x->mark.m;spin_lock_bh (&x->lock); -if (x->km.state ==XFRM_STATE_DEAD ) +if (x->km.state ==XFRM_STATE_DEAD ) { +NL_SET_ERR_MSG (extack,"Target ACQUIRE is in DEAD state" ); goto unlock; + } err =0 ;if (x->id.spi)
@@ -2065,6 +2073,7 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high)if (minspi == maxspi) { x0 =xfrm_state_lookup (net, mark, &x->id.daddr, minspi, x->id.proto, x->props.family);if (x0) { +NL_SET_ERR_MSG (extack,"Requested SPI is already in use" );xfrm_state_put (x0); goto unlock; }
@@ -2089,6 +2098,8 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high)spin_unlock_bh (&net->xfrm.xfrm_state_lock); err =0 ; + }else { +NL_SET_ERR_MSG (extack,"No SPI available in the requested range" ); } unlock:
net/xfrm/xfrm_user.c +5 -3
@@ -1523,7 +1523,7 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh,u32 if_id =0 ; p =nlmsg_data (nlh); - err =verify_spi_info (p->info.id.proto, p->min, p->max); + err =verify_spi_info (p->info.id.proto, p->min, p->max, extack);if (err) goto out_noput;
@@ -1551,10 +1551,12 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh, &p->info.saddr,1 , family); err = -ENOENT ; -if (!x) +if (!x) { +NL_SET_ERR_MSG (extack,"Target ACQUIRE not found" ); goto out_noput; + } - err =xfrm_alloc_spi (x, p->min, p->max); + err =xfrm_alloc_spi (x, p->min, p->max, extack);if (err) goto out;
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 10/10 xfrm: add extack to xfrm_set_spdinfo
In reply to Steffen KlassertFrom: Sabrina Dubroca <[email protected]>
--- net/xfrm/xfrm_user.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
net/xfrm/xfrm_user.c +12 -4
@@ -1367,20 +1367,28 @@ static int xfrm_set_spdinfo(struct sk_buff *skb, struct nlmsghdr *nlh,if (attrs[XFRMA_SPD_IPV4_HTHRESH ]) {struct nlattr *rta = attrs[XFRMA_SPD_IPV4_HTHRESH ]; -if (nla_len (rta) <sizeof (*thresh4)) +if (nla_len (rta) <sizeof (*thresh4)) { +NL_SET_ERR_MSG (extack,"Invalid SPD_IPV4_HTHRESH attribute length" );return -EINVAL ; + } thresh4 =nla_data (rta); -if (thresh4->lbits >32 || thresh4->rbits >32 ) +if (thresh4->lbits >32 || thresh4->rbits >32 ) { +NL_SET_ERR_MSG (extack,"Invalid hash threshold (must be <= 32 for IPv4)" );return -EINVAL ; + } }if (attrs[XFRMA_SPD_IPV6_HTHRESH ]) {struct nlattr *rta = attrs[XFRMA_SPD_IPV6_HTHRESH ]; -if (nla_len (rta) <sizeof (*thresh6)) +if (nla_len (rta) <sizeof (*thresh6)) { +NL_SET_ERR_MSG (extack,"Invalid SPD_IPV6_HTHRESH attribute length" );return -EINVAL ; + } thresh6 =nla_data (rta); -if (thresh6->lbits >128 || thresh6->rbits >128 ) +if (thresh6->lbits >128 || thresh6->rbits >128 ) { +NL_SET_ERR_MSG (extack,"Invalid hash threshold (must be <= 128 for IPv6)" );return -EINVAL ; + } }if (thresh4 || thresh6) {
Signature · 1 line
2.25.1