diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-03-02 02:51:56 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-03 01:04:37 -0800 |
| commit | 87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9 (patch) | |
| tree | 4e30c4d60c21ab5e0346648ed852258a96265288 /net/ipv4 | |
| parent | 3a5b27bf6f29574d667230c7e76e4b83fe3014e0 (diff) | |
| download | linux-87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9.tar.bz2 | |
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 <hadi@cyberus.ca>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Acked-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/xfrm4_policy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index 67107d63c1cd..e4a1483fba77 100644 --- 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); |