diff options
Diffstat (limited to 'main/linux-pae/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch')
| -rw-r--r-- | main/linux-pae/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/main/linux-pae/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch b/main/linux-pae/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch new file mode 100644 index 00000000..6f0dc912 --- /dev/null +++ b/main/linux-pae/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch @@ -0,0 +1,46 @@ +From e0c0800740cdf64fe7b121c2ef235c01f1957af0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Thu, 8 Apr 2010 11:27:42 -0700 +Subject: [PATCH 18/18] xfrm: Fix crashes in xfrm_lookup() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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> +(cherry picked from commit e4077e018b5ead3de9951fc01d8bf12eeeeeefed) +--- + include/net/xfrm.h | 7 ------- + 1 files changed, 0 insertions(+), 7 deletions(-) + +diff --git a/include/net/xfrm.h b/include/net/xfrm.h +index d51ef61..280f46f 100644 +--- a/include/net/xfrm.h ++++ b/include/net/xfrm.h +@@ -738,19 +738,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 *); + +-- +1.7.0.2 + |