diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:52:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:52:11 -0700 |
| commit | 27e2df2228712af43e657b9768828448c64ba424 (patch) | |
| tree | 1c86905fd366e8af66ea75bfd34a50f7084e0869 /net/xfrm/xfrm_policy.c | |
| parent | c0d6f9663b30a09ed725229b2d50391268c8538e (diff) | |
| parent | e104411b82f5c4d19752c335492036abdbf5880d (diff) | |
| download | linux-stable-27e2df2228712af43e657b9768828448c64ba424.tar.gz linux-stable-27e2df2228712af43e657b9768828448c64ba424.tar.bz2 linux-stable-27e2df2228712af43e657b9768828448c64ba424.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 83c8135e1764..fda737d77edc 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -765,8 +765,8 @@ restart: switch (policy->action) { case XFRM_POLICY_BLOCK: /* Prohibit the flow */ - xfrm_pol_put(policy); - return -EPERM; + err = -EPERM; + goto error; case XFRM_POLICY_ALLOW: if (policy->xfrm_nr == 0) { @@ -782,8 +782,8 @@ restart: */ dst = xfrm_find_bundle(fl, policy, family); if (IS_ERR(dst)) { - xfrm_pol_put(policy); - return PTR_ERR(dst); + err = PTR_ERR(dst); + goto error; } if (dst) |