mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 13:22:57 +00:00
749e9fc18b
commita8e5e5146aupstream. Prior to commit69e3b846d8("arm64: mte: Sync tags for pages where PTE is untagged"), mte_sync_tags() was only called for pte_tagged() entries (those mapped with PROT_MTE). Therefore mte_sync_tags() could safely use test_and_set_bit(PG_mte_tagged, &page->flags) without inadvertently setting PG_mte_tagged on an untagged page. The above commit was required as guests may enable MTE without any control at the stage 2 mapping, nor a PROT_MTE mapping in the VMM. However, the side-effect was that any page with a PTE that looked like swap (or migration) was getting PG_mte_tagged set automatically. A subsequent page copy (e.g. migration) copied the tags to the destination page even if the tags were owned by KASAN. This issue was masked by the page_kasan_tag_reset() call introduced in commite5b8d92189("arm64: mte: reset the page tag in page->flags"). When this commit was reverted (20794545c1), KASAN started reporting access faults because the overriding tags in a page did not match the original page->flags (with CONFIG_KASAN_HW_TAGS=y): BUG: KASAN: invalid-access in copy_page+0x10/0xd0 arch/arm64/lib/copy_page.S:26 Read at addr f5ff000017f2e000 by task syz-executor.1/2218 Pointer tag: [f5], memory tag: [f2] Move the PG_mte_tagged bit setting from mte_sync_tags() to the actual place where tags are cleared (mte_sync_page_tags()) or restored (mte_restore_tags()). Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Reported-by: syzbot+c2c79c6d6eddc5262b77@syzkaller.appspotmail.com Fixes:69e3b846d8("arm64: mte: Sync tags for pages where PTE is untagged") Cc: <stable@vger.kernel.org> # 5.14.x Cc: Steven Price <steven.price@arm.com> Cc: Andrey Konovalov <andreyknvl@gmail.com> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com> Cc: Will Deacon <will@kernel.org> Link: https://lore.kernel.org/r/0000000000004387dc05e5888ae5@google.com/ Reviewed-by: Steven Price <steven.price@arm.com> Link: https://lore.kernel.org/r/20221006163354.3194102-1-catalin.marinas@arm.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
88 lines
1.9 KiB
C
88 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
|
|
#include <linux/pagemap.h>
|
|
#include <linux/xarray.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/swap.h>
|
|
#include <linux/swapops.h>
|
|
#include <asm/mte.h>
|
|
|
|
static DEFINE_XARRAY(mte_pages);
|
|
|
|
void *mte_allocate_tag_storage(void)
|
|
{
|
|
/* tags granule is 16 bytes, 2 tags stored per byte */
|
|
return kmalloc(MTE_PAGE_TAG_STORAGE, GFP_KERNEL);
|
|
}
|
|
|
|
void mte_free_tag_storage(char *storage)
|
|
{
|
|
kfree(storage);
|
|
}
|
|
|
|
int mte_save_tags(struct page *page)
|
|
{
|
|
void *tag_storage, *ret;
|
|
|
|
if (!test_bit(PG_mte_tagged, &page->flags))
|
|
return 0;
|
|
|
|
tag_storage = mte_allocate_tag_storage();
|
|
if (!tag_storage)
|
|
return -ENOMEM;
|
|
|
|
mte_save_page_tags(page_address(page), tag_storage);
|
|
|
|
/* page_private contains the swap entry.val set in do_swap_page */
|
|
ret = xa_store(&mte_pages, page_private(page), tag_storage, GFP_KERNEL);
|
|
if (WARN(xa_is_err(ret), "Failed to store MTE tags")) {
|
|
mte_free_tag_storage(tag_storage);
|
|
return xa_err(ret);
|
|
} else if (ret) {
|
|
/* Entry is being replaced, free the old entry */
|
|
mte_free_tag_storage(ret);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
bool mte_restore_tags(swp_entry_t entry, struct page *page)
|
|
{
|
|
void *tags = xa_load(&mte_pages, entry.val);
|
|
|
|
if (!tags)
|
|
return false;
|
|
|
|
/*
|
|
* Test PG_mte_tagged again in case it was racing with another
|
|
* set_pte_at().
|
|
*/
|
|
if (!test_and_set_bit(PG_mte_tagged, &page->flags))
|
|
mte_restore_page_tags(page_address(page), tags);
|
|
|
|
return true;
|
|
}
|
|
|
|
void mte_invalidate_tags(int type, pgoff_t offset)
|
|
{
|
|
swp_entry_t entry = swp_entry(type, offset);
|
|
void *tags = xa_erase(&mte_pages, entry.val);
|
|
|
|
mte_free_tag_storage(tags);
|
|
}
|
|
|
|
void mte_invalidate_tags_area(int type)
|
|
{
|
|
swp_entry_t entry = swp_entry(type, 0);
|
|
swp_entry_t last_entry = swp_entry(type + 1, 0);
|
|
void *tags;
|
|
|
|
XA_STATE(xa_state, &mte_pages, entry.val);
|
|
|
|
xa_lock(&mte_pages);
|
|
xas_for_each(&xa_state, tags, last_entry.val - 1) {
|
|
__xa_erase(&mte_pages, xa_state.xa_index);
|
|
mte_free_tag_storage(tags);
|
|
}
|
|
xa_unlock(&mte_pages);
|
|
}
|