Commit 5cb0c51f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next 

Steffen Klassert says:

====================
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.

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next:
  xfrm: add extack to xfrm_set_spdinfo
  xfrm: add extack to xfrm_alloc_userspi
  xfrm: add extack to xfrm_do_migrate
  xfrm: add extack to xfrm_new_ae and xfrm_replay_verify_len
  xfrm: add extack to xfrm_del_sa
  xfrm: add extack to xfrm_add_sa_expire
  xfrm: a few coding style clean ups
  xfrm: Remove not-used total variable
  xfrm: update x->lastused for every packet
  esp6: remove redundant variable err
====================

Link: https://lore.kernel.org/r/20221126110303.1859238-1-steffen.klassert@secunet.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b2d7b6e9 b198d7b4

include/net/xfrm.h

+5 −3
Original line number Diff line number Diff line
@@ -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,
@@ -1703,7 +1704,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/ipv6/esp6_offload.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

net/key/af_key.c

+3 −3
Original line number Diff line number Diff line
@@ -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)) {
@@ -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_input.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);