ipsec: Fix bogus bundle flowi

herbertx · davem330 · commit 87c1e12b5eeb · 2010-03-03T01:04:37.000-08:00
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 &lt;hadi@cyberus.ca&gt;
Signed-off-by: Herbert Xu &lt;herbert@gondor.apana.org.au&gt;
Acked-by: Steffen Klassert &lt;steffen.klassert@secunet.com&gt;
Acked-by: Jamal Hadi Salim &lt;hadi@cyberus.ca&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
@@ -275,7 +275,8 @@ struct xfrm_policy_afinfo {
 					     struct dst_entry *dst,
 					     int nfheader_len);
 	int			(*fill_dst)(struct xfrm_dst *xdst,
-					    struct net_device *dev);
+					    struct net_device *dev,
+					    struct flowi *fl);
 };
 
 extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
@@ -91,11 +91,12 @@ static int xfrm4_init_path(struct xfrm_dst *path, struct dst_entry *dst,
 	return 0;
 }
 
-static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev)
+static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
+			  struct flowi *fl)
 {
 	struct rtable *rt = (struct rtable *)xdst->route;
 
-	xdst->u.rt.fl = rt->fl;
+	xdst->u.rt.fl = *fl;
 
 	xdst->u.dst.dev = dev;
 	dev_hold(dev);
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
@@ -116,7 +116,8 @@ static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst,
 	return 0;
 }
 
-static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev)
+static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
+			  struct flowi *fl)
 {
 	struct rt6_info *rt = (struct rt6_info*)xdst->route;
 
diff --git 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 =
 		xfrm_policy_get_afinfo(xdst->u.dst.ops->family);
@@ -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);
 
 	xfrm_policy_put_afinfo(afinfo);
 
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -91,11 +91,12 @@ static int xfrm4_init_path(struct xfrm_dst path, struct dst_entry dst,`
`91`	`91`	`return 0;`
`92`	`92`	`}`
`93`	`93`
`94`		`-static int xfrm4_fill_dst(struct xfrm_dst xdst, struct net_device dev)`
	`94`	`+static int xfrm4_fill_dst(struct xfrm_dst xdst, struct net_device dev,`
	`95`	`+ struct flowi *fl)`
`95`	`96`	`{`
`96`	`97`	`struct rtable rt = (struct rtable )xdst->route;`
`97`	`98`
`98`		`- xdst->u.rt.fl = rt->fl;`
	`99`	`+ xdst->u.rt.fl = *fl;`
`99`	`100`
`100`	`101`	`xdst->u.dst.dev = dev;`
`101`	`102`	`dev_hold(dev);`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,8 @@ static int xfrm6_init_path(struct xfrm_dst path, struct dst_entry dst,`
`116`	`116`	`return 0;`
`117`	`117`	`}`
`118`	`118`
`119`		`-static int xfrm6_fill_dst(struct xfrm_dst xdst, struct net_device dev)`
	`119`	`+static int xfrm6_fill_dst(struct xfrm_dst xdst, struct net_device dev,`
	`120`	`+ struct flowi *fl)`
`120`	`121`	`{`
`121`	`122`	`struct rt6_info rt = (struct rt6_info)xdst->route;`
`122`	`123`