From: Andrey Ryabinin <ryabinin.a.a@gmail.com>
To: Catalin Marinas <catalin.marinas@arm.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Mark Rutland <mark.rutland@arm.com>,
"linux-efi@vger.kernel.org" <linux-efi@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>, Yury <yury.norov@gmail.com>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
Linus Walleij <linus.walleij@linaro.org>,
Mark Salter <msalter@redhat.com>,
Will Deacon <will.deacon@arm.com>,
LKML <linux-kernel@vger.kernel.org>,
Alexey Klimov <klimov.linux@gmail.com>,
Alexander Potapenko <glider@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
Andrey Konovalov <andreyknvl@google.com>,
David Keitel <dkeitel@codeaurora.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Matt Fleming <matt.fleming@intel.com>
Subject: Re: [PATCH v6 0/6] KASAN for arm64
Date: Fri, 9 Oct 2015 12:32:18 +0300 [thread overview]
Message-ID: <561789A2.5050601@gmail.com> (raw)
In-Reply-To: <CAPAsAGxhcRtks40u3O29t=KMKkuLy4Pf8u8TeeBy2f2-MuSf+A@mail.gmail.com>
On 10/08/2015 07:07 PM, Andrey Ryabinin wrote:
> 2015-10-08 18:11 GMT+03:00 Catalin Marinas <catalin.marinas@arm.com>:
>> On Thu, Oct 08, 2015 at 02:09:26PM +0200, Ard Biesheuvel wrote:
>>> On 8 October 2015 at 13:23, Andrey Ryabinin <ryabinin.a.a@gmail.com> wrote:
>>>> On 10/08/2015 02:11 PM, Mark Rutland wrote:
>>>>> On Thu, Oct 08, 2015 at 01:36:09PM +0300, Andrey Ryabinin wrote:
>>>>>> 2015-10-07 13:04 GMT+03:00 Catalin Marinas <catalin.marinas@arm.com>:
>>>>>>> On Thu, Sep 17, 2015 at 12:38:06PM +0300, Andrey Ryabinin wrote:
>>>>>>>> As usual patches available in git
>>>>>>>> git://github.com/aryabinin/linux.git kasan/arm64v6
>>>>>>>>
>>>>>>>> Changes since v5:
>>>>>>>> - Rebase on top of 4.3-rc1
>>>>>>>> - Fixed EFI boot.
>>>>>>>> - Updated Doc/features/KASAN.
>>>>>>>
>>>>>>> I tried to merge these patches (apart from the x86 one which is already
>>>>>>> merged) but it still doesn't boot on Juno as an EFI application.
>>>>>>>
>>>>>>
>>>>>> 4.3-rc1 was ok and 4.3-rc4 is not. Break caused by 0ce3cc008ec04
>>>>>> ("arm64/efi: Fix boot crash by not padding between EFI_MEMORY_RUNTIME
>>>>>> regions")
>>>>>> It introduced sort() call in efi_get_virtmap().
>>>>>> sort() is generic kernel function and it's instrumented, so we crash
>>>>>> when KASAN tries to access shadow in sort().
>>>>>
>>>>> I believe this is solved by Ard's stub isolation series [1,2], which
>>>>> will build a stub-specific copy of sort() and various other functions
>>>>> (see the arm-deps in [2]).
>>>>>
>>>>> So long as the stub is not built with ASAN, that should work.
>>>>
>>>> Thanks, this should help, as we already build the stub without ASAN instrumentation.
>>>
>>> Indeed. I did not mention instrumentation in the commit log for those
>>> patches, but obviously, something like KASAN instrumentation cannot be
>>> tolerated in the stub since it makes assumptions about the memory
>>> layout
>>
>> I'll review your latest EFI stub isolation patches and try Kasan again
>> on top (most likely tomorrow).
>
> You'd better wait for v7, because kasan patches will need some adjustment.
> Since stub is isolated, we need to handle memcpy vs __memcpy stuff the same
> way as we do in x86. Now we also need to #undef memset/memcpy/memmove in ARM64
> (just like this was done for x86).
>
Hm, I was wrong, we don't need that.
I thought the EFI stub isolation patches create a copy of mem*() functions in the stub,
but they are just create aliases with __efistub_ prefix.
We only need to create some more aliases for KASAN.
The following patch on top of the EFI stub isolation series works for me.
Signed-off-by: Andrey Ryabinin <ryabinin.a.a@gmail.com>
---
arch/arm64/kernel/image.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h
index e083af0..6eb8fee 100644
--- a/arch/arm64/kernel/image.h
+++ b/arch/arm64/kernel/image.h
@@ -80,6 +80,12 @@ __efistub_strcmp = __pi_strcmp;
__efistub_strncmp = __pi_strncmp;
__efistub___flush_dcache_area = __pi___flush_dcache_area;
+#ifdef CONFIG_KASAN
+__efistub___memcpy = __pi_memcpy;
+__efistub___memmove = __pi_memmove;
+__efistub___memset = __pi_memset;
+#endif
+
__efistub__text = _text;
__efistub__end = _end;
__efistub__edata = _edata;
--
2.4.9
next prev parent reply other threads:[~2015-10-09 9:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-17 9:38 [PATCH v6 0/6] KASAN for arm64 Andrey Ryabinin
2015-09-17 9:38 ` [PATCH v6 1/6] arm64: introduce VA_START macro - the first kernel virtual address Andrey Ryabinin
2015-09-17 9:38 ` [PATCH v6 2/6] arm64: move PGD_SIZE definition to pgalloc.h Andrey Ryabinin
2015-09-17 9:38 ` [PATCH v6 3/6] x86, efi, kasan: #undef memset/memcpy/memmove per arch Andrey Ryabinin
2015-09-29 8:38 ` Ingo Molnar
2015-09-29 15:34 ` Andrey Ryabinin
2015-09-17 9:38 ` [PATCH v6 4/6] arm64: add KASAN support Andrey Ryabinin
2015-09-17 9:38 ` [PATCH v6 5/6] ARM64: kasan: print memory assignment Andrey Ryabinin
2015-09-17 9:38 ` [PATCH v6 6/6] Documentation/features/KASAN: arm64 supports KASAN now Andrey Ryabinin
2015-10-07 10:04 ` [PATCH v6 0/6] KASAN for arm64 Catalin Marinas
2015-10-08 10:36 ` Andrey Ryabinin
2015-10-08 11:06 ` Mark Rutland
2015-10-08 11:11 ` Mark Rutland
2015-10-08 11:23 ` Andrey Ryabinin
2015-10-08 12:09 ` Ard Biesheuvel
2015-10-08 15:11 ` Catalin Marinas
2015-10-08 16:01 ` Ard Biesheuvel
2015-10-08 16:07 ` Andrey Ryabinin
2015-10-09 9:32 ` Andrey Ryabinin [this message]
2015-10-09 9:48 ` Mark Rutland
2015-10-09 10:18 ` Andrey Ryabinin
2015-10-09 12:42 ` Mark Rutland
2015-10-09 14:34 ` 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=561789A2.5050601@gmail.com \
--to=ryabinin.a.a@gmail.com \
--cc=andreyknvl@google.com \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=dkeitel@codeaurora.org \
--cc=dvyukov@google.com \
--cc=glider@google.com \
--cc=klimov.linux@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mark.rutland@arm.com \
--cc=matt.fleming@intel.com \
--cc=msalter@redhat.com \
--cc=will.deacon@arm.com \
--cc=yury.norov@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).