From: Muchun Song <muchun.song@linux.dev>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Muchun Song <songmuchun@bytedance.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Nhat Pham <nphamcs@gmail.com>,
Linux Memory Management List <linux-mm@kvack.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] mm: list_lru: fix UAF for memory cgroup
Date: Wed, 24 Jul 2024 10:23:43 +0800 [thread overview]
Message-ID: <62BBC2A6-D6C3-48B8-B049-932E3BC16F31@linux.dev> (raw)
In-Reply-To: <20240723174540.18992614c476d77e7d9fb1e6@linux-foundation.org>
> On Jul 24, 2024, at 08:45, Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Thu, 18 Jul 2024 16:36:07 +0800 Muchun Song <songmuchun@bytedance.com> wrote:
>
>> The mem_cgroup_from_slab_obj() is supposed to be called under rcu
>> lock or cgroup_mutex or others which could prevent returned memcg
>> from being freed. Fix it by adding missing rcu read lock.
>
> "or others" is rather vague. What others?
Like objcg_lock. I have added this one into obj_cgroup_memcg().
>
>> @@ -109,14 +110,20 @@ EXPORT_SYMBOL_GPL(list_lru_add);
>>
>> bool list_lru_add_obj(struct list_lru *lru, struct list_head *item)
>> {
>> + bool ret;
>> int nid = page_to_nid(virt_to_page(item));
>> - struct mem_cgroup *memcg = list_lru_memcg_aware(lru) ?
>> - mem_cgroup_from_slab_obj(item) : NULL;
>> + struct mem_cgroup *memcg;
>>
>> - return list_lru_add(lru, item, nid, memcg);
>> + rcu_read_lock();
>> + memcg = list_lru_memcg_aware(lru) ? mem_cgroup_from_slab_obj(item) : NULL;
>> + ret = list_lru_add(lru, item, nid, memcg);
>> + rcu_read_unlock();
>
> We don't need rcu_read_lock() to evaluate NULL.
>
> memcg = NULL;
> if (list_lru_memcg_aware(lru)) {
> rcu_read_lock();
> memcg = mem_cgroup_from_slab_obj(item);
> rcu_read_unlock();
Actually, the access to memcg is in list_lru_add(), so the rcu lock should
also cover this function rather than only mem_cgroup_from_slab_obj().
Something like:
memcg = NULL;
if (list_lru_memcg_aware(lru)) {
rcu_read_lock();
memcg = mem_cgroup_from_slab_obj(item);
}
ret = list_lru_add(lru, item, nid, memcg);
if (list_lru_memcg_aware(lru))
rcu_read_unlock();
Not concise. I don't know if this is good.
> }
>
> Seems worthwhile?
>
>
next prev parent reply other threads:[~2024-07-24 2:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-18 8:36 Muchun Song
2024-07-18 10:30 ` Vlastimil Babka
2024-07-18 11:20 ` Muchun Song
2024-07-23 11:23 ` Muchun Song
2024-07-23 17:52 ` Shakeel Butt
2024-07-24 0:45 ` Andrew Morton
2024-07-24 2:23 ` Muchun Song [this message]
2024-07-31 10:06 ` Vlastimil Babka (SUSE)
2024-08-01 2:42 ` Muchun Song
2024-07-31 20:28 ` Andrew Morton
2024-08-01 2:42 ` Muchun Song
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=62BBC2A6-D6C3-48B8-B049-932E3BC16F31@linux.dev \
--to=muchun.song@linux.dev \
--cc=akpm@linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nphamcs@gmail.com \
--cc=songmuchun@bytedance.com \
/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