From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v2] ARM: kasan: reserve shadow memory region
Date: Thu, 4 Jan 2024 09:57:36 +0100 [thread overview]
Message-ID: <20240104085736.541171-1-a.fatoum@pengutronix.de> (raw)
We did not have any protection in place to ensure that KASAN shadow memory
isn't overwritten during boot. Add that now to avoid strange effects
during debugging.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
- fix build when CONFIG_KASAN is disabled (Sascha)
---
arch/arm/cpu/start.c | 4 ++++
include/linux/kasan.h | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index 15f5b2937227..9f4cdfe67fbf 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -133,6 +133,10 @@ static int barebox_memory_areas_init(void)
request_sdram_region("board data", (unsigned long)barebox_boarddata,
barebox_boarddata_size);
+ if (IS_ENABLED(CONFIG_KASAN))
+ request_sdram_region("kasan shadow", kasan_shadow_base,
+ mem_malloc_start() - kasan_shadow_base);
+
return 0;
}
device_initcall(barebox_memory_areas_init);
diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index 54fb993f38ba..5fa0bebb796b 100644
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -42,11 +42,11 @@
#define KASAN_ALLOCA_LEFT 0xCA
#define KASAN_ALLOCA_RIGHT 0xCB
-#if defined(CONFIG_KASAN) && !defined(__PBL__)
-
extern unsigned long kasan_shadow_start;
extern unsigned long kasan_shadow_base;
+#if defined(CONFIG_KASAN) && !defined(__PBL__)
+
static inline void *kasan_mem_to_shadow(const void *addr)
{
unsigned long a = (unsigned long)addr;
--
2.39.2
next reply other threads:[~2024-01-04 8:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-04 8:57 Ahmad Fatoum [this message]
2024-01-04 11:23 ` Sascha Hauer
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=20240104085736.541171-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox