Commit 35db0691 authored Apr 24, 2017 by Xin Long Committed by Steffen Klassert Apr 26, 2017

xfrm: do the garbage collection after flushing policy



Now xfrm garbage collection can be triggered by 'ip xfrm policy del'.
These is no reason not to do it after flushing policies, especially
considering that 'garbage collection deferred' is only triggered
when it reaches gc_thresh.

It's no good that the policy is gone but the xdst still hold there.
The worse thing is that xdst->route/orig_dst is also hold and can
not be released even if the orig_dst is already expired.

This patch is to do the garbage collection if there is any policy
removed in xfrm_policy_flush.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent fd2c83b3

net/xfrm/xfrm_policy.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1006,6 +1006,10 @@ int xfrm_policy_flush(struct net *net, u8 type, bool task_valid)
		err = -ESRCH;
		out:
		spin_unlock_bh(&net->xfrm.xfrm_policy_lock);

		if (cnt)
		xfrm_garbage_collect(net);

		return err;
		}
		EXPORT_SYMBOL(xfrm_policy_flush);

Admin message