Commit 13ead5c4 authored Aug 06, 2017 by Florian Westphal Committed by David S. Miller Aug 07, 2017

xfrm: check that cached bundle is still valid



Quoting Ilan Tayari:
  1. Set up a host-to-host IPSec tunnel (or transport, doesn't matter)
  2. Ping over IPSec, or do something to populate the pcpu cache
  3. Join a MC group, then leave MC group
  4. Try to ping again using same CPU as before -> traffic
     doesn't egress the machine at all

Ilan debugged the problem down to the fact that one of the path dsts
devices point to lo due to earlier dst_dev_put().
In this case, dst is marked as DEAD and we cannot reuse the bundle.

The cache only asserted that the requested policy and that of the cached
bundle match, but its not enough - also verify the path is still valid.

Fixes: ec30d78c ("xfrm: add xdst pcpu cache")
Reported-by: Ayham Masood <ayhamm@mellanox.com>
Tested-by: Ilan Tayari <ilant@mellanox.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d899cb2e

net/xfrm/xfrm_policy.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1818,7 +1818,8 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
		xdst->num_pols == num_pols &&
		!xfrm_pol_dead(xdst) &&
		memcmp(xdst->pols, pols,
		sizeof(struct xfrm_policy ) num_pols) == 0) {
		sizeof(struct xfrm_policy ) num_pols) == 0 &&
		xfrm_bundle_ok(xdst)) {
		dst_hold(&xdst->u.dst);
		return xdst;
		}

Admin message