Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93b03193 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 2017-10-09

1) Fix some error paths of the IPsec offloading API.

2) Fix a NULL pointer dereference when IPsec is used
   with vti. From Alexey Kodanev.

3) Don't call xfrm_policy_cache_flush under xfrm_state_lock,
   it triggers several locking warnings. From Artem Savkov.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6c0e7284 dd269db8

net/xfrm/xfrm_device.c

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, 
	}



	if (!dev->xfrmdev_ops || !dev->xfrmdev_ops->xdo_dev_state_add) {

		xso->dev = NULL;

		dev_put(dev);

		return 0;

	}

net/xfrm/xfrm_input.c

+4 −2
Original line number Diff line number Diff line
@@ -429,6 +429,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) 
	nf_reset(skb);



	if (decaps) {

		if (skb->sp)

			skb->sp->olen = 0;

		skb_dst_drop(skb);

		gro_cells_receive(&gro_cells, skb);
@@ -440,6 +441,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) 


		err = x->inner_mode->afinfo->transport_finish(skb, xfrm_gro || async);

		if (xfrm_gro) {

			if (skb->sp)

				skb->sp->olen = 0;

			skb_dst_drop(skb);

			gro_cells_receive(&gro_cells, skb);

net/xfrm/xfrm_state.c

+2 −2
Original line number Diff line number Diff line
@@ -732,12 +732,12 @@ int xfrm_state_flush(struct net *net, u8 proto, bool task_valid) 
			}

		}

	}

out:

	spin_unlock_bh(&net->xfrm.xfrm_state_lock);

	if (cnt) {

		err = 0;

		xfrm_policy_cache_flush();

	}

out:

	spin_unlock_bh(&net->xfrm.xfrm_state_lock);

	return err;

}

EXPORT_SYMBOL(xfrm_state_flush);

net/xfrm/xfrm_user.c

+1 −0
Original line number Diff line number Diff line
@@ -657,6 +657,7 @@ static int xfrm_add_sa(struct sk_buff *skb, struct nlmsghdr *nlh, 


	if (err < 0) {

		x->km.state = XFRM_STATE_DEAD;

		xfrm_dev_state_delete(x);

		__xfrm_state_put(x);

		goto out;

	}