| Message ID | 1461343688-8552-3-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | d8fc68a04d2ffa7327a5fd89d4cd9f2fe24659d3 |
| Headers | show |
On Fri, Apr 22, 2016 at 06:48:04PM +0200, Ard Biesheuvel wrote: > Annotate the KASAN shadow region with boundary markers, so that its > mappings stand out in the page table dumper output. > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > arch/arm64/mm/dump.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/arch/arm64/mm/dump.c b/arch/arm64/mm/dump.c > index 493461159462..8404190fe2bd 100644 > --- a/arch/arm64/mm/dump.c > +++ b/arch/arm64/mm/dump.c > @@ -23,6 +23,7 @@ > #include <linux/seq_file.h> > > #include <asm/fixmap.h> > +#include <asm/kasan.h> > #include <asm/memory.h> > #include <asm/pgtable.h> > #include <asm/pgtable-hwdef.h> > @@ -33,6 +34,10 @@ struct addr_marker { > }; > > static const struct addr_marker address_markers[] = { > +#ifdef CONFIG_KASAN > + { KASAN_SHADOW_START, "Kasan shadow start" }, > + { KASAN_SHADOW_END, "Kasan shadow end" }, > +#endif > { MODULES_VADDR, "Modules start" }, > { MODULES_END, "Modules end" }, > { VMALLOC_START, "vmalloc() Area" }, > -- > 2.7.4 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/arch/arm64/mm/dump.c b/arch/arm64/mm/dump.c index 493461159462..8404190fe2bd 100644 --- a/arch/arm64/mm/dump.c +++ b/arch/arm64/mm/dump.c @@ -23,6 +23,7 @@ #include <linux/seq_file.h> #include <asm/fixmap.h> +#include <asm/kasan.h> #include <asm/memory.h> #include <asm/pgtable.h> #include <asm/pgtable-hwdef.h> @@ -33,6 +34,10 @@ struct addr_marker { }; static const struct addr_marker address_markers[] = { +#ifdef CONFIG_KASAN + { KASAN_SHADOW_START, "Kasan shadow start" }, + { KASAN_SHADOW_END, "Kasan shadow end" }, +#endif { MODULES_VADDR, "Modules start" }, { MODULES_END, "Modules end" }, { VMALLOC_START, "vmalloc() Area" },
Annotate the KASAN shadow region with boundary markers, so that its mappings stand out in the page table dumper output. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- arch/arm64/mm/dump.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel