Commit 1ecafede authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller

[IPSEC]: Remove bogus ref count in xfrm_secpath_reject

Constructs of the form

	xfrm_state_hold(x);
	foo(x);
	xfrm_state_put(x);

tend to be broken because foo is either synchronous where this is totally
unnecessary or if foo is asynchronous then the reference count is in the
wrong spot.

In the case of xfrm_secpath_reject, the function is synchronous and therefore
we should just kill the reference count.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32f0c4cb
...@@ -1682,17 +1682,13 @@ static inline int ...@@ -1682,17 +1682,13 @@ static inline int
xfrm_secpath_reject(int idx, struct sk_buff *skb, struct flowi *fl) xfrm_secpath_reject(int idx, struct sk_buff *skb, struct flowi *fl)
{ {
struct xfrm_state *x; struct xfrm_state *x;
int err;
if (!skb->sp || idx < 0 || idx >= skb->sp->len) if (!skb->sp || idx < 0 || idx >= skb->sp->len)
return 0; return 0;
x = skb->sp->xvec[idx]; x = skb->sp->xvec[idx];
if (!x->type->reject) if (!x->type->reject)
return 0; return 0;
xfrm_state_hold(x); return x->type->reject(x, skb, fl);
err = x->type->reject(x, skb, fl);
xfrm_state_put(x);
return err;
} }
/* When skb is transformed back to its "native" form, we have to /* When skb is transformed back to its "native" form, we have to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment