Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87c1e12b authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

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: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Acked-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Acked-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3a5b27bf

include/net/xfrm.h

+2 −1
Original line number Diff line number Diff line
@@ -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);

net/ipv4/xfrm4_policy.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

net/ipv6/xfrm6_policy.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

net/xfrm/xfrm_policy.c

+4 −3
Original line number Diff line number Diff line
@@ -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;