Commit 9c70f1a7 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 



Steffen Klassert says:

====================
pull request (net): ipsec 2018-01-11

1) Don't allow to change the encap type on state updates.
   The encap type is set on state initialization and
   should not change anymore. From Herbert Xu.

2) Skip dead policies when rehashing to fix a
   slab-out-of-bounds bug in xfrm_hash_rebuild.
   From Florian Westphal.

3) Two buffer overread fixes in pfkey.
   From Eric Biggers.

4) Fix rcu usage in xfrm_get_type_offload,
   request_module can sleep, so can't be used
   under rcu_read_lock. From Sabrina Dubroca.

5) Fix an uninitialized lock in xfrm_trans_queue.
   Use __skb_queue_tail instead of skb_queue_tail
   in xfrm_trans_queue as we don't need the lock.
   From Herbert Xu.

6) Currently it is possible to create an xfrm state with an
   unknown encap type in ESP IPv4. Fix this by returning an
   error on unknown encap types. Also from Herbert Xu.

7) Fix sleeping inside a spinlock in xfrm_policy_cache_flush.
   From Florian Westphal.

8) Fix ESP GRO when the headers not fully in the linear part
   of the skb. We need to pull before we can access them.

9) Fix a skb leak on error in key_notify_policy.

10) Fix a race in the xdst pcpu cache, we need to
    run the resolver routines with bottom halfes
    off like the old flowcache did.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1545dec4 76a42011

net/ipv4/esp4.c

+1 −0
Original line number Diff line number Diff line
@@ -981,6 +981,7 @@ static int esp_init_state(struct xfrm_state *x) 


		switch (encap->encap_type) {

		default:

			err = -EINVAL;

			goto error;

		case UDP_ENCAP_ESPINUDP:

			x->props.header_len += sizeof(struct udphdr);

net/ipv4/esp4_offload.c

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ static struct sk_buff **esp4_gro_receive(struct sk_buff **head, 
	__be32 spi;

	int err;



	skb_pull(skb, offset);

	if (!pskb_pull(skb, offset))

		return NULL;



	if ((err = xfrm_parse_spi(skb, IPPROTO_ESP, &spi, &seq)) != 0)

		goto out;

net/ipv6/esp6.c

+1 −2
Original line number Diff line number Diff line
@@ -890,13 +890,12 @@ static int esp6_init_state(struct xfrm_state *x) 
			x->props.header_len += IPV4_BEET_PHMAXLEN +

					       (sizeof(struct ipv6hdr) - sizeof(struct iphdr));

		break;

	default:

	case XFRM_MODE_TRANSPORT:

		break;

	case XFRM_MODE_TUNNEL:

		x->props.header_len += sizeof(struct ipv6hdr);

		break;

	default:

		goto error;

	}



	align = ALIGN(crypto_aead_blocksize(aead), 4);

net/ipv6/esp6_offload.c

+2 −1
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ static struct sk_buff **esp6_gro_receive(struct sk_buff **head, 
	int nhoff;

	int err;



	skb_pull(skb, offset);

	if (!pskb_pull(skb, offset))

		return NULL;



	if ((err = xfrm_parse_spi(skb, IPPROTO_ESP, &spi, &seq)) != 0)

		goto out;

net/key/af_key.c

+11 −1
Original line number Diff line number Diff line
@@ -401,6 +401,11 @@ static int verify_address_len(const void *p) 
#endif

	int len;



	if (sp->sadb_address_len <

	    DIV_ROUND_UP(sizeof(*sp) + offsetofend(typeof(*addr), sa_family),

			 sizeof(uint64_t)))

		return -EINVAL;



	switch (addr->sa_family) {

	case AF_INET:

		len = DIV_ROUND_UP(sizeof(*sp) + sizeof(*sin), sizeof(uint64_t));
@@ -511,6 +516,9 @@ static int parse_exthdrs(struct sk_buff *skb, const struct sadb_msg *hdr, void * 
		uint16_t ext_type;

		int ext_len;



		if (len < sizeof(*ehdr))

			return -EINVAL;



		ext_len  = ehdr->sadb_ext_len;

		ext_len *= sizeof(uint64_t);

		ext_type = ehdr->sadb_ext_type;
@@ -2194,8 +2202,10 @@ static int key_notify_policy(struct xfrm_policy *xp, int dir, const struct km_ev 
		return PTR_ERR(out_skb);



	err = pfkey_xfrm_policy2msg(out_skb, xp, dir);

	if (err < 0)

	if (err < 0) {

		kfree_skb(out_skb);

		return err;

	}



	out_hdr = (struct sadb_msg *) out_skb->data;

	out_hdr->sadb_msg_version = PF_KEY_V2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE