path: root/net/xfrm/xfrm_policy.c
diff options
authorHerbert Xu <>2010-03-02 02:51:56 +0000
committerDavid S. Miller <>2010-03-03 01:04:37 -0800
commit87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9 (patch)
tree4e30c4d60c21ab5e0346648ed852258a96265288 /net/xfrm/xfrm_policy.c
parent3a5b27bf6f29574d667230c7e76e4b83fe3014e0 (diff)
ipsec: Fix bogus bundle flowi
When I merged the bundle creation code, I introduced a bogus flowi value in the bundle. Instead of getting from the caller, it was instead set to the flow in the route object, which is totally different. The end result is that the bundles we created never match, and we instead end up with an ever growing bundle list. Thanks to Jamal for find this problem. Reported-by: Jamal Hadi Salim <> Signed-off-by: Herbert Xu <> Acked-by: Steffen Klassert <> Acked-by: Jamal Hadi Salim <> Signed-off-by: David S. Miller <>
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
1 files changed, 4 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 34a5ef8316e7..843e066649cb 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1372,7 +1372,8 @@ static inline int xfrm_init_path(struct xfrm_dst *path, struct dst_entry *dst,
return err;
-static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev)
+static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
+ struct flowi *fl)
struct xfrm_policy_afinfo *afinfo =
@@ -1381,7 +1382,7 @@ static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev)
if (!afinfo)
return -EINVAL;
- err = afinfo->fill_dst(xdst, dev);
+ err = afinfo->fill_dst(xdst, dev, fl);
@@ -1486,7 +1487,7 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy,
for (dst_prev = dst0; dst_prev != dst; dst_prev = dst_prev->child) {
struct xfrm_dst *xdst = (struct xfrm_dst *)dst_prev;
- err = xfrm_fill_dst(xdst, dev);
+ err = xfrm_fill_dst(xdst, dev, fl);
if (err)
goto free_dst;