linux-kernel - Re: [PATCH] mm: zswap: fix objcg use-after-free in entry destruction

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAKEwX=N5A_b7edmqJyoKLvTCS64bpH886SSR_OUm4DZQUdL8Gg@mail.gmail.com>
Date: Mon, 29 Jan 2024 23:26:40 -0800
From: Nhat Pham <nphamcs@...il.com>
To: Johannes Weiner <hannes@...xchg.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>, Yosry Ahmed <yosryahmed@...gle.com>, 
	Chengming Zhou <zhouchengming@...edance.com>, linux-mm@...ck.org, 
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] mm: zswap: fix objcg use-after-free in entry destruction

On Mon, Jan 29, 2024 at 5:34 PM Johannes Weiner <hannes@...xchg.org> wrote:
>
> In the per-memcg LRU universe, LRU removal uses entry->objcg to
> determine which list count needs to be decreased. Drop the objcg
> reference after updating the LRU, to fix a possible use-after-free.
>
> Fixes: a65b0e7607cc ("zswap: make shrinking memcg-aware")
> Signed-off-by: Johannes Weiner <hannes@...xchg.org>
> ---
>  mm/zswap.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/mm/zswap.c b/mm/zswap.c
> index de68a5928527..7f88b3a77e4a 100644
> --- a/mm/zswap.c
> +++ b/mm/zswap.c
> @@ -522,10 +522,6 @@ static struct zpool *zswap_find_zpool(struct zswap_entry *entry)
>   */
>  static void zswap_free_entry(struct zswap_entry *entry)
>  {
> -       if (entry->objcg) {
> -               obj_cgroup_uncharge_zswap(entry->objcg, entry->length);
> -               obj_cgroup_put(entry->objcg);
> -       }
>         if (!entry->length)
>                 atomic_dec(&zswap_same_filled_pages);
>         else {
> @@ -534,6 +530,10 @@ static void zswap_free_entry(struct zswap_entry *entry)
>                 atomic_dec(&entry->pool->nr_stored);
>                 zswap_pool_put(entry->pool);
>         }
> +       if (entry->objcg) {
> +               obj_cgroup_uncharge_zswap(entry->objcg, entry->length);
> +               obj_cgroup_put(entry->objcg);
> +       }

Nice catch!
Reviewed-by: Nhat Pham <nphamcs@...il.com>

>         zswap_entry_cache_free(entry);
>         atomic_dec(&zswap_stored_pages);
>         zswap_update_total_size();
> --
> 2.43.0
>