From: lorenzo.pieralisi@arm.com (Lorenzo Pieralisi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: kasan: clear stale stack poison
Date: Fri, 19 Feb 2016 10:52:29 +0000 [thread overview]
Message-ID: <20160219105229.GA18597@red-moon> (raw)
In-Reply-To: <20160218181356.GF2538@e104818-lin.cambridge.arm.com>
On Thu, Feb 18, 2016 at 06:13:57PM +0000, Catalin Marinas wrote:
> On Thu, Feb 18, 2016 at 06:03:54PM +0000, Will Deacon wrote:
> > On Thu, Feb 18, 2016 at 05:54:47PM +0000, Catalin Marinas wrote:
> > > On Thu, Feb 18, 2016 at 05:27:38PM +0000, Mark Rutland wrote:
> > > > @@ -145,6 +146,7 @@ ENTRY(cpu_resume_mmu)
> > > > ENDPROC(cpu_resume_mmu)
> > > > .popsection
> > > > cpu_resume_after_mmu:
> > > > + kasan_unpoison_stack 96
> > >
> > > I don't think the 96 here is needed since we populate the stack in
> > > assembly (__cpu_suspend_enter) and unwind it again still in assembly
> > > (cpu_resume_after_mmu), so no KASAN shadow writes/reads.
> > >
> > > Otherwise the patch looks fine.
> >
> > I'd much rather it was written in C -- is there a reason we can't do
> > that if we use a separate compilation unit where the compiler will
> > honour the fno-sanitize flag?
>
> A simple, non-sanitised C wrapper around __cpu_suspend_enter() would
> probably work. We need to make sure it is static inline when !KASAN to
> avoid an unnecessary function call. Or we just move cpu_suspend() to a
> different compilation unit, though that's a slightly larger function
> which we may want to track under KASAN.
Both options are ok with me. There is one more. We pass the "saved" sp
to __cpu_suspend_save (ie in cpu_suspend_ctx), you can stash it and
use it in the resume path (through logical cpu indexing) to carry
out the kasan clean-up, in C, with no wrapper needed.
With James' hibernate patches:
http://lists.infradead.org/pipermail/linux-arm-kernel/2016-February/408597.html
this is going to be even easier, since the struct above is on the
cpu_suspend stack upon cpu_resume, so you can use the sp in there
straight away.
We can put together a fix following Catalin's suggestion and when James'
patches land in mainline we will update the code.
Thanks,
Lorenzo
WARNING: multiple messages have this Message-ID (diff)
From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
To: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
linux-kernel@vger.kernel.org, tglx@linutronix.de,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
akpm@linux-foundation.org, hpa@linux.intel.com, mingo@kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] arm64: kasan: clear stale stack poison
Date: Fri, 19 Feb 2016 10:52:29 +0000 [thread overview]
Message-ID: <20160219105229.GA18597@red-moon> (raw)
In-Reply-To: <20160218181356.GF2538@e104818-lin.cambridge.arm.com>
On Thu, Feb 18, 2016 at 06:13:57PM +0000, Catalin Marinas wrote:
> On Thu, Feb 18, 2016 at 06:03:54PM +0000, Will Deacon wrote:
> > On Thu, Feb 18, 2016 at 05:54:47PM +0000, Catalin Marinas wrote:
> > > On Thu, Feb 18, 2016 at 05:27:38PM +0000, Mark Rutland wrote:
> > > > @@ -145,6 +146,7 @@ ENTRY(cpu_resume_mmu)
> > > > ENDPROC(cpu_resume_mmu)
> > > > .popsection
> > > > cpu_resume_after_mmu:
> > > > + kasan_unpoison_stack 96
> > >
> > > I don't think the 96 here is needed since we populate the stack in
> > > assembly (__cpu_suspend_enter) and unwind it again still in assembly
> > > (cpu_resume_after_mmu), so no KASAN shadow writes/reads.
> > >
> > > Otherwise the patch looks fine.
> >
> > I'd much rather it was written in C -- is there a reason we can't do
> > that if we use a separate compilation unit where the compiler will
> > honour the fno-sanitize flag?
>
> A simple, non-sanitised C wrapper around __cpu_suspend_enter() would
> probably work. We need to make sure it is static inline when !KASAN to
> avoid an unnecessary function call. Or we just move cpu_suspend() to a
> different compilation unit, though that's a slightly larger function
> which we may want to track under KASAN.
Both options are ok with me. There is one more. We pass the "saved" sp
to __cpu_suspend_save (ie in cpu_suspend_ctx), you can stash it and
use it in the resume path (through logical cpu indexing) to carry
out the kasan clean-up, in C, with no wrapper needed.
With James' hibernate patches:
http://lists.infradead.org/pipermail/linux-arm-kernel/2016-February/408597.html
this is going to be even easier, since the struct above is on the
cpu_suspend stack upon cpu_resume, so you can use the sp in there
straight away.
We can put together a fix following Catalin's suggestion and when James'
patches land in mainline we will update the code.
Thanks,
Lorenzo
next prev parent reply other threads:[~2016-02-19 10:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-18 17:27 [PATCH] arm64: kasan: clear stale stack poison Mark Rutland
2016-02-18 17:27 ` Mark Rutland
2016-02-18 17:54 ` Catalin Marinas
2016-02-18 17:54 ` Catalin Marinas
2016-02-18 18:03 ` Will Deacon
2016-02-18 18:03 ` Will Deacon
2016-02-18 18:13 ` Catalin Marinas
2016-02-18 18:13 ` Catalin Marinas
2016-02-19 10:52 ` Lorenzo Pieralisi [this message]
2016-02-19 10:52 ` Lorenzo Pieralisi
2016-02-19 11:35 ` Mark Rutland
2016-02-19 11:35 ` Mark Rutland
2016-02-26 14:00 ` Andrey Ryabinin
2016-02-26 14:00 ` Andrey Ryabinin
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=20160219105229.GA18597@red-moon \
--to=lorenzo.pieralisi@arm.com \
--cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.