Commit 1f8170b0 authored Nov 19, 2007 by Pavel Emelyanov Committed by David S. Miller Nov 19, 2007

[PKTGEN]: Fix double unlock of xfrm_state->lock



The pktgen_output_ipsec() function can unlock this lock twice
due to merged error and plain paths. Remove one of the calls
to spin_unlock.

Other possible solution would be to place "return 0" right 
after the first unlock, but at this place the err is known 
to be 0, so these solutions are the same except for this one
makes the code shorter.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9055fa1f

net/core/pktgen.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2463,8 +2463,6 @@ static int pktgen_output_ipsec(struct sk_buff skb, struct pktgen_dev pkt_dev)

		x->curlft.bytes +=skb->len;
		x->curlft.packets++;
		spin_unlock(&x->lock);

		error:
		spin_unlock(&x->lock);
		return err;

Admin message