Commit 1b077ce1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git 


/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2021-06-28

1) Remove an unneeded error assignment in esp4_gro_receive().
   From Yang Li.

2) Add a new byseq state hashtable to find acquire states faster.
   From Sabrina Dubroca.

3) Remove some unnecessary variables in pfkey_create().
   From zuoqilin.

4) Remove the unused description from xfrm_type struct.
   From Florian Westphal.

5) Fix a spelling mistake in the comment of xfrm_state_ok().
   From gushengxian.

6) Replace hdr_off indirections by a small helper function.
   From Florian Westphal.

7) Remove xfrm4_output_finish and xfrm6_output_finish declarations,
   they are not used anymore.From Antony Antony.

8) Remove xfrm replay indirections.
   From Florian Westphal.

Please pull or let me know if there are problems.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 007b312c b5a1d1fe

include/net/netns/xfrm.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct netns_xfrm { 
	struct hlist_head	__rcu *state_bydst;

	struct hlist_head	__rcu *state_bysrc;

	struct hlist_head	__rcu *state_byspi;

	struct hlist_head	__rcu *state_byseq;

	unsigned int		state_hmask;

	unsigned int		state_num;

	struct work_struct	state_hash_work;

include/net/xfrm.h

+15 −22
Original line number Diff line number Diff line
@@ -145,6 +145,12 @@ enum { 
	XFRM_MODE_FLAG_TUNNEL = 1,

};



enum xfrm_replay_mode {

	XFRM_REPLAY_MODE_LEGACY,

	XFRM_REPLAY_MODE_BMP,

	XFRM_REPLAY_MODE_ESN,

};



/* Full description of state of transformer. */

struct xfrm_state {

	possible_net_t		xs_net;
@@ -154,6 +160,7 @@ struct xfrm_state { 
	};

	struct hlist_node	bysrc;

	struct hlist_node	byspi;

	struct hlist_node	byseq;



	refcount_t		refcnt;

	spinlock_t		lock;
@@ -214,9 +221,8 @@ struct xfrm_state { 
	struct xfrm_replay_state preplay;

	struct xfrm_replay_state_esn *preplay_esn;



	/* The functions for replay detection. */

	const struct xfrm_replay *repl;



	/* replay detection mode */

	enum xfrm_replay_mode    repl_mode;

	/* internal flag that only holds state for delayed aevent at the

	 * moment

	*/
@@ -296,18 +302,6 @@ struct km_event { 
	struct net *net;

};



struct xfrm_replay {

	void	(*advance)(struct xfrm_state *x, __be32 net_seq);

	int	(*check)(struct xfrm_state *x,

			 struct sk_buff *skb,

			 __be32 net_seq);

	int	(*recheck)(struct xfrm_state *x,

			   struct sk_buff *skb,

			   __be32 net_seq);

	void	(*notify)(struct xfrm_state *x, int event);

	int	(*overflow)(struct xfrm_state *x, struct sk_buff *skb);

};



struct xfrm_if_cb {

	struct xfrm_if	*(*decode_session)(struct sk_buff *skb,

					   unsigned short family);
@@ -387,7 +381,6 @@ void xfrm_flush_gc(void); 
void xfrm_state_delete_tunnel(struct xfrm_state *x);



struct xfrm_type {

	char			*description;

	struct module		*owner;

	u8			proto;

	u8			flags;
@@ -402,14 +395,12 @@ struct xfrm_type { 
	int			(*output)(struct xfrm_state *, struct sk_buff *pskb);

	int			(*reject)(struct xfrm_state *, struct sk_buff *,

					  const struct flowi *);

	int			(*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **);

};



int xfrm_register_type(const struct xfrm_type *type, unsigned short family);

void xfrm_unregister_type(const struct xfrm_type *type, unsigned short family);



struct xfrm_type_offload {

	char		*description;

	struct module	*owner;

	u8		proto;

	void		(*encap)(struct xfrm_state *, struct sk_buff *pskb);
@@ -1582,7 +1573,6 @@ static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi) 
}



int xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb);

int xfrm4_output_finish(struct sock *sk, struct sk_buff *skb);

int xfrm4_protocol_register(struct xfrm4_protocol *handler, unsigned char protocol);

int xfrm4_protocol_deregister(struct xfrm4_protocol *handler, unsigned char protocol);

int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family);
@@ -1606,9 +1596,6 @@ int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family) 
__be32 xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr);

__be32 xfrm6_tunnel_spi_lookup(struct net *net, const xfrm_address_t *saddr);

int xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb);

int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb);

int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,

			  u8 **prevhdr);



#ifdef CONFIG_XFRM

void xfrm6_local_rxpmtu(struct sk_buff *skb, u32 mtu);
@@ -1722,6 +1709,12 @@ static inline int xfrm_policy_id2dir(u32 index) 
}



#ifdef CONFIG_XFRM

void xfrm_replay_advance(struct xfrm_state *x, __be32 net_seq);

int xfrm_replay_check(struct xfrm_state *x, struct sk_buff *skb, __be32 net_seq);

void xfrm_replay_notify(struct xfrm_state *x, int event);

int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb);

int xfrm_replay_recheck(struct xfrm_state *x, struct sk_buff *skb, __be32 net_seq);



static inline int xfrm_aevent_is_on(struct net *net)

{

	struct sock *nlsk;

net/ipv4/ah4.c

+0 −1
Original line number Diff line number Diff line
@@ -554,7 +554,6 @@ static int ah4_rcv_cb(struct sk_buff *skb, int err) 


static const struct xfrm_type ah_type =

{

	.description	= "AH4",

	.owner		= THIS_MODULE,

	.proto	     	= IPPROTO_AH,

	.flags		= XFRM_TYPE_REPLAY_PROT,

net/ipv4/esp4.c

+0 −1
Original line number Diff line number Diff line
@@ -1198,7 +1198,6 @@ static int esp4_rcv_cb(struct sk_buff *skb, int err) 


static const struct xfrm_type esp_type =

{

	.description	= "ESP4",

	.owner		= THIS_MODULE,

	.proto	     	= IPPROTO_ESP,

	.flags		= XFRM_TYPE_REPLAY_PROT,

net/ipv4/esp4_offload.c

+1 −3
Original line number Diff line number Diff line
@@ -33,12 +33,11 @@ static struct sk_buff *esp4_gro_receive(struct list_head *head, 
	struct xfrm_state *x;

	__be32 seq;

	__be32 spi;

	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);
@@ -343,7 +342,6 @@ static const struct net_offload esp4_offload = { 
};



static const struct xfrm_type_offload esp_type_offload = {

	.description	= "ESP4 OFFLOAD",

	.owner		= THIS_MODULE,

	.proto	     	= IPPROTO_ESP,

	.input_tail	= esp_input_tail,