lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[XFRM]: Fix crash introduced by struct dst_entry reordering

Browse Source 
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>
This commit is contained in:
Patrick McHardy
2007-07-18 01:55:52 -07:00
committed by David S. Miller
parent 16751347a0
commit bd0bf0765e
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/xfrm.h
View File

@@ -585,7 +585,6 @@ static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ct
struct xfrm_dst struct xfrm_dst
{ {
union { union {
struct xfrm_dst *next;
struct dst_entry dst; struct dst_entry dst;
struct rtable rt; struct rtable rt;
struct rt6_info rt6; struct rt6_info rt6;

2
net/xfrm/xfrm_policy.c
View File

@@ -2141,7 +2141,7 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first,
if (last == first) if (last == first)
break; break;
last = last->u.next; last = (struct xfrm_dst *)last->u.dst.next;
last->child_mtu_cached = mtu; last->child_mtu_cached = mtu;
} }