summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2010-04-08 11:27:42 -0700
committerDavid S. Miller <davem@davemloft.net>2010-04-08 11:27:42 -0700
commite4077e018b5ead3de9951fc01d8bf12eeeeeefed (patch)
treef360f4ecacba17132c81ac37b6b737f1458f2d02
parent0a5bff744a6263d397f88671ed2f772da9c64989 (diff)
downloadlinux-e4077e018b5ead3de9951fc01d8bf12eeeeeefed.tar.gz
linux-e4077e018b5ead3de9951fc01d8bf12eeeeeefed.tar.bz2
linux-e4077e018b5ead3de9951fc01d8bf12eeeeeefed.zip
xfrm: Fix crashes in xfrm_lookup()
From: Timo Teräs <timo.teras@iki.fi> Happens because CONFIG_XFRM_SUB_POLICY is not enabled, and one of the helper functions I used did unexpected things in that case. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/xfrm.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 625dd61ccbba..cccb049991a9 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -735,19 +735,12 @@ static inline void xfrm_pol_put(struct xfrm_policy *policy)
xfrm_policy_destroy(policy);
}
-#ifdef CONFIG_XFRM_SUB_POLICY
static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols)
{
int i;
for (i = npols - 1; i >= 0; --i)
xfrm_pol_put(pols[i]);
}
-#else
-static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols)
-{
- xfrm_pol_put(pols[0]);
-}
-#endif
extern void __xfrm_state_destroy(struct xfrm_state *);