Series short description
v3 cover Series short description
The following series implements an executable stack protection in MIPS.
It sets up a per-thread 'VDSO' page and appropriate TLB support. Page is set write-protected from user and is maintained via kernel VA. MIPS FPU emulation is shifted to new page and stack is relieved for execute protection as is as all data pages in default setup during ELF binary initialization. The real protection is controlled by GLIBC and it can do stack protected now as it is done in other architectures and I learned today that GLIBC team is ready for this.
Note: actual execute-protection depends from HW capability, of course.
This patch is required for MIPS32/64 R2 emulation on MIPS R6 architecture. Without it 'ssh-keygen' crashes pretty fast on attempt to execute instruction in stack.
v2 changes:
- Added an optimization during mmap switch - doesn't switch if the same thread is rescheduled and other threads don't intervene (Peter Zijlstra)
- Fixed uMIPS support (Paul Burton)
- Added unwinding of VDSO emulation stack at signal handler invocation, hiding an emulation page (Andy Lutomirski note in other patch comments)
V3 change: heavy preemption friendly.
---
Leonid Yegoshin (3):
MIPS: mips_flush_cache_range is added
MIPS: Setup an instruction emulation in VDSO protected page instead of user stack
MIPS: set stack/data protection as non-executable
arch/mips/include/asm/cacheflush.h | 3 + arch/mips/include/asm/fpu_emulator.h | 2 arch/mips/include/asm/mmu.h | 3 + arch/mips/include/asm/page.h | 2 arch/mips/include/asm/processor.h | 2 arch/mips/include/asm/switch_to.h | 14 +++ arch/mips/include/asm/thread_info.h | 3 + arch/mips/include/asm/tlbmisc.h | 1 arch/mips/include/asm/vdso.h | 3 + arch/mips/kernel/process.c | 7 ++ arch/mips/kernel/signal.c | 4 + arch/mips/kernel/vdso.c | 43 +++++++++- arch/mips/math-emu/cp1emu.c | 8 +- arch/mips/math-emu/dsemul.c | 153 ++++++++++++++++++++++++++++------ arch/mips/mm/c-octeon.c | 8 ++ arch/mips/mm/c-r3k.c | 8 ++ arch/mips/mm/c-r4k.c | 43 ++++++++++ arch/mips/mm/c-tx39.c | 9 ++ arch/mips/mm/cache.c | 4 + arch/mips/mm/fault.c | 5 + arch/mips/mm/tlb-r4k.c | 42 +++++++++ 21 files changed, 335 insertions(+), 32 deletions(-)
--
Signature
PATCH v3 1/3 MIPS: mips_flush_cache_range is added
New function mips_flush_cache_range() is added.
It flushes D-cache on kernel VA and I-cache on user VA. It is significant in case of cache aliasing systems. It can be used to flush a short sequence of newly written code to user space and especially usefull in ptrace() and dsemul(). Today a full page is flushed by flush_cache_page in ptrace().
--- arch/mips/include/asm/cacheflush.h | 3 +++ arch/mips/mm/c-octeon.c | 8 +++++++ arch/mips/mm/c-r3k.c | 8 +++++++ arch/mips/mm/c-r4k.c | 43 ++++++++++++++++++++++++++++++++++++ arch/mips/mm/c-tx39.c | 9 ++++++++ arch/mips/mm/cache.c | 4 +++ 6 files changed, 75 insertions(+)
arch/mips/include/asm/cacheflush.h +3 -0
@@ -94,6 +94,9 @@ extern void (*flush_cache_sigtramp)(unsigned long addr);extern void (*flush_icache_all)(void );extern void (*local_flush_data_cache_page)(void * addr);extern void (*flush_data_cache_page)(unsigned long addr); +extern void (*mips_flush_data_cache_range)(struct vm_area_struct *vma, +unsigned long vaddr,struct page *page,unsigned long addr, +unsigned long size);/* * This flag is used to indicate that the page pointed to by a pte
arch/mips/mm/c-octeon.c +8 -0
@@ -178,6 +178,13 @@ static void octeon_flush_kernel_vmap_range(unsigned long vaddr, int size)BUG (); } +static void octeon_flush_data_cache_range (struct vm_area_struct *vma, +unsigned long vaddr,struct page *page,unsigned long addr, +unsigned long size) +{ +octeon_flush_cache_page (vma, addr,page_to_pfn (page)); +} +/** * Probe Octeon's caches *
@@ -292,6 +299,7 @@ void octeon_cache_init(void) flush_cache_sigtramp = octeon_flush_cache_sigtramp; flush_icache_all = octeon_flush_icache_all; flush_data_cache_page = octeon_flush_data_cache_page; + mips_flush_data_cache_range = octeon_flush_data_cache_range; flush_icache_range = octeon_flush_icache_range; local_flush_icache_range = local_octeon_flush_icache_range;
arch/mips/mm/c-r3k.c +8 -0
@@ -273,6 +273,13 @@ static void r3k_flush_data_cache_page(unsigned long addr) { } +static void r3k_mips_flush_data_cache_range (struct vm_area_struct *vma, +unsigned long vaddr,struct page *page,unsigned long addr, +unsigned long size) +{ +r3k_flush_cache_page (vma, addr,page_to_pfn (page)); +} +static void r3k_flush_cache_sigtramp (unsigned long addr) {unsigned long flags;
@@ -322,6 +329,7 @@ void r3k_cache_init(void) __flush_cache_all = r3k___flush_cache_all; flush_cache_mm = r3k_flush_cache_mm; flush_cache_range = r3k_flush_cache_range; + mips_flush_data_cache_range = r3k_mips_flush_data_cache_range; flush_cache_page = r3k_flush_cache_page; flush_icache_range = r3k_flush_icache_range; local_flush_icache_range = r3k_flush_icache_range;
arch/mips/mm/c-r4k.c +43 -0
55 lines not on this page · raw message
arch/mips/mm/c-tx39.c +9 -0
@@ -230,6 +230,13 @@ static void tx39_flush_data_cache_page(unsigned long addr)tx39_blast_dcache_page (addr); } +static void local_flush_data_cache_range (struct vm_area_struct *vma, +unsigned long vaddr,struct page *page,unsigned long addr, +unsigned long size) +{ +flush_cache_page (vma, addr,page_to_pfn (page)); +} +static void tx39_flush_icache_range (unsigned long start,unsigned long end) {if (end - start > dcache_size)
@@ -371,6 +378,7 @@ void tx39_cache_init(void) flush_cache_sigtramp = (void *) tx39h_flush_icache_all; local_flush_data_cache_page = (void *) tx39h_flush_icache_all; + mips_flush_data_cache_range = (void *) local_flush_data_cache_range; flush_data_cache_page = (void *) tx39h_flush_icache_all; _dma_cache_wback_inv = tx39h_dma_cache_wback_inv;
@@ -402,6 +410,7 @@ void tx39_cache_init(void) flush_cache_sigtramp = tx39_flush_cache_sigtramp; local_flush_data_cache_page = local_tx39_flush_data_cache_page; + mips_flush_data_cache_range = (void *) local_flush_data_cache_range; flush_data_cache_page = tx39_flush_data_cache_page; _dma_cache_wback_inv = tx39_dma_cache_wback_inv;
arch/mips/mm/cache.c +4 -0
@@ -44,10 +44,14 @@ void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size);void (*flush_cache_sigtramp)(unsigned long addr);void (*local_flush_data_cache_page)(void * addr);void (*flush_data_cache_page)(unsigned long addr); +void (*mips_flush_data_cache_range)(struct vm_area_struct *vma, +unsigned long vaddr,struct page *page,unsigned long addr, +unsigned long size);void (*flush_icache_all)(void );EXPORT_SYMBOL_GPL (local_flush_data_cache_page);EXPORT_SYMBOL (flush_data_cache_page); +EXPORT_SYMBOL (mips_flush_data_cache_range);EXPORT_SYMBOL (flush_icache_all);#if defined(CONFIG_DMA_NONCOHERENT ) || defined(CONFIG_DMA_MAYBE_COHERENT )
PATCH v3 2/3 MIPS: Setup an instruction emulation in VDSO protected page instead of user stack
In reply to Leonid YegoshinHistorically, during FPU emulation MIPS runs live BD-slot instruction in stack. This is needed because it was the only way to correctly handle branch exceptions with unknown COP2 or ASE instructions in BD-slot. Now there is an eXecuteInhibit feature and it is desirable to protect stack from execution for security reasons.
This patch moves FPU emulation from stack area to VDSO-located page which is set write-protected for application access. VDSO page itself is now per-thread and it's addresses and offsets are stored in thread_info.
Small stack of emulation blocks is supported because nested traps are possible in MIPS32/64 R6 emulation mix with FPU emulation.
Signal happend during run in emulation block is handled properly - EPC is changed to before an emulated jump or to target address, depending from point of signal.
Explanation of problem (current state before patch):
If I set eXecute-disabled stack in ELF binary initialisation then GLIBC ignores it and may change stack protection at library load. If this library has eXecute-disabled stack then anything is OK, but if this section (PT_GNU_STACK) is just missed as usual, then GLIBC applies it's own default == eXecute-enabled stack.
So, ssh_keygen is built explicitly with eXecute-disabled stack. But GLIBC ignores it and set stack executable. And because of that - anything works, FPU emulation and hacker tools.
However, if I use all *.SO libraries with eXecute-disabled stack in PT_GNU_STACK section then GLIBC keeps stack non-executable but things fails at FPU emulation later.
Here are two issues which are bind together and to solve an incorrect behaviour of GLIBC (ignoring X ssh-keygen intention) the splitting both issues is needed. So, I did a kernel emulation protected and out of stack.
--- arch/mips/include/asm/fpu_emulator.h | 2 arch/mips/include/asm/mmu.h | 3 + arch/mips/include/asm/processor.h | 2 arch/mips/include/asm/switch_to.h | 14 +++ arch/mips/include/asm/thread_info.h | 3 + arch/mips/include/asm/tlbmisc.h | 1 arch/mips/include/asm/vdso.h | 3 + arch/mips/kernel/process.c | 7 ++ arch/mips/kernel/signal.c | 4 + arch/mips/kernel/vdso.c | 43 +++++++++- arch/mips/math-emu/cp1emu.c | 8 +- arch/mips/math-emu/dsemul.c | 153 ++++++++++++++++++++++++++++------ arch/mips/mm/fault.c | 5 + arch/mips/mm/tlb-r4k.c | 42 +++++++++ 14 files changed, 259 insertions(+), 31 deletions(-)
arch/mips/include/asm/fpu_emulator.h +1 -1
@@ -60,7 +60,7 @@ do { \#endif /* CONFIG_DEBUG_FS */ extern int mips_dsemul (struct pt_regs *regs,mips_instruction ir, -unsigned long cpc); +unsigned long cpc,unsigned long bpc,unsigned long r31);extern int do_dsemulret (struct pt_regs *xcp); extern int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx, int has_fpu,
arch/mips/include/asm/mmu.h +3 -0
@@ -3,7 +3,10 @@typedef struct {unsigned long asid[NR_CPUS ]; +unsigned long vdso_asid[NR_CPUS ]; +struct page *vdso_page[NR_CPUS ];void *vdso; +struct vm_area_struct *vdso_vma; }mm_context_t ;#endif /* __ASM_MMU_H */
arch/mips/include/asm/processor.h +1 -1
@@ -40,7 +40,7 @@ extern unsigned int vced_count, vcei_count;* A special page (the vdso) is mapped into all processes at the very * top of the virtual memory space. */ -#define SPECIAL_PAGES_SIZE PAGE_SIZE +#define SPECIAL_PAGES_SIZE (PAGE_SIZE * 2)#ifdef CONFIG_32BIT #ifdef CONFIG_KVM_GUEST
arch/mips/include/asm/switch_to.h +14 -0
@@ -17,6 +17,7 @@#include <asm/dsp.h> #include <asm/cop2.h> #include <asm/msa.h> +#include <asm/mmu_context.h> struct task_struct ;
@@ -104,6 +105,18 @@ do { \disable_msa (); \ }while (0 ) +static inline void flush_vdso_page(void) +{ +int cpu =raw_smp_processor_id (); + +if (current->mm &&cpu_context (cpu, current->mm) && + (current->mm->context.vdso_page[cpu] !=current_thread_info ()->vdso_page) && + (current->mm->context.vdso_asid[cpu] ==cpu_asid (cpu, current->mm))) { +local_flush_tlb_page (current->mm->mmap, (unsigned long )current->mm->context.vdso); + current->mm->context.vdso_asid[cpu] =0 ; + } +} +#define finish_arch_switch (prev) \ do { \ u32 __c0_stat; \
@@ -118,6 +131,7 @@ do { \__restore_dsp (current); \if (cpu_has_userlocal) \write_c0_userlocal (current_thread_info ()->tp_value); \ +flush_vdso_page (); \__restore_watch (); \ }while (0 )
arch/mips/include/asm/thread_info.h +3 -0
@@ -34,6 +34,8 @@ struct thread_info {* 0x7fffffff for user-thead * 0xffffffff for kernel-thread */ +unsigned long vdso_offset; +struct page *vdso_page;struct restart_block restart_block;struct pt_regs *regs; };
@@ -49,6 +51,7 @@ struct thread_info { .cpu = 0, \ .preempt_count = INIT_PREEMPT_COUNT, \ .addr_limit = KERNEL_DS, \ + .vdso_page = NULL, \ .restart_block = { \ .fn = do_no_restart_syscall, \ }, \
arch/mips/include/asm/tlbmisc.h +1 -0
@@ -6,5 +6,6 @@*/ extern void add_wired_entry (unsigned long entrylo0,unsigned long entrylo1,unsigned long entryhi,unsigned long pagemask); +int install_vdso_tlb (void );#endif /* __ASM_TLBMISC_H */
arch/mips/include/asm/vdso.h +3 -0
@@ -11,6 +11,9 @@#include <linux/types.h> +void mips_thread_vdso (struct thread_info *ti); +void arch_release_thread_info (struct thread_info *info); +void vdso_epc_adjust (struct pt_regs *xcp);#ifdef CONFIG_32BIT struct mips_vdso {
arch/mips/kernel/process.c +7 -0
@@ -42,6 +42,7 @@#include <asm/isadep.h> #include <asm/inst.h> #include <asm/stacktrace.h> +#include <asm/vdso.h> #ifdef CONFIG_HOTPLUG_CPU void arch_cpu_idle_dead (void )
@@ -59,6 +60,8 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp) {unsigned long status; +mips_thread_vdso (current_thread_info ()); +/* New thread loses kernel privileges. */ status = regs->cp0_status & ~(ST0_CU0 |ST0_CU1 |ST0_FR |KU_MASK ); status |=KU_USER ;
@@ -75,6 +78,7 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)void exit_thread (void ) { +arch_release_thread_info (current_thread_info ()); }void flush_thread (void )
@@ -103,6 +107,9 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,preempt_enable (); + ti->vdso_page =NULL ; +mips_thread_vdso (ti); +/* set up new TSS. */ childregs = (struct pt_regs *) childksp -1 ;/* Put the stack after the struct pt_regs. */
arch/mips/kernel/signal.c +4 -0
@@ -559,6 +559,10 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) regs->regs[0 ] =0 ;/* Don't deal with this again. */ } +/* adjust emulation stack if signal happens during emulation */ +if (current_thread_info ()->vdso_page) +vdso_epc_adjust (regs); +if (sig_uses_siginfo (&ksig->ka)) ret = abi->setup_rt_frame (vdso + abi->rt_signal_return_offset, ksig, regs, oldset);
arch/mips/kernel/vdso.c +42 -1
65 lines not on this page · raw message
arch/mips/math-emu/cp1emu.c +6 -2
@@ -699,6 +699,8 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, struct mm_decoded_insn dec_insn, void *__user *fault_addr) { unsigned long contpc = xcp->cp0_epc + dec_insn.pc_inc; +unsigned long r31; +unsigned long s_epc;unsigned int cond, cbit;mips_instruction ir;int likely, pc_inc;
@@ -716,6 +718,8 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,if (!cpu_has_mmips && dec_insn.micro_mips_mode)unreachable (); + s_epc = xcp->cp0_epc; + r31 = xcp->regs[31 ];/* XXX NEC Vr54xx bug workaround */ if (delay_slot (xcp)) {if (dec_insn.micro_mips_mode) {
@@ -994,7 +998,7 @@ emul:* Single step the non-CP1 * instruction in the dslot. */ -return mips_dsemul (xcp, ir, contpc); +return mips_dsemul (xcp, ir, contpc, s_epc, r31); } }else contpc = (xcp->cp0_epc + (contpc <<2 ));
@@ -1038,7 +1042,7 @@ emul:* Single step the non-cp1 * instruction in the dslot */ -return mips_dsemul (xcp, ir, contpc); +return mips_dsemul (xcp, ir, contpc, s_epc, r31); }else if (likely) {/* branch not taken */ /* * branch likely nullifies
arch/mips/math-emu/dsemul.c +127 -26
204 lines not on this page · raw message
arch/mips/mm/fault.c +5 -0
@@ -26,6 +26,7 @@#include <asm/uaccess.h> #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ +#include <asm/tlbmisc.h> #include <linux/kdebug.h> /*
@@ -138,6 +139,9 @@ good_area:#endif goto bad_area; } +if (((address &PAGE_MASK ) == (unsigned long )(mm->context.vdso)) && +install_vdso_tlb ()) + goto up_return; }else {if (!(vma->vm_flags & (VM_READ |VM_WRITE |VM_EXEC ))) goto bad_area;
@@ -186,6 +190,7 @@ good_area: } } +up_return:up_read (&mm->mmap_sem);return ;
arch/mips/mm/tlb-r4k.c +42 -0
48 lines not on this page · raw message
PATCH v3 3/3 MIPS: set stack/data protection as non-executable
In reply to Leonid YegoshinThis is a last step of 3 patches which shift FPU emulation out of stack into protected area. So, it disables a default executable stack.
Additionally, it sets a default data area non-executable protection.
--- arch/mips/include/asm/page.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/include/asm/page.h +1 -1
@@ -230,7 +230,7 @@ extern int __virt_addr_valid(const volatile void *kaddr);#define virt_addr_valid (kaddr) \ __virt_addr_valid((const volatile void *) (kaddr)) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ +#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)#define UNCAC_ADDR (addr) ((addr) - PAGE_OFFSET + UNCAC_BASE)
David Daney
NAKRe: [PATCH v3 3/3] MIPS: set stack/data protection as non-executable
Quoted 6 lines · Leonid Yegoshin
This is a last step of 3 patches which shift FPU emulation out of stack into protected area. So, it disables a default executable stack.
Additionally, it sets a default data area non-executable protection.
Signed-off-by Leonid Yegoshin <[email protected]>
NAK!
Some programs require an executable stack, this patch will break them.
You can only select a non-executable stack in response to PT_GNU_STACK program headers in the ELF file of the executable program.
David Daney
Quoted 21 lines
--- arch/mips/include/asm/page.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/mips/include/asm/page.h +1
-1@@ -230,7 +230,7 @@ extern int __virt_addr_valid(const volatile void *kaddr);#define virt_addr_valid (kaddr) \ __virt_addr_valid((const volatile void *) (kaddr)) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ +#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)#define UNCAC_ADDR (addr) ((addr) - PAGE_OFFSET + UNCAC_BASE)
Re: [PATCH v3 3/3] MIPS: set stack/data protection as non-executable
Quoted 5 lines · David Daney
Quoted 4 lines · Leonid Yegoshin
This is a last step of 3 patches which shift FPU emulation out of stack into protected area. So, it disables a default executable stack.
Quoted 8 lines
Quoted 3 lines
Additionally, it sets a default data area non-executable protection.
Signed-off-by Leonid Yegoshin <[email protected]>NAK!
Some programs require an executable stack, this patch will break them.
Have you tested this?
Quoted 2 lines
You can only select a non-executable stack in response to
PT_GNU_STACKprogram headers in the ELF file of the executable program.
This is already handled by fs/binfmt_elf.c. It does the parsing of the PT_GNU_STACK needs, and sets up the stack flags appropriately. All the change to VM_DATA_DEFAULT_FLAGS does is make sure that EXSTACK_DEFAULT now means no VM_EXEC by default. If PT_GNU_STACK requires it, it gets added back in.
-Kees
Quoted 29 lines
David Daney
Quoted 23 lines
--- arch/mips/include/asm/page.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/mips/include/asm/page.h +1
-1@@ -230,7 +230,7 @@ extern int __virt_addr_valid(const volatile void *kaddr);#define virt_addr_valid (kaddr) \ __virt_addr_valid((const volatile void *) (kaddr)) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ +#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE)
Signature · 2 lines
Kees Cook Chrome OS Security
Re: [PATCH v3 3/3] MIPS: set stack/data protection as non-executable
Quoted 8 lines · Kees Cook
Quoted 7 lines · David Daney
Quoted 6 lines · Leonid Yegoshin
This is a last step of 3 patches which shift FPU emulation out of stack into protected area. So, it disables a default executable stack.
Additionally, it sets a default data area non-executable protection.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Signed-off-by Leonid Yegoshin <[email protected]>NAK!
Some programs require an executable stack, this patch will break them.
Have you tested this?
Do you require empirical evidence that the patch is incorrect, or is it enough to just to trust me when I say that it is incorrect? Typically the burden of proof is with those proposing the patches.
Quoted 10 lines
Quoted 3 lines
You can only select a non-executable stack in response to
PT_GNU_STACKprogram headers in the ELF file of the executable program.This is already handled by
fs/binfmt_elf.c. It does the parsing of thePT_GNU_STACKneeds, and sets up the stack flags appropriately. All the change toVM_DATA_DEFAULT_FLAGSdoes is make sure thatEXSTACK_DEFAULTnow means noVM_EXECby default. IfPT_GNU_STACKrequires it, it gets added back in.
The problem is not with "modern" executables that are properly annotated with PT_GNU_STACK.
My objection is to the intentional breaking of old executables that have no PT_GNU_STACK annotation, but require an executable stack. Since we usually try not to break userspace, we cannot merge a patch like this one.
David Daney.
Quoted 34 lines
-Kees
Quoted 29 lines
David Daney
Quoted 23 lines
--- arch/mips/include/asm/page.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/mips/include/asm/page.h +1
-1@@ -230,7 +230,7 @@ extern int __virt_addr_valid(const volatile void *kaddr);#define virt_addr_valid (kaddr) \ __virt_addr_valid((const volatile void *) (kaddr)) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ +#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE)
Re: [PATCH v3 3/3] MIPS: set stack/data protection as non-executable
Quoted 20 lines · David Daney
Quoted 5 lines · Kees Cook
Quoted 2 lines · David Daney
Some programs require an executable stack, this patch will break them.
Have you tested this?
Do you require empirical evidence that the patch is incorrect, or is it enough to just to trust me when I say that it is incorrect? Typically the burden of proof is with those proposing the patches.
Quoted 10 lines
Quoted 3 lines
You can only select a non-executable stack in response to
PT_GNU_STACKprogram headers in the ELF file of the executable program.This is already handled by
fs/binfmt_elf.c. It does the parsing of thePT_GNU_STACKneeds, and sets up the stack flags appropriately. All the change toVM_DATA_DEFAULT_FLAGSdoes is make sure thatEXSTACK_DEFAULTnow means noVM_EXECby default. IfPT_GNU_STACKrequires it, it gets added back in.
Quoted 4 lines
The problem is not with "modern" executables that are properly annotated with
PT_GNU_STACK.My objection is to the intentional breaking of old executables that have no
PT_GNU_STACKannotation, but require an executable stack. Since we usually try not to break userspace, we cannot merge a patch like this one.
I ran Debian, buildroot etc and I had only one problem - ssh_keygen is built with PT_GNU_STACK annotation stack executable protection. And debug output shows a spectacular discarding this setup from kernel by GLIBC loader a couple of milliseconds later, at first library load. You can test it yourself - run ssh_keygen and look into it's /proc/<pid>/maps, stack would have +X.
The rest of Debian distribution, buildroot and Android runs fine with this patch series.
Without any step forward the stack protection would be never solved. GLIBC team looked into problem and they agree to fix a default cancellation of no-X but they need a platform for that.
But of course, we can delay this specific non-X setup for stack until GLIBC fixes loader and do this patch optional or via boot flag.
Note: I push this series not because of default non-X stack but because an explicit PT_GNU_STACK no-X is ignored.
Re: [PATCH v3 3/3] MIPS: set stack/data protection as non-executable
In reply to David DaneyQuoted 18 lines · David Daney
Quoted 17 lines · Kees Cook
Quoted 15 lines · David Daney
Quoted 8 lines · Leonid Yegoshin
This is a last step of 3 patches which shift FPU emulation out of stack into protected area. So, it disables a default executable stack.
Additionally, it sets a default data area non-executable protection.
Signed-off-by Leonid Yegoshin <[email protected]>NAK!
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Some programs require an executable stack, this patch will break them.
Have you tested this?
Do you require empirical evidence that the patch is incorrect, or is it enough to just to trust me when I say that it is incorrect? Typically the burden of proof is with those proposing the patches.
My fault, I misunderstood. (See below.)
Quoted 11 lines
Quoted 10 lines
Quoted 2 lines
You can only select a non-executable stack in response to
PT_GNU_STACKprogram headers in the ELF file of the executable program.This is already handled by
fs/binfmt_elf.c. It does the parsing of thePT_GNU_STACKneeds, and sets up the stack flags appropriately. All the change toVM_DATA_DEFAULT_FLAGSdoes is make sure thatEXSTACK_DEFAULTnow means noVM_EXECby default. IfPT_GNU_STACKrequires it, it gets added back in.
Quoted 6 lines
The problem is not with "modern" executables that are properly annotated with
PT_GNU_STACK.My objection is to the intentional breaking of old executables that have no
PT_GNU_STACKannotation, but require an executable stack. Since we usually try not to break userspace, we cannot merge a patch like this one.
Ah! Okay. If legacy executables expected an executable stack for more reasons than FPU emulation, then yes, absolutely I agree with you.
-Kees
Quoted 40 lines
David Daney.
Quoted 34 lines
-Kees
Quoted 29 lines
David Daney
Quoted 23 lines
--- arch/mips/include/asm/page.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/mips/include/asm/page.h +1
-1@@ -230,7 +230,7 @@ extern int __virt_addr_valid(const volatile void *kaddr);#define virt_addr_valid (kaddr) \ __virt_addr_valid((const volatile void *) (kaddr)) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ +#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE)
Signature · 2 lines
Kees Cook Chrome OS Security
Re: [PATCH v3 3/3] MIPS: set stack/data protection as non-executable
In reply to David DaneyQuoted 6 lines · David Daney
The problem is not with "modern" executables that are properly annotated with
PT_GNU_STACK.My objection is to the intentional breaking of old executables that have no
PT_GNU_STACKannotation, but require an executable stack. Since we usually try not to break userspace, we cannot merge a patch like this one.
How old are these and how many are still around? Can the annotation be added with a tool?
Re: [PATCH v3 3/3] MIPS: set stack/data protection as non-executable
Quoted 10 lines · Christoph Lameter
Quoted 6 lines · David Daney
The problem is not with "modern" executables that are properly annotated with
PT_GNU_STACK.My objection is to the intentional breaking of old executables that have no
PT_GNU_STACKannotation, but require an executable stack. Since we usually try not to break userspace, we cannot merge a patch like this one.How old are these and how many are still around?
As far as I can determine, no official GCC release defaults to generating PT_GNU_STACK for MIPS, I could be mistaken though. So to answer your questions: Very young, and all of them.
Quoted 1 line
Can the annotation be added with a tool?
I don't know, although I seem to recall that such a tool existed, and I may have even used it in the past. But, my google fu is not sufficiently advanced to find it now, if it exists.
David Daney