summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-07-18 02:26:27 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-08-09 14:27:26 -0700
commit3ee0edac473755afa68715acd1d0e569044bae39 (patch)
tree414fc3083b14348dcbf262bd7403cebd775516d8 /include
parentc1bb818242296c121ff574cb1fec2bc0127d6b31 (diff)
downloadlinux-stable-3ee0edac473755afa68715acd1d0e569044bae39.tar.gz
linux-stable-3ee0edac473755afa68715acd1d0e569044bae39.tar.bz2
linux-stable-3ee0edac473755afa68715acd1d0e569044bae39.zip
Fix IPCOMP crashes.
[XFRM]: Fix crash introduced by struct dst_entry reordering XFRM expects xfrm_dst->u.next to be same pointer as dst->next, which was broken by the dst_entry reordering in commit 1e19e02c~, causing an oops in xfrm_bundle_ok when walking the bundle upwards. Kill xfrm_dst->u.next and change the only user to use dst->next instead. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
-rw-r--r--include/net/xfrm.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 311f25af5e1a..4d56e16653a3 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -577,7 +577,6 @@ static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ct
struct xfrm_dst
{
union {
- struct xfrm_dst *next;
struct dst_entry dst;
struct rtable rt;
struct rt6_info rt6;