From: Greg KH <gregkh@linuxfoundation.org>
To: Peter Collingbourne <pcc@google.com>
Cc: stable@vger.kernel.org,
"Kuan-Ying Lee (李冠穎)" <Kuan-Ying.Lee@mediatek.com>,
"Andrey Konovalov" <andreyknvl@gmail.com>,
"Catalin Marinas" <catalin.marinas@arm.com>
Subject: Re: [PATCH 6.1.y 2/2] arm64: Reset KASAN tag in copy_highpage with HW tags only
Date: Fri, 10 Mar 2023 13:56:24 +0100 [thread overview]
Message-ID: <ZAso+IbuyINCVa13@kroah.com> (raw)
In-Reply-To: <20230307174925.3613182-2-pcc@google.com>
On Tue, Mar 07, 2023 at 09:49:25AM -0800, Peter Collingbourne wrote:
> During page migration, the copy_highpage function is used to copy the
> page data to the target page. If the source page is a userspace page
> with MTE tags, the KASAN tag of the target page must have the match-all
> tag in order to avoid tag check faults during subsequent accesses to the
> page by the kernel. However, the target page may have been allocated in
> a number of ways, some of which will use the KASAN allocator and will
> therefore end up setting the KASAN tag to a non-match-all tag. Therefore,
> update the target page's KASAN tag to match the source page.
>
> We ended up unintentionally fixing this issue as a result of a bad
> merge conflict resolution between commit e059853d14ca ("arm64: mte:
> Fix/clarify the PG_mte_tagged semantics") and commit 20794545c146 ("arm64:
> kasan: Revert "arm64: mte: reset the page tag in page->flags""), which
> preserved a tag reset for PG_mte_tagged pages which was considered to be
> unnecessary at the time. Because SW tags KASAN uses separate tag storage,
> update the code to only reset the tags when HW tags KASAN is enabled.
>
> Signed-off-by: Peter Collingbourne <pcc@google.com>
> Link: https://linux-review.googlesource.com/id/If303d8a709438d3ff5af5fd85706505830f52e0c
> Reported-by: "Kuan-Ying Lee (李冠穎)" <Kuan-Ying.Lee@mediatek.com>
> Cc: <stable@vger.kernel.org> # 6.1
> Fixes: 20794545c146 ("arm64: kasan: Revert "arm64: mte: reset the page tag in page->flags"")
> Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com>
> Link: https://lore.kernel.org/r/20230215050911.1433132-1-pcc@google.com
> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
> (cherry picked from commit e74a68468062d7ebd8ce17069e12ccc64cc6a58c)
> ---
> arch/arm64/mm/copypage.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
Both now queued up, thanks.
greg k-h
prev parent reply other threads:[~2023-03-10 12:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 9:44 FAILED: patch "[PATCH] arm64: Reset KASAN tag in copy_highpage with HW tags only" failed to apply to 6.1-stable tree gregkh
2023-03-07 17:49 ` [PATCH 6.1.y 1/2] arm64: mte: Fix/clarify the PG_mte_tagged semantics Peter Collingbourne
2023-03-07 17:49 ` [PATCH 6.1.y 2/2] arm64: Reset KASAN tag in copy_highpage with HW tags only Peter Collingbourne
2023-03-10 12:56 ` Greg KH [this message]
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=ZAso+IbuyINCVa13@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=Kuan-Ying.Lee@mediatek.com \
--cc=andreyknvl@gmail.com \
--cc=catalin.marinas@arm.com \
--cc=pcc@google.com \
--cc=stable@vger.kernel.org \
/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