Commit cd5487fb 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 2017-04-28

Just one patch to fix a misplaced spin_unlock_bh in an error path.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cec38191 e892d2d4

net/ipv4/esp4.c

+1 −5
Original line number Diff line number Diff line
@@ -356,11 +356,8 @@ int esp_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info * 
	ivlen = crypto_aead_ivsize(aead);



	tmp = esp_alloc_tmp(aead, esp->nfrags + 2, extralen);

	if (!tmp) {

		spin_unlock_bh(&x->lock);

		err = -ENOMEM;

	if (!tmp)

		goto error;

	}



	extra = esp_tmp_extra(tmp);

	iv = esp_tmp_iv(aead, tmp, extralen);
@@ -389,7 +386,6 @@ int esp_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info * 
		spin_lock_bh(&x->lock);

		if (unlikely(!skb_page_frag_refill(allocsize, pfrag, GFP_ATOMIC))) {

			spin_unlock_bh(&x->lock);

			err = -ENOMEM;

			goto error;

		}

net/ipv6/esp6.c

+1 −5
Original line number Diff line number Diff line
@@ -330,11 +330,8 @@ int esp6_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info 
	ivlen = crypto_aead_ivsize(aead);



	tmp = esp_alloc_tmp(aead, esp->nfrags + 2, seqhilen);

	if (!tmp) {

		spin_unlock_bh(&x->lock);

		err = -ENOMEM;

	if (!tmp)

		goto error;

	}



	seqhi = esp_tmp_seqhi(tmp);

	iv = esp_tmp_iv(aead, tmp, seqhilen);
@@ -362,7 +359,6 @@ int esp6_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info 
		spin_lock_bh(&x->lock);

		if (unlikely(!skb_page_frag_refill(allocsize, pfrag, GFP_ATOMIC))) {

			spin_unlock_bh(&x->lock);

			err = -ENOMEM;

			goto error;

		}