| Message ID | 1417077724-15885-1-git-send-email-js07.lee@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Nov 27, 2014 at 05:42:04PM +0900, Jungseung Lee wrote: > Modern ARMv7-A/R cores optionally implement below new > hardware feature: > > - PXN: > Privileged execute-never(PXN) is a security feature. PXN bit > determines whether the processor can execute software from > the region. This is effective solution against ret2usr attack. > On an implementation that does not include the LPAE, PXN is > optionally supported. > > This patch set PXN bit on user page table for preventing > user code execution with privilege mode. This looks fine to me, only one niggle: > + /* > + * Check is it with support for the PXN bit > + * in the Short-descriptor translation table format descriptors. > + */ > + if (cpu_arch == CPU_ARCH_ARMv7 && > + (read_cpuid_ext(CPUID_EXT_MMFR0) & 0xF) == 4) { > + user_pmd_table |= PMD_PXNTABLE; > + } Use spaces to indent the second line of the if() statement so that the open paren aligns with the 'c' character of cpu_arch. Using tabs within an if() expression is wrong from the readability point of view as it makes it harder to see where the first statement if the condition starts, and indenting to the appropriate point also helps readability when there's multiple lines to the if() expression.
On Thu, Nov 27, 2014 at 08:42:04AM +0000, Jungseung Lee wrote: > --- a/arch/arm/mm/mmu.c > +++ b/arch/arm/mm/mmu.c > @@ -52,6 +52,8 @@ EXPORT_SYMBOL(empty_zero_page); > */ > pmd_t *top_pmd; > > +pmdval_t user_pmd_table = _PAGE_USER_TABLE; > + > #define CPOLICY_UNCACHED 0 > #define CPOLICY_BUFFERED 1 > #define CPOLICY_WRITETHROUGH 2 > @@ -537,6 +539,14 @@ static void __init build_mem_type_table(void) > if (cpu_arch == CPU_ARCH_ARMv6) > vecs_pgprot |= L_PTE_MT_VECTORS; > #endif > + /* > + * Check is it with support for the PXN bit > + * in the Short-descriptor translation table format descriptors. > + */ > + if (cpu_arch == CPU_ARCH_ARMv7 && > + (read_cpuid_ext(CPUID_EXT_MMFR0) & 0xF) == 4) { > + user_pmd_table |= PMD_PXNTABLE; > + } While user_pmd_table isn't used with LPAE, I would still add a !IS_ENABLED(CONFIG_ARM_LPAE) to the conditions above (or include this hunk in the above #ifndef .. #endif block). The reason is that someone may later decide to use user_pmd_table for LPAE as well and we forgot about this. Otherwise: Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h index 78a7793..19cfab5 100644 --- a/arch/arm/include/asm/pgalloc.h +++ b/arch/arm/include/asm/pgalloc.h @@ -157,7 +157,15 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep) static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep) { - __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE); + extern pmdval_t user_pmd_table; + pmdval_t prot; + + if (__LINUX_ARM_ARCH__ >= 6 && !IS_ENABLED(CONFIG_ARM_LPAE)) + prot = user_pmd_table; + else + prot = _PAGE_USER_TABLE; + + __pmd_populate(pmdp, page_to_phys(ptep), prot); } #define pmd_pgtable(pmd) pmd_page(pmd) diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h index 5cfba15..5e68278 100644 --- a/arch/arm/include/asm/pgtable-2level-hwdef.h +++ b/arch/arm/include/asm/pgtable-2level-hwdef.h @@ -20,12 +20,14 @@ #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0) #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0) #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0) +#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */ #define PMD_BIT4 (_AT(pmdval_t, 1) << 4) #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5) #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */ /* * - section */ +#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */ #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2) #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3) #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */ diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h index 9fd61c7..f8f1cff 100644 --- a/arch/arm/include/asm/pgtable-3level-hwdef.h +++ b/arch/arm/include/asm/pgtable-3level-hwdef.h @@ -76,6 +76,7 @@ #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */ #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */ #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */ +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */ #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */ /* diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 9f98cec..f991c54 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -52,6 +52,8 @@ EXPORT_SYMBOL(empty_zero_page); */ pmd_t *top_pmd; +pmdval_t user_pmd_table = _PAGE_USER_TABLE; + #define CPOLICY_UNCACHED 0 #define CPOLICY_BUFFERED 1 #define CPOLICY_WRITETHROUGH 2 @@ -537,6 +539,14 @@ static void __init build_mem_type_table(void) if (cpu_arch == CPU_ARCH_ARMv6) vecs_pgprot |= L_PTE_MT_VECTORS; #endif + /* + * Check is it with support for the PXN bit + * in the Short-descriptor translation table format descriptors. + */ + if (cpu_arch == CPU_ARCH_ARMv7 && + (read_cpuid_ext(CPUID_EXT_MMFR0) & 0xF) == 4) { + user_pmd_table |= PMD_PXNTABLE; + } /* * ARMv6 and above have extended page tables. @@ -605,6 +615,11 @@ static void __init build_mem_type_table(void) } kern_pgprot |= PTE_EXT_AF; vecs_pgprot |= PTE_EXT_AF; + + /* + * Set PXN for user mappings + */ + user_pgprot |= PTE_EXT_PXN; #endif for (i = 0; i < 16; i++) {
Modern ARMv7-A/R cores optionally implement below new hardware feature: - PXN: Privileged execute-never(PXN) is a security feature. PXN bit determines whether the processor can execute software from the region. This is effective solution against ret2usr attack. On an implementation that does not include the LPAE, PXN is optionally supported. This patch set PXN bit on user page table for preventing user code execution with privilege mode. Signed-off-by: Jungseung Lee <js07.lee@gmail.com> --- arch/arm/include/asm/pgalloc.h | 10 +++++++++- arch/arm/include/asm/pgtable-2level-hwdef.h | 2 ++ arch/arm/include/asm/pgtable-3level-hwdef.h | 1 + arch/arm/mm/mmu.c | 15 +++++++++++++++ 4 files changed, 27 insertions(+), 1 deletion(-)