mm-zswap-fix-potential-memory-corruption-on-duplicate-store.patch removed from -mm tree
The quilt patch titled
Subject: mm: zswap: fix potential memory corruption on duplicate store
has been removed from the -mm tree. Its filename was
mm-zswap-fix-potential-memory-corruption-on-duplicate-store.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Domenico Cerasuolo <[email protected]>
Subject: mm: zswap: fix potential memory corruption on duplicate store
Date: Fri, 22 Sep 2023 19:22:11 +0200
While stress-testing zswap a memory corruption was happening when writing back pages. __frontswap_store used to check for duplicate entries before attempting to store a page in zswap, this was because if the store fails the old entry isn't removed from the tree. This change removes duplicate entries in zswap_store before the actual attempt.
---
mm/zswap.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
mm/zswap.c renamed from mm/zswap.c~mm-zswap-fix-potential-memory-corruption-on-duplicate-store +20 -0
@@ -1219,6 +1219,19 @@ bool zswap_store(struct folio *folio)return false;/* +* If this is a duplicate, it must be removed before attempting to store +* it, otherwise, if the store fails the old page won't be removed from +* the tree, and it might be written back overriding the new data. +*/ +spin_lock (&tree->lock); + dupentry =zswap_rb_search (&tree->rbroot, offset); +if (dupentry) { + zswap_duplicate_entry++; +zswap_invalidate_entry (tree, dupentry); + } +spin_unlock (&tree->lock); + +/* * XXX: zswap reclaim does not work with cgroups yet. Without a * cgroup-aware entry LRU, we will push out entries system-wide based on * local cgroup limits.
@@ -1333,7 +1346,14 @@ insert_entry:/* map */ spin_lock (&tree->lock); +/* +* A duplicate entry should have been removed at the beginning of this +* function. Since the swap entry should be pinned, if a duplicate is +* found again here it means that something went wrong in the swap +* cache. +*/ while (zswap_rb_insert (&tree->rbroot, entry, &dupentry) == -EEXIST ) { +WARN_ON (1 ); zswap_duplicate_entry++;zswap_invalidate_entry (tree, dupentry); }
_
Patches currently in -mm which might be from [email protected] are
zswap-make-shrinking-memcg-aware.patch