Commit 29fe3a61 authored by Minwoo Ra's avatar Minwoo Ra Committed by Steffen Klassert
Browse files

xfrm: prevent policy_hthresh.work from racing with netns teardown



A XFRM_MSG_NEWSPDINFO request can queue the per-net work item
policy_hthresh.work onto the system workqueue.

The queued callback, xfrm_hash_rebuild(), retrieves the enclosing
struct net via container_of(). If the net namespace is torn down
before that work runs, the associated struct net may already have
been freed, and xfrm_hash_rebuild() may then dereference stale memory.

xfrm_policy_fini() already flushes policy_hash_work during teardown,
but it does not synchronize policy_hthresh.work.

Synchronize policy_hthresh.work in xfrm_policy_fini() as well, so the
queued work cannot outlive the net namespace teardown and access a
freed struct net.

Fixes: 880a6fab ("xfrm: configure policy hash table thresholds by netlink")
Signed-off-by: default avatarMinwoo Ra <raminwo0202@gmail.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent daf8e3b2
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -4282,6 +4282,8 @@ static void xfrm_policy_fini(struct net *net)
	unsigned int sz;
	int dir;

	disable_work_sync(&net->xfrm.policy_hthresh.work);

	flush_work(&net->xfrm.policy_hash_work);
#ifdef CONFIG_XFRM_SUB_POLICY
	xfrm_policy_flush(net, XFRM_POLICY_TYPE_SUB, false);