[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAMZfGtVgtJ0BdL_tXzgC3qh5Bn+0GpJJNHyE5RzEm=B3GO5q2w@mail.gmail.com>
Date: Tue, 10 Nov 2020 11:19:46 +0800
From: Muchun Song <songmuchun@...edance.com>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: LKML <linux-kernel@...r.kernel.org>,
Michal Hocko <mhocko@...nel.org>, Roman Gushchin <guro@...com>,
Shakeel Butt <shakeelb@...gle.com>,
Johannes Weiner <hannes@...xchg.org>,
Joonsoo Kim <iamjoonsoo.kim@....com>,
Yafang Shao <laoar.shao@...il.com>,
Thomas Gleixner <tglx@...utronix.de>,
Chris Down <chris@...isdown.name>,
Cgroups <cgroups@...r.kernel.org>, esyr@...hat.com,
Christian Brauner <christian.brauner@...ntu.com>,
Marco Elver <elver@...gle.com>,
Peter Zijlstra <peterz@...radead.org>,
Linux Memory Management List <linux-mm@...ck.org>,
Ingo Molnar <mingo@...nel.org>,
Kees Cook <keescook@...omium.org>, areber@...hat.com,
Suren Baghdasaryan <surenb@...gle.com>,
Vladimir Davydov <vdavydov.dev@...il.com>
Subject: Re: [PATCH v2] mm: memcg/slab: Fix use after free in obj_cgroup_charge
On Wed, Oct 28, 2020 at 11:50 AM Muchun Song <songmuchun@...edance.com> wrote:
>
> The rcu_read_lock/unlock only can guarantee that the memcg will
> not be freed, but it cannot guarantee the success of css_get to
> memcg.
>
> If the whole process of a cgroup offlining is completed between
> reading a objcg->memcg pointer and bumping the css reference on
> another CPU, and there are exactly 0 external references to this
> memory cgroup (how we get to the obj_cgroup_charge() then?),
> css_get() can change the ref counter from 0 back to 1.
>
> Fixes: bf4f059954dc ("mm: memcg/slab: obj_cgroup API")
> Signed-off-by: Muchun Song <songmuchun@...edance.com>
> Acked-by: Roman Gushchin <guro@...com>
Hi Andrew,
Maybe you forgot to add this to the queue for the merge window?
Thanks.
> ---
> changelog in v2:
> 1. Add unlikely and update the commit log suggested by Roman.
>
> mm/memcontrol.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 8c8b4c3ed5a0..d9cdf899c6fc 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -3221,8 +3221,10 @@ int obj_cgroup_charge(struct obj_cgroup *objcg, gfp_t gfp, size_t size)
> * independently later.
> */
> rcu_read_lock();
> +retry:
> memcg = obj_cgroup_memcg(objcg);
> - css_get(&memcg->css);
> + if (unlikely(!css_tryget(&memcg->css)))
> + goto retry;
> rcu_read_unlock();
>
> nr_pages = size >> PAGE_SHIFT;
> --
> 2.20.1
>
--
Yours,
Muchun
Powered by blists - more mailing lists