[IPSEC]: Add missing BEET checks
Currently BEET mode does not reinject the packet back into the stack like tunnel mode does. Since BEET should behave just like tunnel mode this is incorrect. This patch fixes this by introducing a flags field to xfrm_mode that tells the IPsec code whether it should terminate and reinject the packet back into the stack. It then sets the flag for BEET and tunnel mode. I've also added a number of missing BEET checks elsewhere where we check whether a given mode is a tunnel or not. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
aa5d62cc87
commit
1bfcb10f67
@@ -1940,7 +1940,8 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first,
|
||||
if (xdst->genid != dst->xfrm->genid)
|
||||
return 0;
|
||||
|
||||
if (strict && fl && dst->xfrm->props.mode != XFRM_MODE_TUNNEL &&
|
||||
if (strict && fl &&
|
||||
!(dst->xfrm->mode->flags & XFRM_MODE_FLAG_TUNNEL) &&
|
||||
!xfrm_state_addr_flow_check(dst->xfrm, fl, family))
|
||||
return 0;
|
||||
|
||||
@@ -2291,7 +2292,8 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
|
||||
if (!migrate_tmpl_match(mp, &pol->xfrm_vec[i]))
|
||||
continue;
|
||||
n++;
|
||||
if (pol->xfrm_vec[i].mode != XFRM_MODE_TUNNEL)
|
||||
if (pol->xfrm_vec[i].mode != XFRM_MODE_TUNNEL &&
|
||||
pol->xfrm_vec[i].mode != XFRM_MODE_BEET)
|
||||
continue;
|
||||
/* update endpoints */
|
||||
memcpy(&pol->xfrm_vec[i].id.daddr, &mp->new_daddr,
|
||||
|
Reference in New Issue
Block a user