]> git.baikalelectronics.ru Git - kernel.git/commit
arm64: bti: Fix support for userspace only BTI
authorMark Brown <broonie@kernel.org>
Tue, 12 May 2020 11:39:50 +0000 (12:39 +0100)
committerWill Deacon <will@kernel.org>
Tue, 12 May 2020 17:45:17 +0000 (18:45 +0100)
commitccfaa00d1ad8be981c4635d23716b3b24dbbeddf
tree8e36a28fbfb4f94a42f32168baedf6f3bf117361
parentc08d601a3cbf866dce54a603f5ad7b37c7af3737
arm64: bti: Fix support for userspace only BTI

When setting PTE_MAYBE_GP we check system_supports_bti() but this is
true for systems where only CONFIG_BTI is set causing us to enable BTI
on some kernel text. Add an extra check for the kernel mode option,
using an ifdef due to line length.

Fixes: e86545bbebba ("arm64: Set GP bit in kernel page tables to enable BTI for the kernel")
Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20200512113950.29996-1-broonie@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/include/asm/pgtable-prot.h