summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorDaniel Kiss <daniel.kiss@arm.com>2020-03-16 16:50:54 +0000
committerCatalin Marinas <catalin.marinas@arm.com>2020-03-16 17:19:50 +0000
commit424037b77519d1537872442ba144dda1464988d7 (patch)
tree5d79baec7fddee62da9dc29c75498fcb8244f1c9 /fs/proc
parentde48bb369242fe17022fab3a2addc9c6dacad43f (diff)
downloadlinux-stable-424037b77519d1537872442ba144dda1464988d7.tar.gz
linux-stable-424037b77519d1537872442ba144dda1464988d7.tar.bz2
linux-stable-424037b77519d1537872442ba144dda1464988d7.zip
mm: smaps: Report arm64 guarded pages in smaps
The arm64 Branch Target Identification support is activated by marking executable pages as guarded pages. Report pages mapped this way in smaps to aid diagnostics. Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Daniel Kiss <daniel.kiss@arm.com> Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/task_mmu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 3ba9ae83bff5..1e3409c484d1 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -668,6 +668,9 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)
[ilog2(VM_ARCH_1)] = "ar",
[ilog2(VM_WIPEONFORK)] = "wf",
[ilog2(VM_DONTDUMP)] = "dd",
+#ifdef CONFIG_ARM64_BTI
+ [ilog2(VM_ARM64_BTI)] = "bt",
+#endif
#ifdef CONFIG_MEM_SOFT_DIRTY
[ilog2(VM_SOFTDIRTY)] = "sd",
#endif