From: Shakeel Butt <shakeel.butt@linux.dev>
To: Rik van Riel <riel@surriel.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@kernel.org>,
Roman Gushchin <roman.gushchin@linux.dev>,
Muchun Song <muchun.song@linux.dev>,
Andrew Morton <akpm@linux-foundation.org>,
cgroups@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, kernel-team@meta.com
Subject: Re: [PATCH] mm/memcg: fix UAF in drain_all_stock() async work during offline
Date: Thu, 27 Aug 2026 09:57:53 -0700 [thread overview]
Message-ID: <apBsMXzLXltN9MTd@linux.dev> (raw)
In-Reply-To: <20260827124211.3b94b103@fangorn>
On Thu, Aug 27, 2026 at 12:42:11PM -0400, Rik van Riel wrote:
> drain_all_stock() queues drain work on remote CPUs via
> schedule_drain_work() -> queue_work_on(memcg_wq) and returns
> immediately without waiting. The worker, drain_local_memcg_stock()
> / drain_local_obj_stock(), dereferences per-CPU stock caches with
> READ_ONCE(stock->cached[i]) and does css_put() / obj_cgroup_put().
>
> mem_cgroup_css_offline() calls drain_all_stock(memcg) to
> optimize reclamation latency, but never flushes memcg_wq. If
> that races with cgroup removal, free can happen while workers
> are still pending, causing UAF. The drain work could also have
> been queued by somebody else before offline started (e.g. high
> throttling), not just by the offline path itself.
>
> Timeline illustrating the race:
>
> CPU0 (rmdir + offline) CPU1 (charge cache holder)
> ------------------------- ----------------------------
> cgroup_rmdir()
> cgroup_destroy_locked()
> kill_css_sync()
> ...
>
> refill_stock(victim)
> css_get(victim)
> WRITE_ONCE(cached[i]=victim)
>
> percpu_ref kill confirmed, css_killed_ref_fn() called
>
> css_killed_work_fn() [offline_wq]
> mem_cgroup_css_offline(victim)
> drain_all_stock(victim)
> is_memcg_drain_needed()
> READ_ONCE(cached) -> victim
> queue_work_on(CPU1, memcg_wq, work)
> // no flush!
> mem_cgroup_private_id_put()
> css_put() -> refcnt may hit 0
Why would refcnt hit 0? CPU1 stock has a reference.
>
> [RCU GP]
> css_free_rwork_fn()
> mem_cgroup_free(victim)
> // victim struct freed
>
> // worker delayed by scheduler/
> // WQ concurrency
> drain_local_memcg_stock()
> old = READ_ONCE(cached[i])
> // UAF: old == freed victim
> memcg_uncharge(old)
> css_put(&old->css)
>
> Fix by having the offline path wait for the workqueue to be
> done with the memcg, before freeing the memcg.
>
> Found through a code audit with kres.
>
> Fixes: 591edfb10a94 ("mm: drain memcg stocks on css offlining")
> Cc: stable@vger.kernel.org
> Assisted-by: Hermes:muse-spark-1.2 kres
> Signed-off-by: Rik van Riel <riel@surriel.com>
> ---
> mm/memcontrol.c | 29 +++++++++++++++++++++++++----
> 1 file changed, 25 insertions(+), 4 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 6dc4888a90f3..c95a1f6ec799 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -2273,12 +2273,18 @@ static void schedule_drain_work(int cpu, struct work_struct *work)
> * Drains all per-CPU charge caches for given root_memcg resp. subtree
> * of the hierarchy under it.
> */
> -void drain_all_stock(struct mem_cgroup *root_memcg)
> +static void __drain_all_stock(struct mem_cgroup *root_memcg, bool sync)
> {
> int cpu, curcpu;
>
> - /* If someone's already draining, avoid adding running more workers. */
> - if (!mutex_trylock(&percpu_charge_mutex))
> + /*
> + * If someone's already draining, avoid starting more workers.
> + * Synchronous callers need to guarantee all the last things
> + * are flushed, e.g. before a memcg is removed.
> + */
> + if (sync)
> + mutex_lock(&percpu_charge_mutex);
> + else if (!mutex_trylock(&percpu_charge_mutex))
> return;
> /*
> * Notify other cpus that system-wide "drain" is running
> @@ -2316,6 +2322,21 @@ void drain_all_stock(struct mem_cgroup *root_memcg)
> mutex_unlock(&percpu_charge_mutex);
> }
>
> +void drain_all_stock(struct mem_cgroup *root_memcg)
> +{
> + __drain_all_stock(root_memcg, false);
> +}
> +
> +void drain_all_stock_sync(struct mem_cgroup *root_memcg)
> +{
> + /*
> + * Make sure the workqueue is done with this memcg
> + * before freeing it.
> + */
> + __drain_all_stock(root_memcg, true);
> + flush_workqueue(memcg_wq);
> +}
> +
> static int memcg_hotplug_cpu_dead(unsigned int cpu)
> {
> /* no need for the local lock */
> @@ -4305,7 +4326,7 @@ static void mem_cgroup_css_offline(struct cgroup_subsys_state *css)
> wb_memcg_offline(memcg);
> lru_gen_offline_memcg(memcg);
>
> - drain_all_stock(memcg);
> + drain_all_stock_sync(memcg);
>
> mem_cgroup_private_id_put(memcg, 1);
> }
> --
> 2.55.0
>
>
next prev parent reply other threads:[~2026-08-27 16:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-27 16:42 [PATCH] mm/memcg: fix UAF in drain_all_stock() async work during offline Rik van Riel
2026-08-27 16:57 ` Shakeel Butt [this message]
2026-08-27 17:14 ` Johannes Weiner
2026-08-27 22:35 ` Andrew Morton
2026-08-28 2:33 ` Rik van Riel
2026-08-28 0:42 ` kernel test robot
2026-08-28 3:22 ` kernel test robot
2026-08-28 10:25 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=apBsMXzLXltN9MTd@linux.dev \
--to=shakeel.butt@linux.dev \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=kernel-team@meta.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=muchun.song@linux.dev \
--cc=riel@surriel.com \
--cc=roman.gushchin@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox