diff -uriN linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/include/asm/dma-mapping.h --- linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/include/asm/dma-mapping.h 2011-05-01 17:02:10.000000000 -0500 @@ -3,9 +3,9 @@ #include -extern struct dma_map_ops *dma_ops; +extern const struct dma_map_ops *dma_ops; -static inline struct dma_map_ops *get_dma_ops(struct device *dev) +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) { return dma_ops; } diff -uriN linux-2.6.38.4/arch/alpha/include/asm/elf.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/include/asm/elf.h --- linux-2.6.38.4/arch/alpha/include/asm/elf.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/include/asm/elf.h 2011-05-01 17:02:10.000000000 -0500 @@ -90,6 +90,13 @@ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL) + +#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28) +#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19) +#endif + /* $0 is set by ld.so to a pointer to a function which might be registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have diff -uriN linux-2.6.38.4/arch/alpha/include/asm/pgtable.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/include/asm/pgtable.h --- linux-2.6.38.4/arch/alpha/include/asm/pgtable.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/include/asm/pgtable.h 2011-05-01 17:02:10.000000000 -0500 @@ -101,6 +101,17 @@ #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) + +#ifdef CONFIG_PAX_PAGEEXEC +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE) +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE) +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE) +#else +# define PAGE_SHARED_NOEXEC PAGE_SHARED +# define PAGE_COPY_NOEXEC PAGE_COPY +# define PAGE_READONLY_NOEXEC PAGE_READONLY +#endif + #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) diff -uriN linux-2.6.38.4/arch/alpha/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/Kconfig --- linux-2.6.38.4/arch/alpha/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -668,6 +668,8 @@ depends on VGA_HOSE default y +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/alpha/kernel/entry.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/entry.S --- linux-2.6.38.4/arch/alpha/kernel/entry.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/entry.S 2011-05-01 17:01:51.000000000 -0500 @@ -860,24 +860,15 @@ .globl sys_getxpid .ent sys_getxpid sys_getxpid: + lda $sp, -16($sp) + stq $26, 0($sp) .prologue 0 - ldq $2, TI_TASK($8) - /* See linux/kernel/timer.c sys_getppid for discussion - about this loop. */ - ldq $3, TASK_GROUP_LEADER($2) - ldq $4, TASK_REAL_PARENT($3) - ldl $0, TASK_TGID($2) -1: ldl $1, TASK_TGID($4) -#ifdef CONFIG_SMP - mov $4, $5 - mb - ldq $3, TASK_GROUP_LEADER($2) - ldq $4, TASK_REAL_PARENT($3) - cmpeq $4, $5, $5 - beq $5, 1b -#endif - stq $1, 80($sp) + lda $16, 96($sp) + jsr $26, do_getxpid + ldq $26, 0($sp) + + lda $sp, 16($sp) ret .end sys_getxpid diff -uriN linux-2.6.38.4/arch/alpha/kernel/module.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/module.c --- linux-2.6.38.4/arch/alpha/kernel/module.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/module.c 2011-05-01 17:02:10.000000000 -0500 @@ -182,7 +182,7 @@ /* The small sections were sorted to the end of the segment. The following should definitely cover them. */ - gp = (u64)me->module_core + me->core_size - 0x8000; + gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000; got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { diff -uriN linux-2.6.38.4/arch/alpha/kernel/osf_sys.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/osf_sys.c --- linux-2.6.38.4/arch/alpha/kernel/osf_sys.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/osf_sys.c 2011-05-01 17:02:10.000000000 -0500 @@ -1162,7 +1162,7 @@ /* At this point: (!vma || addr < vma->vm_end). */ if (limit - len < addr) return -ENOMEM; - if (!vma || addr + len <= vma->vm_start) + if (check_heap_stack_gap(vma, addr, len)) return addr; addr = vma->vm_end; vma = vma->vm_next; @@ -1198,6 +1198,10 @@ merely specific addresses, but regions of memory -- perhaps this feature should be incorporated into all ports? */ +#ifdef CONFIG_PAX_RANDMMAP + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP)) +#endif + if (addr) { addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit); if (addr != (unsigned long) -ENOMEM) @@ -1205,8 +1209,8 @@ } /* Next, try allocating at TASK_UNMAPPED_BASE. */ - addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE), - len, limit); + addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit); + if (addr != (unsigned long) -ENOMEM) return addr; diff -uriN linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/pci_iommu.c --- linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/pci_iommu.c 2011-05-01 17:02:10.000000000 -0500 @@ -950,7 +950,7 @@ return 0; } -struct dma_map_ops alpha_pci_ops = { +const struct dma_map_ops alpha_pci_ops = { .alloc_coherent = alpha_pci_alloc_coherent, .free_coherent = alpha_pci_free_coherent, .map_page = alpha_pci_map_page, @@ -962,5 +962,5 @@ .set_dma_mask = alpha_pci_set_mask, }; -struct dma_map_ops *dma_ops = &alpha_pci_ops; +const struct dma_map_ops *dma_ops = &alpha_pci_ops; EXPORT_SYMBOL(dma_ops); diff -uriN linux-2.6.38.4/arch/alpha/kernel/pci-noop.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/pci-noop.c --- linux-2.6.38.4/arch/alpha/kernel/pci-noop.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/pci-noop.c 2011-05-01 17:02:10.000000000 -0500 @@ -173,7 +173,7 @@ return 0; } -struct dma_map_ops alpha_noop_ops = { +const struct dma_map_ops alpha_noop_ops = { .alloc_coherent = alpha_noop_alloc_coherent, .free_coherent = alpha_noop_free_coherent, .map_page = alpha_noop_map_page, @@ -183,7 +183,7 @@ .set_dma_mask = alpha_noop_set_mask, }; -struct dma_map_ops *dma_ops = &alpha_noop_ops; +const struct dma_map_ops *dma_ops = &alpha_noop_ops; EXPORT_SYMBOL(dma_ops); void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) diff -uriN linux-2.6.38.4/arch/alpha/kernel/ptrace.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/ptrace.c --- linux-2.6.38.4/arch/alpha/kernel/ptrace.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/ptrace.c 2011-05-01 17:01:51.000000000 -0500 @@ -13,6 +13,7 @@ #include #include #include +#include #include #include diff -uriN linux-2.6.38.4/arch/alpha/kernel/systbls.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/systbls.S --- linux-2.6.38.4/arch/alpha/kernel/systbls.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/systbls.S 2011-05-01 17:01:51.000000000 -0500 @@ -446,7 +446,7 @@ .quad sys_stat64 /* 425 */ .quad sys_lstat64 .quad sys_fstat64 - .quad sys_ni_syscall /* sys_vserver */ + .quad sys_vserver /* sys_vserver */ .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ diff -uriN linux-2.6.38.4/arch/alpha/kernel/traps.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/traps.c --- linux-2.6.38.4/arch/alpha/kernel/traps.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/kernel/traps.c 2011-05-01 17:01:51.000000000 -0500 @@ -183,7 +183,8 @@ #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); #endif - printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err); + printk("%s(%d[#%u]): %s %ld\n", current->comm, + task_pid_nr(current), current->xid, str, err); dik_show_regs(regs, r9_15); add_taint(TAINT_DIE); dik_show_trace((unsigned long *)(regs+1)); diff -uriN linux-2.6.38.4/arch/alpha/mm/fault.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/mm/fault.c --- linux-2.6.38.4/arch/alpha/mm/fault.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/alpha/mm/fault.c 2011-05-01 17:02:10.000000000 -0500 @@ -54,6 +54,124 @@ __reload_thread(pcb); } +#ifdef CONFIG_PAX_PAGEEXEC +/* + * PaX: decide what to do with offenders (regs->pc = fault address) + * + * returns 1 when task should be killed + * 2 when patched PLT trampoline was detected + * 3 when unpatched PLT trampoline was detected + */ +static int pax_handle_fetch_fault(struct pt_regs *regs) +{ + +#ifdef CONFIG_PAX_EMUPLT + int err; + + do { /* PaX: patched PLT emulation #1 */ + unsigned int ldah, ldq, jmp; + + err = get_user(ldah, (unsigned int *)regs->pc); + err |= get_user(ldq, (unsigned int *)(regs->pc+4)); + err |= get_user(jmp, (unsigned int *)(regs->pc+8)); + + if (err) + break; + + if ((ldah & 0xFFFF0000U) == 0x277B0000U && + (ldq & 0xFFFF0000U) == 0xA77B0000U && + jmp == 0x6BFB0000U) + { + unsigned long r27, addr; + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16; + unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL; + + addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL); + err = get_user(r27, (unsigned long *)addr); + if (err) + break; + + regs->r27 = r27; + regs->pc = r27; + return 2; + } + } while (0); + + do { /* PaX: patched PLT emulation #2 */ + unsigned int ldah, lda, br; + + err = get_user(ldah, (unsigned int *)regs->pc); + err |= get_user(lda, (unsigned int *)(regs->pc+4)); + err |= get_user(br, (unsigned int *)(regs->pc+8)); + + if (err) + break; + + if ((ldah & 0xFFFF0000U) == 0x277B0000U && + (lda & 0xFFFF0000U) == 0xA77B0000U && + (br & 0xFFE00000U) == 0xC3E00000U) + { + unsigned long addr = br | 0xFFFFFFFFFFE00000UL; + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16; + unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL; + + regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL); + regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2); + return 2; + } + } while (0); + + do { /* PaX: unpatched PLT emulation */ + unsigned int br; + + err = get_user(br, (unsigned int *)regs->pc); + + if (!err && (br & 0xFFE00000U) == 0xC3800000U) { + unsigned int br2, ldq, nop, jmp; + unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver; + + addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2); + err = get_user(br2, (unsigned int *)addr); + err |= get_user(ldq, (unsigned int *)(addr+4)); + err |= get_user(nop, (unsigned int *)(addr+8)); + err |= get_user(jmp, (unsigned int *)(addr+12)); + err |= get_user(resolver, (unsigned long *)(addr+16)); + + if (err) + break; + + if (br2 == 0xC3600000U && + ldq == 0xA77B000CU && + nop == 0x47FF041FU && + jmp == 0x6B7B0000U) + { + regs->r28 = regs->pc+4; + regs->r27 = addr+16; + regs->pc = resolver; + return 3; + } + } + } while (0); +#endif + + return 1; +} + +void pax_report_insns(void *pc, void *sp) +{ + unsigned long i; + + printk(KERN_ERR "PAX: bytes at PC: "); + for (i = 0; i < 5; i++) { + unsigned int c; + if (get_user(c, (unsigned int *)pc+i)) + printk(KERN_CONT "???????? "); + else + printk(KERN_CONT "%08x ", c); + } + printk("\n"); +} +#endif /* * This routine handles page faults. It determines the address, @@ -131,8 +249,29 @@ good_area: si_code = SEGV_ACCERR; if (cause < 0) { - if (!(vma->vm_flags & VM_EXEC)) + if (!(vma->vm_flags & VM_EXEC)) { + +#ifdef CONFIG_PAX_PAGEEXEC + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc) + goto bad_area; + + up_read(&mm->mmap_sem); + switch (pax_handle_fetch_fault(regs)) { + +#ifdef CONFIG_PAX_EMUPLT + case 2: + case 3: + return; +#endif + + } + pax_report_fault(regs, (void *)regs->pc, (void *)rdusp()); + do_group_exit(SIGKILL); +#else goto bad_area; +#endif + + } } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) diff -uriN linux-2.6.38.4/arch/arm/include/asm/elf.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/include/asm/elf.h --- linux-2.6.38.4/arch/arm/include/asm/elf.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/include/asm/elf.h 2011-05-01 17:02:10.000000000 -0500 @@ -115,7 +115,14 @@ the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) + +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE 0x00008000UL + +#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10) +#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10) +#endif /* When the program starts, a1 contains a pointer to a function to be registered with atexit, as per the SVR4 ABI. A value of 0 means we @@ -125,10 +132,6 @@ extern void elf_set_personality(const struct elf32_hdr *); #define SET_PERSONALITY(ex) elf_set_personality(&(ex)) -struct mm_struct; -extern unsigned long arch_randomize_brk(struct mm_struct *mm); -#define arch_randomize_brk arch_randomize_brk - extern int vectors_user_mapping(void); #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping() #define ARCH_HAS_SETUP_ADDITIONAL_PAGES diff -uriN linux-2.6.38.4/arch/arm/include/asm/kmap_types.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/include/asm/kmap_types.h --- linux-2.6.38.4/arch/arm/include/asm/kmap_types.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/include/asm/kmap_types.h 2011-05-01 17:02:10.000000000 -0500 @@ -21,6 +21,7 @@ KM_L1_CACHE, KM_L2_CACHE, KM_KDB, + KM_CLEARPAGE, KM_TYPE_NR }; diff -uriN linux-2.6.38.4/arch/arm/include/asm/uaccess.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/include/asm/uaccess.h --- linux-2.6.38.4/arch/arm/include/asm/uaccess.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/include/asm/uaccess.h 2011-05-01 17:02:10.000000000 -0500 @@ -403,6 +403,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) { + if ((long)n < 0) + return n; + if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else /* security hole - plug it */ @@ -412,6 +415,9 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { + if ((long)n < 0) + return n; + if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; diff -uriN linux-2.6.38.4/arch/arm/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/Kconfig --- linux-2.6.38.4/arch/arm/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -1934,6 +1934,8 @@ source "arch/arm/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/arm/kernel/calls.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/kernel/calls.S --- linux-2.6.38.4/arch/arm/kernel/calls.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/kernel/calls.S 2011-05-01 17:01:51.000000000 -0500 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) CALL(ABI(sys_semtimedop, sys_oabi_semtimedop)) -/* vserver */ CALL(sys_ni_syscall) + CALL(sys_vserver) CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) diff -uriN linux-2.6.38.4/arch/arm/kernel/kgdb.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/kernel/kgdb.c --- linux-2.6.38.4/arch/arm/kernel/kgdb.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/kernel/kgdb.c 2011-05-01 17:02:10.000000000 -0500 @@ -246,7 +246,7 @@ * and we handle the normal undef case within the do_undefinstr * handler. */ -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { #ifndef __ARMEB__ .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} #else /* ! __ARMEB__ */ diff -uriN linux-2.6.38.4/arch/arm/kernel/process.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/kernel/process.c --- linux-2.6.38.4/arch/arm/kernel/process.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/kernel/process.c 2011-05-01 17:02:10.000000000 -0500 @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -315,7 +314,8 @@ void show_regs(struct pt_regs * regs) { printk("\n"); - printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm); + printk("Pid: %d[#%u], comm: %20s\n", + task_pid_nr(current), current->xid, current->comm); __show_regs(regs); __backtrace(); } @@ -477,12 +477,6 @@ return 0; } -unsigned long arch_randomize_brk(struct mm_struct *mm) -{ - unsigned long range_end = mm->brk + 0x02000000; - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; -} - #ifdef CONFIG_MMU /* * The vectors page is always readable from user space for the diff -uriN linux-2.6.38.4/arch/arm/kernel/traps.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/kernel/traps.c --- linux-2.6.38.4/arch/arm/kernel/traps.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/kernel/traps.c 2011-05-01 17:01:51.000000000 -0500 @@ -243,8 +243,8 @@ print_modules(); __show_regs(regs); - printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n", - TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1); + printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n", + TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1); if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, diff -uriN linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/mach-msm/last_radio_log.c --- linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/mach-msm/last_radio_log.c 2011-05-01 17:02:10.000000000 -0500 @@ -47,7 +47,7 @@ return count; } -static struct file_operations last_radio_log_fops = { +static struct file_operations last_radio_log_fops = { /* cannot be const, see msm_init_last_radio_log */ .read = last_radio_log_read, .llseek = default_llseek, }; diff -uriN linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/mach-ux500/mbox-db5500.c --- linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/mach-ux500/mbox-db5500.c 2011-05-01 17:02:10.000000000 -0500 @@ -168,7 +168,7 @@ return sprintf(buf, "0x%X\n", mbox_value); } -static DEVICE_ATTR(fifo, S_IWUGO | S_IRUGO, mbox_read_fifo, mbox_write_fifo); +static DEVICE_ATTR(fifo, S_IWUSR | S_IRUGO, mbox_read_fifo, mbox_write_fifo); static int mbox_show(struct seq_file *s, void *data) { diff -uriN linux-2.6.38.4/arch/arm/mm/fault.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/mm/fault.c --- linux-2.6.38.4/arch/arm/mm/fault.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/mm/fault.c 2011-05-01 17:02:10.000000000 -0500 @@ -167,6 +167,13 @@ } #endif +#ifdef CONFIG_PAX_PAGEEXEC + if (fsr & FSR_LNX_PF) { + pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp); + do_group_exit(SIGKILL); + } +#endif + tsk->thread.address = addr; tsk->thread.error_code = fsr; tsk->thread.trap_no = 14; @@ -364,6 +371,33 @@ } #endif /* CONFIG_MMU */ +#ifdef CONFIG_PAX_PAGEEXEC +void pax_report_insns(void *pc, void *sp) +{ + long i; + + printk(KERN_ERR "PAX: bytes at PC: "); + for (i = 0; i < 20; i++) { + unsigned char c; + if (get_user(c, (__force unsigned char __user *)pc+i)) + printk(KERN_CONT "?? "); + else + printk(KERN_CONT "%02x ", c); + } + printk("\n"); + + printk(KERN_ERR "PAX: bytes at SP-4: "); + for (i = -1; i < 20; i++) { + unsigned long c; + if (get_user(c, (__force unsigned long __user *)sp+i)) + printk(KERN_CONT "???????? "); + else + printk(KERN_CONT "%08lx ", c); + } + printk("\n"); +} +#endif + /* * First Level Translation Fault Handler * diff -uriN linux-2.6.38.4/arch/arm/mm/mmap.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/mm/mmap.c --- linux-2.6.38.4/arch/arm/mm/mmap.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/arm/mm/mmap.c 2011-05-01 17:02:10.000000000 -0500 @@ -64,6 +64,10 @@ if (len > TASK_SIZE) return -ENOMEM; +#ifdef CONFIG_PAX_RANDMMAP + if (!(mm->pax_flags & MF_PAX_RANDMMAP)) +#endif + if (addr) { if (do_align) addr = COLOUR_ALIGN(addr, pgoff); @@ -71,15 +75,14 @@ addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); - if (TASK_SIZE - len >= addr && - (!vma || addr + len <= vma->vm_start)) + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len)) return addr; } if (len > mm->cached_hole_size) { - start_addr = addr = mm->free_area_cache; + start_addr = addr = mm->free_area_cache; } else { - start_addr = addr = TASK_UNMAPPED_BASE; - mm->cached_hole_size = 0; + start_addr = addr = mm->mmap_base; + mm->cached_hole_size = 0; } /* 8 bits of randomness in 20 address space bits */ if (current->flags & PF_RANDOMIZE) @@ -98,14 +101,14 @@ * Start a new search - just in case we missed * some holes. */ - if (start_addr != TASK_UNMAPPED_BASE) { - start_addr = addr = TASK_UNMAPPED_BASE; + if (start_addr != mm->mmap_base) { + start_addr = addr = mm->mmap_base; mm->cached_hole_size = 0; goto full_search; } return -ENOMEM; } - if (!vma || addr + len <= vma->vm_start) { + if (check_heap_stack_gap(vma, addr, len)) { /* * Remember the place where we stopped the search: */ diff -uriN linux-2.6.38.4/arch/avr32/include/asm/elf.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/avr32/include/asm/elf.h --- linux-2.6.38.4/arch/avr32/include/asm/elf.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/avr32/include/asm/elf.h 2011-05-01 17:02:10.000000000 -0500 @@ -84,8 +84,14 @@ the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE 0x00001000UL + +#define PAX_DELTA_MMAP_LEN 15 +#define PAX_DELTA_STACK_LEN 15 +#endif /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, diff -uriN linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/avr32/include/asm/kmap_types.h --- linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/avr32/include/asm/kmap_types.h 2011-05-01 17:02:10.000000000 -0500 @@ -22,7 +22,8 @@ D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, D(13) KM_SOFTIRQ1, -D(14) KM_TYPE_NR +D(14) KM_CLEARPAGE, +D(15) KM_TYPE_NR }; #undef D diff -uriN linux-2.6.38.4/arch/avr32/mm/fault.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/avr32/mm/fault.c --- linux-2.6.38.4/arch/avr32/mm/fault.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/avr32/mm/fault.c 2011-05-01 17:02:10.000000000 -0500 @@ -41,6 +41,23 @@ int exception_trace = 1; +#ifdef CONFIG_PAX_PAGEEXEC +void pax_report_insns(void *pc, void *sp) +{ + unsigned long i; + + printk(KERN_ERR "PAX: bytes at PC: "); + for (i = 0; i < 20; i++) { + unsigned char c; + if (get_user(c, (unsigned char *)pc+i)) + printk(KERN_CONT "???????? "); + else + printk(KERN_CONT "%02x ", c); + } + printk("\n"); +} +#endif + /* * This routine handles page faults. It determines the address and the * problem, and then passes it off to one of the appropriate routines. @@ -156,6 +173,16 @@ up_read(&mm->mmap_sem); if (user_mode(regs)) { + +#ifdef CONFIG_PAX_PAGEEXEC + if (mm->pax_flags & MF_PAX_PAGEEXEC) { + if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) { + pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp); + do_group_exit(SIGKILL); + } + } +#endif + if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", diff -uriN linux-2.6.38.4/arch/blackfin/kernel/kgdb.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/blackfin/kernel/kgdb.c --- linux-2.6.38.4/arch/blackfin/kernel/kgdb.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/blackfin/kernel/kgdb.c 2011-05-01 17:02:10.000000000 -0500 @@ -420,7 +420,7 @@ return -1; /* this means that we do not want to exit from the handler */ } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { .gdb_bpt_instr = {0xa1}, #ifdef CONFIG_SMP .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, diff -uriN linux-2.6.38.4/arch/blackfin/mm/maccess.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/blackfin/mm/maccess.c --- linux-2.6.38.4/arch/blackfin/mm/maccess.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/blackfin/mm/maccess.c 2011-05-01 17:02:10.000000000 -0500 @@ -16,7 +16,7 @@ return bfin_mem_access_type(addr, size); } -long probe_kernel_read(void *dst, void *src, size_t size) +long probe_kernel_read(void *dst, const void *src, size_t size) { unsigned long lsrc = (unsigned long)src; int mem_type; @@ -55,7 +55,7 @@ return -EFAULT; } -long probe_kernel_write(void *dst, void *src, size_t size) +long probe_kernel_write(void *dst, const void *src, size_t size) { unsigned long ldst = (unsigned long)dst; int mem_type; diff -uriN linux-2.6.38.4/arch/cris/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/cris/Kconfig --- linux-2.6.38.4/arch/cris/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/cris/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -685,6 +685,8 @@ source "arch/cris/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/frv/include/asm/kmap_types.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/frv/include/asm/kmap_types.h --- linux-2.6.38.4/arch/frv/include/asm/kmap_types.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/frv/include/asm/kmap_types.h 2011-05-01 17:02:10.000000000 -0500 @@ -23,6 +23,7 @@ KM_IRQ1, KM_SOFTIRQ0, KM_SOFTIRQ1, + KM_CLEARPAGE, KM_TYPE_NR }; diff -uriN linux-2.6.38.4/arch/frv/kernel/kernel_thread.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/frv/kernel/kernel_thread.S --- linux-2.6.38.4/arch/frv/kernel/kernel_thread.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/frv/kernel/kernel_thread.S 2011-05-01 17:01:51.000000000 -0500 @@ -37,7 +37,7 @@ # start by forking the current process, but with shared VM setlos.p #__NR_clone,gr7 ; syscall number - ori gr10,#CLONE_VM,gr8 ; first syscall arg [clone_flags] + ori gr10,#CLONE_KT,gr8 ; first syscall arg [clone_flags] sethi.p #0xe4e4,gr9 ; second syscall arg [newsp] setlo #0xe4e4,gr9 setlos.p #0,gr10 ; third syscall arg [parent_tidptr] diff -uriN linux-2.6.38.4/arch/frv/mm/elf-fdpic.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/frv/mm/elf-fdpic.c --- linux-2.6.38.4/arch/frv/mm/elf-fdpic.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/frv/mm/elf-fdpic.c 2011-05-01 17:02:10.000000000 -0500 @@ -73,8 +73,7 @@ if (addr) { addr = PAGE_ALIGN(addr); vma = find_vma(current->mm, addr); - if (TASK_SIZE - len >= addr && - (!vma || addr + len <= vma->vm_start)) + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len)) goto success; } @@ -89,7 +88,7 @@ for (; vma; vma = vma->vm_next) { if (addr > limit) break; - if (addr + len <= vma->vm_start) + if (check_heap_stack_gap(vma, addr, len)) goto success; addr = vma->vm_end; } @@ -104,7 +103,7 @@ for (; vma; vma = vma->vm_next) { if (addr > limit) break; - if (addr + len <= vma->vm_start) + if (check_heap_stack_gap(vma, addr, len)) goto success; addr = vma->vm_end; } diff -uriN linux-2.6.38.4/arch/h8300/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/h8300/Kconfig --- linux-2.6.38.4/arch/h8300/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/h8300/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -217,6 +217,8 @@ source "arch/h8300/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/hp/common/hwsw_iommu.c --- linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/hp/common/hwsw_iommu.c 2011-05-01 17:02:10.000000000 -0500 @@ -17,7 +17,7 @@ #include #include -extern struct dma_map_ops sba_dma_ops, swiotlb_dma_ops; +extern const struct dma_map_ops sba_dma_ops, swiotlb_dma_ops; /* swiotlb declarations & definitions: */ extern int swiotlb_late_init_with_default_size (size_t size); @@ -33,7 +33,7 @@ !sba_dma_ops.dma_supported(dev, *dev->dma_mask); } -struct dma_map_ops *hwsw_dma_get_ops(struct device *dev) +const struct dma_map_ops *hwsw_dma_get_ops(struct device *dev) { if (use_swiotlb(dev)) return &swiotlb_dma_ops; diff -uriN linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/hp/common/sba_iommu.c --- linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/hp/common/sba_iommu.c 2011-05-01 17:02:10.000000000 -0500 @@ -2097,7 +2097,7 @@ }, }; -extern struct dma_map_ops swiotlb_dma_ops; +extern const struct dma_map_ops swiotlb_dma_ops; static int __init sba_init(void) @@ -2211,7 +2211,7 @@ __setup("sbapagesize=",sba_page_override); -struct dma_map_ops sba_dma_ops = { +const struct dma_map_ops sba_dma_ops = { .alloc_coherent = sba_alloc_coherent, .free_coherent = sba_free_coherent, .map_page = sba_map_page, diff -uriN linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/dma-mapping.h --- linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/dma-mapping.h 2011-05-01 17:02:10.000000000 -0500 @@ -12,7 +12,7 @@ #define ARCH_HAS_DMA_GET_REQUIRED_MASK -extern struct dma_map_ops *dma_ops; +extern const struct dma_map_ops *dma_ops; extern struct ia64_machine_vector ia64_mv; extern void set_iommu_machvec(void); @@ -24,7 +24,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *daddr, gfp_t gfp) { - struct dma_map_ops *ops = platform_dma_get_ops(dev); + const struct dma_map_ops *ops = platform_dma_get_ops(dev); void *caddr; caddr = ops->alloc_coherent(dev, size, daddr, gfp); @@ -35,7 +35,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size, void *caddr, dma_addr_t daddr) { - struct dma_map_ops *ops = platform_dma_get_ops(dev); + const struct dma_map_ops *ops = platform_dma_get_ops(dev); debug_dma_free_coherent(dev, size, caddr, daddr); ops->free_coherent(dev, size, caddr, daddr); } @@ -49,13 +49,13 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t daddr) { - struct dma_map_ops *ops = platform_dma_get_ops(dev); + const struct dma_map_ops *ops = platform_dma_get_ops(dev); return ops->mapping_error(dev, daddr); } static inline int dma_supported(struct device *dev, u64 mask) { - struct dma_map_ops *ops = platform_dma_get_ops(dev); + const struct dma_map_ops *ops = platform_dma_get_ops(dev); return ops->dma_supported(dev, mask); } diff -uriN linux-2.6.38.4/arch/ia64/include/asm/elf.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/elf.h --- linux-2.6.38.4/arch/ia64/include/asm/elf.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/elf.h 2011-05-01 17:02:10.000000000 -0500 @@ -42,6 +42,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL) + +#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13) +#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13) +#endif + #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ diff -uriN linux-2.6.38.4/arch/ia64/include/asm/machvec.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/machvec.h --- linux-2.6.38.4/arch/ia64/include/asm/machvec.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/machvec.h 2011-05-01 17:02:10.000000000 -0500 @@ -45,7 +45,7 @@ /* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void); typedef u64 ia64_mv_dma_get_required_mask (struct device *); -typedef struct dma_map_ops *ia64_mv_dma_get_ops(struct device *); +typedef const struct dma_map_ops *ia64_mv_dma_get_ops(struct device *); /* * WARNING: The legacy I/O space is _architected_. Platforms are @@ -251,7 +251,7 @@ # endif /* CONFIG_IA64_GENERIC */ extern void swiotlb_dma_init(void); -extern struct dma_map_ops *dma_get_ops(struct device *); +extern const struct dma_map_ops *dma_get_ops(struct device *); /* * Define default versions so we can extend machvec for new platforms without having diff -uriN linux-2.6.38.4/arch/ia64/include/asm/pgtable.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/pgtable.h --- linux-2.6.38.4/arch/ia64/include/asm/pgtable.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/pgtable.h 2011-05-01 17:02:10.000000000 -0500 @@ -12,7 +12,7 @@ * David Mosberger-Tang */ - +#include #include #include #include @@ -143,6 +143,17 @@ #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX) + +#ifdef CONFIG_PAX_PAGEEXEC +# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW) +# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) +# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) +#else +# define PAGE_SHARED_NOEXEC PAGE_SHARED +# define PAGE_READONLY_NOEXEC PAGE_READONLY +# define PAGE_COPY_NOEXEC PAGE_COPY +#endif + #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) diff -uriN linux-2.6.38.4/arch/ia64/include/asm/spinlock.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/spinlock.h --- linux-2.6.38.4/arch/ia64/include/asm/spinlock.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/spinlock.h 2011-05-01 17:02:10.000000000 -0500 @@ -72,7 +72,7 @@ unsigned short *p = (unsigned short *)&lock->lock + 1, tmp; asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p)); - ACCESS_ONCE(*p) = (tmp + 2) & ~1; + ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1; } static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock) diff -uriN linux-2.6.38.4/arch/ia64/include/asm/tlb.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/tlb.h --- linux-2.6.38.4/arch/ia64/include/asm/tlb.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/tlb.h 2011-05-01 17:01:51.000000000 -0500 @@ -40,6 +40,7 @@ #include #include #include +#include #include #include diff -uriN linux-2.6.38.4/arch/ia64/include/asm/uaccess.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/uaccess.h --- linux-2.6.38.4/arch/ia64/include/asm/uaccess.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/include/asm/uaccess.h 2011-05-01 17:02:10.000000000 -0500 @@ -257,7 +257,7 @@ const void *__cu_from = (from); \ long __cu_len = (n); \ \ - if (__access_ok(__cu_to, __cu_len, get_fs())) \ + if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \ __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \ __cu_len; \ }) @@ -269,7 +269,7 @@ long __cu_len = (n); \ \ __chk_user_ptr(__cu_from); \ - if (__access_ok(__cu_from, __cu_len, get_fs())) \ + if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \ __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) diff -uriN linux-2.6.38.4/arch/ia64/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/Kconfig --- linux-2.6.38.4/arch/ia64/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -674,6 +674,8 @@ source "arch/ia64/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/dma-mapping.c --- linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/dma-mapping.c 2011-05-01 17:02:10.000000000 -0500 @@ -3,7 +3,7 @@ /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly; -struct dma_map_ops *dma_ops; +const struct dma_map_ops *dma_ops; EXPORT_SYMBOL(dma_ops); #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16) @@ -16,7 +16,7 @@ } fs_initcall(dma_init); -struct dma_map_ops *dma_get_ops(struct device *dev) +const struct dma_map_ops *dma_get_ops(struct device *dev) { return dma_ops; } diff -uriN linux-2.6.38.4/arch/ia64/kernel/entry.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/entry.S --- linux-2.6.38.4/arch/ia64/kernel/entry.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/entry.S 2011-05-01 17:01:51.000000000 -0500 @@ -1714,7 +1714,7 @@ data8 sys_mq_notify data8 sys_mq_getsetattr data8 sys_kexec_load - data8 sys_ni_syscall // reserved for vserver + data8 sys_vserver data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key diff -uriN linux-2.6.38.4/arch/ia64/kernel/module.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/module.c --- linux-2.6.38.4/arch/ia64/kernel/module.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/module.c 2011-05-01 17:02:10.000000000 -0500 @@ -315,8 +315,7 @@ void module_free (struct module *mod, void *module_region) { - if (mod && mod->arch.init_unw_table && - module_region == mod->module_init) { + if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) { unw_remove_unwind_table(mod->arch.init_unw_table); mod->arch.init_unw_table = NULL; } @@ -502,15 +501,39 @@ } static inline int +in_init_rx (const struct module *mod, uint64_t addr) +{ + return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx; +} + +static inline int +in_init_rw (const struct module *mod, uint64_t addr) +{ + return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw; +} + +static inline int in_init (const struct module *mod, uint64_t addr) { - return addr - (uint64_t) mod->module_init < mod->init_size; + return in_init_rx(mod, addr) || in_init_rw(mod, addr); +} + +static inline int +in_core_rx (const struct module *mod, uint64_t addr) +{ + return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx; +} + +static inline int +in_core_rw (const struct module *mod, uint64_t addr) +{ + return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw; } static inline int in_core (const struct module *mod, uint64_t addr) { - return addr - (uint64_t) mod->module_core < mod->core_size; + return in_core_rx(mod, addr) || in_core_rw(mod, addr); } static inline int @@ -693,7 +716,14 @@ break; case RV_BDREL: - val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core); + if (in_init_rx(mod, val)) + val -= (uint64_t) mod->module_init_rx; + else if (in_init_rw(mod, val)) + val -= (uint64_t) mod->module_init_rw; + else if (in_core_rx(mod, val)) + val -= (uint64_t) mod->module_core_rx; + else if (in_core_rw(mod, val)) + val -= (uint64_t) mod->module_core_rw; break; case RV_LTV: @@ -828,15 +858,15 @@ * addresses have been selected... */ uint64_t gp; - if (mod->core_size > MAX_LTOFF) + if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF) /* * This takes advantage of fact that SHF_ARCH_SMALL gets allocated * at the end of the module. */ - gp = mod->core_size - MAX_LTOFF / 2; + gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2; else - gp = mod->core_size / 2; - gp = (uint64_t) mod->module_core + ((gp + 7) & -8); + gp = (mod->core_size_rx + mod->core_size_rw) / 2; + gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8); mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } diff -uriN linux-2.6.38.4/arch/ia64/kernel/pci-dma.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/pci-dma.c --- linux-2.6.38.4/arch/ia64/kernel/pci-dma.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/pci-dma.c 2011-05-01 17:02:10.000000000 -0500 @@ -43,7 +43,7 @@ .dma_mask = &fallback_dev.coherent_dma_mask, }; -extern struct dma_map_ops intel_dma_ops; +extern const struct dma_map_ops intel_dma_ops; static int __init pci_iommu_init(void) { diff -uriN linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/pci-swiotlb.c --- linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/pci-swiotlb.c 2011-05-01 17:02:10.000000000 -0500 @@ -22,7 +22,7 @@ return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); } -struct dma_map_ops swiotlb_dma_ops = { +const struct dma_map_ops swiotlb_dma_ops = { .alloc_coherent = ia64_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, .map_page = swiotlb_map_page, diff -uriN linux-2.6.38.4/arch/ia64/kernel/perfmon.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/perfmon.c --- linux-2.6.38.4/arch/ia64/kernel/perfmon.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/perfmon.c 2011-05-01 17:01:51.000000000 -0500 @@ -42,6 +42,7 @@ #include #include #include +#include #include #include diff -uriN linux-2.6.38.4/arch/ia64/kernel/process.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/process.c --- linux-2.6.38.4/arch/ia64/kernel/process.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/process.c 2011-05-01 17:01:51.000000000 -0500 @@ -109,8 +109,8 @@ unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; print_modules(); - printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current), - smp_processor_id(), current->comm); + printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current), + current->xid, smp_processor_id(), current->comm); printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), init_utsname()->release); diff -uriN linux-2.6.38.4/arch/ia64/kernel/ptrace.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/ptrace.c --- linux-2.6.38.4/arch/ia64/kernel/ptrace.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/ptrace.c 2011-05-01 17:01:51.000000000 -0500 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include diff -uriN linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/sys_ia64.c --- linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/sys_ia64.c 2011-05-01 17:02:10.000000000 -0500 @@ -43,6 +43,13 @@ if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; #endif + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + addr = mm->free_area_cache; + else +#endif + if (!addr) addr = mm->free_area_cache; @@ -61,14 +68,14 @@ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) { /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) { - if (start_addr != TASK_UNMAPPED_BASE) { + if (start_addr != mm->mmap_base) { /* Start a new search --- just in case we missed some holes. */ - addr = TASK_UNMAPPED_BASE; + addr = mm->mmap_base; goto full_search; } return -ENOMEM; } - if (!vma || addr + len <= vma->vm_start) { + if (check_heap_stack_gap(vma, addr, len)) { /* Remember the address where we stopped this search: */ mm->free_area_cache = addr + len; return addr; diff -uriN linux-2.6.38.4/arch/ia64/kernel/traps.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/traps.c --- linux-2.6.38.4/arch/ia64/kernel/traps.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/traps.c 2011-05-01 17:01:51.000000000 -0500 @@ -59,8 +59,9 @@ put_cpu(); if (++die.lock_owner_depth < 3) { - printk("%s[%d]: %s %ld [%d]\n", - current->comm, task_pid_nr(current), str, err, ++die_counter); + printk("%s[%d[#%u]]: %s %ld [%d]\n", + current->comm, task_pid_nr(current), current->xid, + str, err, ++die_counter); if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) != NOTIFY_STOP) show_regs(regs); @@ -323,8 +324,9 @@ if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) { last.time = current_jiffies + 5 * HZ; printk(KERN_WARNING - "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n", - current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr); + "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n", + current->comm, task_pid_nr(current), current->xid, + regs->cr_iip + ia64_psr(regs)->ri, isr); } } } diff -uriN linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/vmlinux.lds.S --- linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/kernel/vmlinux.lds.S 2011-05-01 17:02:10.000000000 -0500 @@ -199,7 +199,7 @@ /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); PERCPU_VADDR(PERCPU_ADDR, :percpu) - __phys_per_cpu_start = __per_cpu_load; + __phys_per_cpu_start = per_cpu_load; /* * ensure percpu data fits * into percpu page size diff -uriN linux-2.6.38.4/arch/ia64/mm/fault.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/mm/fault.c --- linux-2.6.38.4/arch/ia64/mm/fault.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/mm/fault.c 2011-05-01 17:02:10.000000000 -0500 @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -72,6 +73,23 @@ return pte_present(pte); } +#ifdef CONFIG_PAX_PAGEEXEC +void pax_report_insns(void *pc, void *sp) +{ + unsigned long i; + + printk(KERN_ERR "PAX: bytes at PC: "); + for (i = 0; i < 8; i++) { + unsigned int c; + if (get_user(c, (unsigned int *)pc+i)) + printk(KERN_CONT "???????? "); + else + printk(KERN_CONT "%08x ", c); + } + printk("\n"); +} +#endif + void __kprobes ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs) { @@ -145,9 +163,23 @@ mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT) | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT)); - if ((vma->vm_flags & mask) != mask) + if ((vma->vm_flags & mask) != mask) { + +#ifdef CONFIG_PAX_PAGEEXEC + if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) { + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip) + goto bad_area; + + up_read(&mm->mmap_sem); + pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12); + do_group_exit(SIGKILL); + } +#endif + goto bad_area; + } + /* * If for any reason at all we couldn't handle the fault, make * sure we exit gracefully rather than endlessly redo the diff -uriN linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/mm/hugetlbpage.c --- linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/mm/hugetlbpage.c 2011-05-01 17:02:10.000000000 -0500 @@ -171,7 +171,7 @@ /* At this point: (!vmm || addr < vmm->vm_end). */ if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) return -ENOMEM; - if (!vmm || (addr + len) <= vmm->vm_start) + if (check_heap_stack_gap(vmm, addr, len)) return addr; addr = ALIGN(vmm->vm_end, HPAGE_SIZE); } diff -uriN linux-2.6.38.4/arch/ia64/mm/init.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/mm/init.c --- linux-2.6.38.4/arch/ia64/mm/init.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/mm/init.c 2011-05-01 17:02:10.000000000 -0500 @@ -122,6 +122,19 @@ vma->vm_start = current->thread.rbs_bot & PAGE_MASK; vma->vm_end = vma->vm_start + PAGE_SIZE; vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT; + +#ifdef CONFIG_PAX_PAGEEXEC + if (current->mm->pax_flags & MF_PAX_PAGEEXEC) { + vma->vm_flags &= ~VM_EXEC; + +#ifdef CONFIG_PAX_MPROTECT + if (current->mm->pax_flags & MF_PAX_MPROTECT) + vma->vm_flags &= ~VM_MAYEXEC; +#endif + + } +#endif + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { diff -uriN linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/sn/pci/pci_dma.c --- linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/ia64/sn/pci/pci_dma.c 2011-05-01 17:02:10.000000000 -0500 @@ -465,7 +465,7 @@ return ret; } -static struct dma_map_ops sn_dma_ops = { +static const struct dma_map_ops sn_dma_ops = { .alloc_coherent = sn_dma_alloc_coherent, .free_coherent = sn_dma_free_coherent, .map_page = sn_dma_map_page, diff -uriN linux-2.6.38.4/arch/m32r/kernel/traps.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m32r/kernel/traps.c --- linux-2.6.38.4/arch/m32r/kernel/traps.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m32r/kernel/traps.c 2011-05-01 17:01:51.000000000 -0500 @@ -196,8 +196,9 @@ } else { printk("SPI: %08lx\n", sp); } - printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)", - current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current); + printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)", + current->comm, task_pid_nr(current), current->xid, + 0xffff & i, 4096+(unsigned long)current); /* * When in-kernel, we also print out the stack and code at the diff -uriN linux-2.6.38.4/arch/m32r/lib/usercopy.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m32r/lib/usercopy.c --- linux-2.6.38.4/arch/m32r/lib/usercopy.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m32r/lib/usercopy.c 2011-05-01 17:02:10.000000000 -0500 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) { + if ((long)n < 0) + return n; + prefetch(from); if (access_ok(VERIFY_WRITE, to, n)) __copy_user(to,from,n); @@ -23,6 +26,9 @@ unsigned long __generic_copy_from_user(void *to, const void __user *from, unsigned long n) { + if ((long)n < 0) + return n; + prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); diff -uriN linux-2.6.38.4/arch/m68k/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m68k/Kconfig --- linux-2.6.38.4/arch/m68k/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m68k/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -610,6 +610,8 @@ source "arch/m68k/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/m68k/kernel/ptrace.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m68k/kernel/ptrace.c --- linux-2.6.38.4/arch/m68k/kernel/ptrace.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m68k/kernel/ptrace.c 2011-05-01 17:01:51.000000000 -0500 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -255,6 +256,8 @@ ret = ptrace_request(child, request, addr, data); break; } + if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) + goto out_tsk; return ret; out_eio: diff -uriN linux-2.6.38.4/arch/m68k/kernel/traps.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m68k/kernel/traps.c --- linux-2.6.38.4/arch/m68k/kernel/traps.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m68k/kernel/traps.c 2011-05-01 17:01:51.000000000 -0500 @@ -906,8 +906,8 @@ printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", regs->d4, regs->d5, regs->a0, regs->a1); - printk("Process %s (pid: %d, task=%p)\n", - current->comm, task_pid_nr(current), current); + printk("Process %s (pid: %d[#%u], task=%p)\n", + current->comm, task_pid_nr(current), current->xid, current); addr = (unsigned long)&fp->un; printk("Frame format=%X ", regs->format); switch (regs->format) { diff -uriN linux-2.6.38.4/arch/m68knommu/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m68knommu/Kconfig --- linux-2.6.38.4/arch/m68knommu/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m68knommu/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -801,6 +801,8 @@ source "arch/m68knommu/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/m68knommu/kernel/traps.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m68knommu/kernel/traps.c --- linux-2.6.38.4/arch/m68knommu/kernel/traps.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/m68knommu/kernel/traps.c 2011-05-01 17:01:51.000000000 -0500 @@ -78,8 +78,9 @@ printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", fp->d4, fp->d5, fp->a0, fp->a1); - printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n", - current->comm, current->pid, PAGE_SIZE+(unsigned long)current); + printk(KERN_EMERG "Process %s (pid: %d[#%u], stackpage=%08lx)\n", + current->comm, task_pid_nr(current), current->xid, + PAGE_SIZE+(unsigned long)current); show_stack(NULL, (unsigned long *)(fp + 1)); add_taint(TAINT_DIE); do_exit(SIGSEGV); diff -uriN linux-2.6.38.4/arch/microblaze/include/asm/device.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/microblaze/include/asm/device.h --- linux-2.6.38.4/arch/microblaze/include/asm/device.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/microblaze/include/asm/device.h 2011-05-01 17:02:10.000000000 -0500 @@ -13,7 +13,7 @@ struct dev_archdata { /* DMA operations on that device */ - struct dma_map_ops *dma_ops; + const struct dma_map_ops *dma_ops; void *dma_data; }; diff -uriN linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/microblaze/include/asm/dma-mapping.h --- linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/microblaze/include/asm/dma-mapping.h 2011-05-01 17:02:10.000000000 -0500 @@ -43,14 +43,14 @@ return 0xfffffffful; } -extern struct dma_map_ops *dma_ops; +extern const struct dma_map_ops *dma_ops; /* * Available generic sets of operations */ -extern struct dma_map_ops dma_direct_ops; +extern const struct dma_map_ops dma_direct_ops; -static inline struct dma_map_ops *get_dma_ops(struct device *dev) +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) { /* We don't handle the NULL dev case for ISA for now. We could * do it via an out of line call but it is not needed for now. The @@ -63,14 +63,14 @@ return dev->archdata.dma_ops; } -static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) +static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops) { dev->archdata.dma_ops = ops; } static inline int dma_supported(struct device *dev, u64 mask) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); if (unlikely(!ops)) return 0; @@ -81,7 +81,7 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); if (unlikely(ops == NULL)) return -EIO; @@ -97,7 +97,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); if (ops->mapping_error) return ops->mapping_error(dev, dma_addr); @@ -110,7 +110,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); void *memory; BUG_ON(!ops); @@ -124,7 +124,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_handle) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); BUG_ON(!ops); debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); diff -uriN linux-2.6.38.4/arch/microblaze/include/asm/pci.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/microblaze/include/asm/pci.h --- linux-2.6.38.4/arch/microblaze/include/asm/pci.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/microblaze/include/asm/pci.h 2011-05-01 17:02:10.000000000 -0500 @@ -54,8 +54,8 @@ } #ifdef CONFIG_PCI -extern void set_pci_dma_ops(struct dma_map_ops *dma_ops); -extern struct dma_map_ops *get_pci_dma_ops(void); +extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops); +extern const struct dma_map_ops *get_pci_dma_ops(void); #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL diff -uriN linux-2.6.38.4/arch/microblaze/kernel/dma.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/microblaze/kernel/dma.c --- linux-2.6.38.4/arch/microblaze/kernel/dma.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/microblaze/kernel/dma.c 2011-05-01 17:02:10.000000000 -0500 @@ -133,7 +133,7 @@ __dma_sync_page(dma_address, 0 , size, direction); } -struct dma_map_ops dma_direct_ops = { +const struct dma_map_ops dma_direct_ops = { .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = dma_direct_map_sg, diff -uriN linux-2.6.38.4/arch/microblaze/kernel/kgdb.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/microblaze/kernel/kgdb.c --- linux-2.6.38.4/arch/microblaze/kernel/kgdb.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/microblaze/kernel/kgdb.c 2011-05-01 17:02:10.000000000 -0500 @@ -141,10 +141,11 @@ /* * Global data */ -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { #ifdef __MICROBLAZEEL__ .gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */ #else +>>>>>>> master .gdb_bpt_instr = {0xba, 0x0c, 0x00, 0x18}, /* brki r16, 0x18 */ #endif }; diff -uriN linux-2.6.38.4/arch/microblaze/pci/pci-common.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/microblaze/pci/pci-common.c --- linux-2.6.38.4/arch/microblaze/pci/pci-common.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/microblaze/pci/pci-common.c 2011-05-01 17:02:10.000000000 -0500 @@ -47,14 +47,14 @@ /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */ unsigned int pci_flags; -static struct dma_map_ops *pci_dma_ops = &dma_direct_ops; +static const struct dma_map_ops *pci_dma_ops = &dma_direct_ops; -void set_pci_dma_ops(struct dma_map_ops *dma_ops) +void set_pci_dma_ops(const struct dma_map_ops *dma_ops) { pci_dma_ops = dma_ops; } -struct dma_map_ops *get_pci_dma_ops(void) +const struct dma_map_ops *get_pci_dma_ops(void) { return pci_dma_ops; } diff -uriN linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/cavium-octeon/dma-octeon.c --- linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/cavium-octeon/dma-octeon.c 2011-05-01 17:02:10.000000000 -0500 @@ -202,7 +202,7 @@ } struct octeon_dma_map_ops { - struct dma_map_ops dma_map_ops; + const struct dma_map_ops dma_map_ops; dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr); phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr); }; @@ -324,7 +324,7 @@ }, }; -struct dma_map_ops *octeon_pci_dma_map_ops; +const struct dma_map_ops *octeon_pci_dma_map_ops; void __init octeon_pci_dma_init(void) { diff -uriN linux-2.6.38.4/arch/mips/include/asm/device.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/include/asm/device.h --- linux-2.6.38.4/arch/mips/include/asm/device.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/include/asm/device.h 2011-05-01 17:02:10.000000000 -0500 @@ -10,7 +10,7 @@ struct dev_archdata { /* DMA operations on that device */ - struct dma_map_ops *dma_ops; + const struct dma_map_ops *dma_ops; }; struct pdev_archdata { diff -uriN linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/include/asm/dma-mapping.h --- linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/include/asm/dma-mapping.h 2011-05-01 17:02:10.000000000 -0500 @@ -7,9 +7,9 @@ #include -extern struct dma_map_ops *mips_dma_map_ops; +extern const struct dma_map_ops *mips_dma_map_ops; -static inline struct dma_map_ops *get_dma_ops(struct device *dev) +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) { if (dev && dev->archdata.dma_ops) return dev->archdata.dma_ops; @@ -31,13 +31,13 @@ static inline int dma_supported(struct device *dev, u64 mask) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); return ops->dma_supported(dev, mask); } static inline int dma_mapping_error(struct device *dev, u64 mask) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); return ops->mapping_error(dev, mask); } @@ -59,7 +59,7 @@ dma_addr_t *dma_handle, gfp_t gfp) { void *ret; - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); ret = ops->alloc_coherent(dev, size, dma_handle, gfp); @@ -71,7 +71,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); ops->free_coherent(dev, size, vaddr, dma_handle); diff -uriN linux-2.6.38.4/arch/mips/include/asm/elf.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/include/asm/elf.h --- linux-2.6.38.4/arch/mips/include/asm/elf.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/include/asm/elf.h 2011-05-01 17:02:10.000000000 -0500 @@ -372,13 +372,16 @@ #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL) + +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT) +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT) +#endif + #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1 struct linux_binprm; extern int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp); -struct mm_struct; -extern unsigned long arch_randomize_brk(struct mm_struct *mm); -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_ELF_H */ diff -uriN linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h --- linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-05-01 17:02:10.000000000 -0500 @@ -66,7 +66,7 @@ phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); struct dma_map_ops; -extern struct dma_map_ops *octeon_pci_dma_map_ops; +extern const struct dma_map_ops *octeon_pci_dma_map_ops; extern char *octeon_swiotlb; #endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */ diff -uriN linux-2.6.38.4/arch/mips/include/asm/page.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/include/asm/page.h --- linux-2.6.38.4/arch/mips/include/asm/page.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/include/asm/page.h 2011-05-01 17:02:10.000000000 -0500 @@ -93,7 +93,7 @@ #ifdef CONFIG_CPU_MIPS32 typedef struct { unsigned long pte_low, pte_high; } pte_t; #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32)) - #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; }) + #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; }) #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) diff -uriN linux-2.6.38.4/arch/mips/include/asm/system.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/include/asm/system.h --- linux-2.6.38.4/arch/mips/include/asm/system.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/include/asm/system.h 2011-05-01 17:02:10.000000000 -0500 @@ -230,6 +230,6 @@ */ #define __ARCH_WANT_UNLOCKED_CTXSW -extern unsigned long arch_align_stack(unsigned long sp); +#define arch_align_stack(x) ((x) & ~0xfUL) #endif /* _ASM_SYSTEM_H */ diff -uriN linux-2.6.38.4/arch/mips/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/Kconfig --- linux-2.6.38.4/arch/mips/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -2418,6 +2418,8 @@ source "arch/mips/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/binfmt_elfn32.c --- linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/binfmt_elfn32.c 2011-05-01 17:02:10.000000000 -0500 @@ -50,6 +50,13 @@ #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL) + +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT) +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT) +#endif + #include #include #include diff -uriN linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/binfmt_elfo32.c --- linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/binfmt_elfo32.c 2011-05-01 17:02:10.000000000 -0500 @@ -52,6 +52,13 @@ #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL) + +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT) +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT) +#endif + #include /* diff -uriN linux-2.6.38.4/arch/mips/kernel/kgdb.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/kgdb.c --- linux-2.6.38.4/arch/mips/kernel/kgdb.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/kgdb.c 2011-05-01 17:02:10.000000000 -0500 @@ -351,7 +351,7 @@ return -1; } -struct kgdb_arch arch_kgdb_ops; +struct kgdb_arch arch_kgdb_ops; /* cannot be const, see kgdb_arch_init */ /* * We use kgdb_early_setup so that functions we need to call now don't diff -uriN linux-2.6.38.4/arch/mips/kernel/process.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/process.c --- linux-2.6.38.4/arch/mips/kernel/process.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/process.c 2011-05-01 17:02:10.000000000 -0500 @@ -473,15 +473,3 @@ out: return pc; } - -/* - * Don't forget that the stack pointer must be aligned on a 8 bytes - * boundary for 32-bits ABI and 16 bytes for 64-bits ABI. - */ -unsigned long arch_align_stack(unsigned long sp) -{ - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) - sp -= get_random_int() & ~PAGE_MASK; - - return sp & ALMASK; -} diff -uriN linux-2.6.38.4/arch/mips/kernel/ptrace.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/ptrace.c --- linux-2.6.38.4/arch/mips/kernel/ptrace.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/ptrace.c 2011-05-01 17:01:51.000000000 -0500 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -263,6 +264,9 @@ void __user *datavp = (void __user *) data; unsigned long __user *datalp = (void __user *) data; + if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) + goto out; + switch (request) { /* when I and D space are separate, these will need to be fixed. */ case PTRACE_PEEKTEXT: /* read word at location addr. */ diff -uriN linux-2.6.38.4/arch/mips/kernel/scall32-o32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/scall32-o32.S --- linux-2.6.38.4/arch/mips/kernel/scall32-o32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/scall32-o32.S 2011-05-01 17:01:51.000000000 -0500 @@ -524,7 +524,7 @@ sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ sys sys_mq_getsetattr 3 - sys sys_ni_syscall 0 /* sys_vserver */ + sys sys_vserver 3 sys sys_waitid 5 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 /* 4280 */ diff -uriN linux-2.6.38.4/arch/mips/kernel/scall64-64.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/scall64-64.S --- linux-2.6.38.4/arch/mips/kernel/scall64-64.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/scall64-64.S 2011-05-01 17:01:51.000000000 -0500 @@ -363,7 +363,7 @@ PTR sys_mq_timedreceive PTR sys_mq_notify PTR sys_mq_getsetattr /* 5235 */ - PTR sys_ni_syscall /* sys_vserver */ + PTR sys_vserver PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key diff -uriN linux-2.6.38.4/arch/mips/kernel/scall64-n32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/scall64-n32.S --- linux-2.6.38.4/arch/mips/kernel/scall64-n32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/scall64-n32.S 2011-05-01 17:01:51.000000000 -0500 @@ -362,7 +362,7 @@ PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify PTR compat_sys_mq_getsetattr - PTR sys_ni_syscall /* 6240, sys_vserver */ + PTR sys32_vserver /* 6240 */ PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key diff -uriN linux-2.6.38.4/arch/mips/kernel/scall64-o32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/scall64-o32.S --- linux-2.6.38.4/arch/mips/kernel/scall64-o32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/scall64-o32.S 2011-05-01 17:01:51.000000000 -0500 @@ -481,7 +481,7 @@ PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ PTR compat_sys_mq_getsetattr - PTR sys_ni_syscall /* sys_vserver */ + PTR sys32_vserver PTR sys_32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ diff -uriN linux-2.6.38.4/arch/mips/kernel/syscall.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/syscall.c --- linux-2.6.38.4/arch/mips/kernel/syscall.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/syscall.c 2011-05-01 17:02:10.000000000 -0500 @@ -108,14 +108,18 @@ do_color_align = 0; if (filp || (flags & MAP_SHARED)) do_color_align = 1; + +#ifdef CONFIG_PAX_RANDMMAP + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP)) +#endif + if (addr) { if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); else addr = PAGE_ALIGN(addr); vmm = find_vma(current->mm, addr); - if (task_size - len >= addr && - (!vmm || addr + len <= vmm->vm_start)) + if (task_size - len >= addr && check_heap_stack_gap(vmm, addr, len)) return addr; } addr = current->mm->mmap_base; @@ -128,7 +132,7 @@ /* At this point: (!vmm || addr < vmm->vm_end). */ if (task_size - len < addr) return -ENOMEM; - if (!vmm || addr + len <= vmm->vm_start) + if (check_heap_stack_gap(vmm, addr, len)) return addr; addr = vmm->vm_end; if (do_color_align) @@ -168,19 +172,6 @@ return rnd; } -unsigned long arch_randomize_brk(struct mm_struct *mm) -{ - unsigned long base = mm->brk; - unsigned long ret; - - ret = PAGE_ALIGN(base + brk_rnd()); - - if (ret < mm->brk) - return mm->brk; - - return ret; -} - SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len, unsigned long, prot, unsigned long, flags, unsigned long, fd, off_t, offset) diff -uriN linux-2.6.38.4/arch/mips/kernel/traps.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/traps.c --- linux-2.6.38.4/arch/mips/kernel/traps.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/kernel/traps.c 2011-05-01 17:01:51.000000000 -0500 @@ -343,9 +343,10 @@ __show_regs(regs); print_modules(); - printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n", - current->comm, current->pid, current_thread_info(), current, - field, current_thread_info()->tp_value); + printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p, tls=%0*lx)\n", + current->comm, task_pid_nr(current), current->xid, + current_thread_info(), current, + field, current_thread_info()->tp_value); if (cpu_has_userlocal) { unsigned long tls; diff -uriN linux-2.6.38.4/arch/mips/mm/dma-default.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/mm/dma-default.c --- linux-2.6.38.4/arch/mips/mm/dma-default.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/mm/dma-default.c 2011-05-01 17:02:10.000000000 -0500 @@ -300,7 +300,7 @@ EXPORT_SYMBOL(dma_cache_sync); -static struct dma_map_ops mips_default_dma_map_ops = { +static const struct dma_map_ops mips_default_dma_map_ops = { .alloc_coherent = mips_dma_alloc_coherent, .free_coherent = mips_dma_free_coherent, .map_page = mips_dma_map_page, @@ -315,7 +315,7 @@ .dma_supported = mips_dma_supported }; -struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops; +const struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops; EXPORT_SYMBOL(mips_dma_map_ops); #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16) diff -uriN linux-2.6.38.4/arch/mips/mm/fault.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/mm/fault.c --- linux-2.6.38.4/arch/mips/mm/fault.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/mips/mm/fault.c 2011-05-01 17:02:10.000000000 -0500 @@ -28,6 +28,23 @@ #include /* For VMALLOC_END */ #include +#ifdef CONFIG_PAX_PAGEEXEC +void pax_report_insns(void *pc, void *sp) +{ + unsigned long i; + + printk(KERN_ERR "PAX: bytes at PC: "); + for (i = 0; i < 5; i++) { + unsigned int c; + if (get_user(c, (unsigned int *)pc+i)) + printk(KERN_CONT "???????? "); + else + printk(KERN_CONT "%08x ", c); + } + printk("\n"); +} +#endif + /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate diff -uriN linux-2.6.38.4/arch/parisc/include/asm/elf.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/include/asm/elf.h --- linux-2.6.38.4/arch/parisc/include/asm/elf.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/include/asm/elf.h 2011-05-01 17:02:10.000000000 -0500 @@ -342,6 +342,13 @@ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE 0x10000UL + +#define PAX_DELTA_MMAP_LEN 16 +#define PAX_DELTA_STACK_LEN 16 +#endif + /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, but it's not easy, and we've already done it here. */ diff -uriN linux-2.6.38.4/arch/parisc/include/asm/pgtable.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/include/asm/pgtable.h --- linux-2.6.38.4/arch/parisc/include/asm/pgtable.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/include/asm/pgtable.h 2011-05-01 17:02:10.000000000 -0500 @@ -209,6 +209,17 @@ #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED) + +#ifdef CONFIG_PAX_PAGEEXEC +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED) +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED) +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED) +#else +# define PAGE_SHARED_NOEXEC PAGE_SHARED +# define PAGE_COPY_NOEXEC PAGE_COPY +# define PAGE_READONLY_NOEXEC PAGE_READONLY +#endif + #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) diff -uriN linux-2.6.38.4/arch/parisc/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/Kconfig --- linux-2.6.38.4/arch/parisc/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -283,6 +283,8 @@ source "arch/parisc/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/parisc/kernel/module.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/kernel/module.c --- linux-2.6.38.4/arch/parisc/kernel/module.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/kernel/module.c 2011-05-01 17:02:10.000000000 -0500 @@ -96,16 +96,38 @@ /* three functions to determine where in the module core * or init pieces the location is */ +static inline int in_init_rx(struct module *me, void *loc) +{ + return (loc >= me->module_init_rx && + loc < (me->module_init_rx + me->init_size_rx)); +} + +static inline int in_init_rw(struct module *me, void *loc) +{ + return (loc >= me->module_init_rw && + loc < (me->module_init_rw + me->init_size_rw)); +} + static inline int in_init(struct module *me, void *loc) { - return (loc >= me->module_init && - loc <= (me->module_init + me->init_size)); + return in_init_rx(me, loc) || in_init_rw(me, loc); +} + +static inline int in_core_rx(struct module *me, void *loc) +{ + return (loc >= me->module_core_rx && + loc < (me->module_core_rx + me->core_size_rx)); +} + +static inline int in_core_rw(struct module *me, void *loc) +{ + return (loc >= me->module_core_rw && + loc < (me->module_core_rw + me->core_size_rw)); } static inline int in_core(struct module *me, void *loc) { - return (loc >= me->module_core && - loc <= (me->module_core + me->core_size)); + return in_core_rx(me, loc) || in_core_rw(me, loc); } static inline int in_local(struct module *me, void *loc) @@ -365,13 +387,13 @@ } /* align things a bit */ - me->core_size = ALIGN(me->core_size, 16); - me->arch.got_offset = me->core_size; - me->core_size += gots * sizeof(struct got_entry); - - me->core_size = ALIGN(me->core_size, 16); - me->arch.fdesc_offset = me->core_size; - me->core_size += fdescs * sizeof(Elf_Fdesc); + me->core_size_rw = ALIGN(me->core_size_rw, 16); + me->arch.got_offset = me->core_size_rw; + me->core_size_rw += gots * sizeof(struct got_entry); + + me->core_size_rw = ALIGN(me->core_size_rw, 16); + me->arch.fdesc_offset = me->core_size_rw; + me->core_size_rw += fdescs * sizeof(Elf_Fdesc); me->arch.got_max = gots; me->arch.fdesc_max = fdescs; @@ -389,7 +411,7 @@ BUG_ON(value == 0); - got = me->module_core + me->arch.got_offset; + got = me->module_core_rw + me->arch.got_offset; for (i = 0; got[i].addr; i++) if (got[i].addr == value) goto out; @@ -407,7 +429,7 @@ #ifdef CONFIG_64BIT static Elf_Addr get_fdesc(struct module *me, unsigned long value) { - Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset; + Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset; if (!value) { printk(KERN_ERR "%s: zero OPD requested!\n", me->name); @@ -425,7 +447,7 @@ /* Create new one */ fdesc->addr = value; - fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset; + fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset; return (Elf_Addr)fdesc; } #endif /* CONFIG_64BIT */ @@ -849,7 +871,7 @@ table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr; end = table + sechdrs[me->arch.unwind_section].sh_size; - gp = (Elf_Addr)me->module_core + me->arch.got_offset; + gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset; DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", me->arch.unwind_section, table, end, gp); diff -uriN linux-2.6.38.4/arch/parisc/kernel/syscall_table.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/kernel/syscall_table.S --- linux-2.6.38.4/arch/parisc/kernel/syscall_table.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/kernel/syscall_table.S 2011-05-01 17:01:51.000000000 -0500 @@ -361,7 +361,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) ENTRY_COMP(set_mempolicy) - ENTRY_SAME(ni_syscall) /* 263: reserved for vserver */ + ENTRY_DIFF(vserver) ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) diff -uriN linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/kernel/sys_parisc.c --- linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/kernel/sys_parisc.c 2011-05-01 17:02:10.000000000 -0500 @@ -43,7 +43,7 @@ /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr) return -ENOMEM; - if (!vma || addr + len <= vma->vm_start) + if (check_heap_stack_gap(vma, addr, len)) return addr; addr = vma->vm_end; } @@ -79,7 +79,7 @@ /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr) return -ENOMEM; - if (!vma || addr + len <= vma->vm_start) + if (check_heap_stack_gap(vma, addr, len)) return addr; addr = DCACHE_ALIGN(vma->vm_end - offset) + offset; if (addr < vma->vm_end) /* handle wraparound */ @@ -98,7 +98,7 @@ if (flags & MAP_FIXED) return addr; if (!addr) - addr = TASK_UNMAPPED_BASE; + addr = current->mm->mmap_base; if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); diff -uriN linux-2.6.38.4/arch/parisc/kernel/traps.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/kernel/traps.c --- linux-2.6.38.4/arch/parisc/kernel/traps.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/kernel/traps.c 2011-05-01 17:02:10.000000000 -0500 @@ -236,8 +236,9 @@ if (err == 0) return; /* STFU */ - printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n", - current->comm, task_pid_nr(current), str, err, regs->iaoq[0]); + printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n", + current->comm, task_pid_nr(current), current->xid, + str, err, regs->iaoq[0]); #ifdef PRINT_USER_FAULTS /* XXX for debugging only */ show_regs(regs); @@ -270,8 +271,8 @@ pdc_console_restart(); if (err) - printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n", - current->comm, task_pid_nr(current), str, err); + printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n", + current->comm, task_pid_nr(current), current->xid, str, err); /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { @@ -733,9 +734,7 @@ down_read(¤t->mm->mmap_sem); vma = find_vma(current->mm,regs->iaoq[0]); - if (vma && (regs->iaoq[0] >= vma->vm_start) - && (vma->vm_flags & VM_EXEC)) { - + if (vma && (regs->iaoq[0] >= vma->vm_start)) { fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; diff -uriN linux-2.6.38.4/arch/parisc/mm/fault.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/mm/fault.c --- linux-2.6.38.4/arch/parisc/mm/fault.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/parisc/mm/fault.c 2011-05-01 17:02:10.000000000 -0500 @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -52,7 +53,7 @@ static unsigned long parisc_acctyp(unsigned long code, unsigned int inst) { - if (code == 6 || code == 16) + if (code == 6 || code == 7 || code == 16) return VM_EXEC; switch (inst & 0xf0000000) { @@ -138,6 +139,116 @@ } #endif +#ifdef CONFIG_PAX_PAGEEXEC +/* + * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address) + * + * returns 1 when task should be killed + * 2 when rt_sigreturn trampoline was detected + * 3 when unpatched PLT trampoline was detected + */ +static int pax_handle_fetch_fault(struct pt_regs *regs) +{ + +#ifdef CONFIG_PAX_EMUPLT + int err; + + do { /* PaX: unpatched PLT emulation */ + unsigned int bl, depwi; + + err = get_user(bl, (unsigned int *)instruction_pointer(regs)); + err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4)); + + if (err) + break; + + if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) { + unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12; + + err = get_user(ldw, (unsigned int *)addr); + err |= get_user(bv, (unsigned int *)(addr+4)); + err |= get_user(ldw2, (unsigned int *)(addr+8)); + + if (err) + break; + + if (ldw == 0x0E801096U && + bv == 0xEAC0C000U && + ldw2 == 0x0E881095U) + { + unsigned int resolver, map; + + err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8)); + err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12)); + if (err) + break; + + regs->gr[20] = instruction_pointer(regs)+8; + regs->gr[21] = map; + regs->gr[22] = resolver; + regs->iaoq[0] = resolver | 3UL; + regs->iaoq[1] = regs->iaoq[0] + 4; + return 3; + } + } + } while (0); +#endif + +#ifdef CONFIG_PAX_EMUTRAMP + +#ifndef CONFIG_PAX_EMUSIGRT + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP)) + return 1; +#endif + + do { /* PaX: rt_sigreturn emulation */ + unsigned int ldi1, ldi2, bel, nop; + + err = get_user(ldi1, (unsigned int *)instruction_pointer(regs)); + err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4)); + err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8)); + err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12)); + + if (err) + break; + + if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) && + ldi2 == 0x3414015AU && + bel == 0xE4008200U && + nop == 0x08000240U) + { + regs->gr[25] = (ldi1 & 2) >> 1; + regs->gr[20] = __NR_rt_sigreturn; + regs->gr[31] = regs->iaoq[1] + 16; + regs->sr[0] = regs->iasq[1]; + regs->iaoq[0] = 0x100UL; + regs->iaoq[1] = regs->iaoq[0] + 4; + regs->iasq[0] = regs->sr[2]; + regs->iasq[1] = regs->sr[2]; + return 2; + } + } while (0); +#endif + + return 1; +} + +void pax_report_insns(void *pc, void *sp) +{ + unsigned long i; + + printk(KERN_ERR "PAX: bytes at PC: "); + for (i = 0; i < 5; i++) { + unsigned int c; + if (get_user(c, (unsigned int *)pc+i)) + printk(KERN_CONT "???????? "); + else + printk(KERN_CONT "%08x ", c); + } + printk("\n"); +} +#endif + int fixup_exception(struct pt_regs *regs) { const struct exception_table_entry *fix; @@ -192,8 +303,33 @@ acc_type = parisc_acctyp(code,regs->iir); - if ((vma->vm_flags & acc_type) != acc_type) + if ((vma->vm_flags & acc_type) != acc_type) { + +#ifdef CONFIG_PAX_PAGEEXEC + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) && + (address & ~3UL) == instruction_pointer(regs)) + { + up_read(&mm->mmap_sem); + switch (pax_handle_fetch_fault(regs)) { + +#ifdef CONFIG_PAX_EMUPLT + case 3: + return; +#endif + +#ifdef CONFIG_PAX_EMUTRAMP + case 2: + return; +#endif + + } + pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]); + do_group_exit(SIGKILL); + } +#endif + goto bad_area; + } /* * If for any reason at all we couldn't handle the fault, make @@ -237,8 +373,9 @@ #ifdef PRINT_USER_FAULTS printk(KERN_DEBUG "\n"); - printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n", - task_pid_nr(tsk), tsk->comm, code, address); + printk(KERN_DEBUG "do_page_fault() pid=%d:#%u " + "command='%s' type=%lu address=0x%08lx\n", + task_pid_nr(tsk), tsk->xid, tsk->comm, code, address); if (vma) { printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", vma->vm_start, vma->vm_end); diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/device.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/device.h --- linux-2.6.38.4/arch/powerpc/include/asm/device.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/device.h 2011-05-01 17:02:10.000000000 -0500 @@ -17,7 +17,7 @@ */ struct dev_archdata { /* DMA operations on that device */ - struct dma_map_ops *dma_ops; + const struct dma_map_ops *dma_ops; /* * When an iommu is in use, dma_data is used as a ptr to the base of the diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/dma-mapping.h --- linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/dma-mapping.h 2011-05-01 17:02:10.000000000 -0500 @@ -66,12 +66,13 @@ /* * Available generic sets of operations */ +/* cannot be const */ #ifdef CONFIG_PPC64 -extern struct dma_map_ops dma_iommu_ops; +extern const struct dma_map_ops dma_iommu_ops; #endif -extern struct dma_map_ops dma_direct_ops; +extern const struct dma_map_ops dma_direct_ops; -static inline struct dma_map_ops *get_dma_ops(struct device *dev) +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) { /* We don't handle the NULL dev case for ISA for now. We could * do it via an out of line call but it is not needed for now. The @@ -84,7 +85,7 @@ return dev->archdata.dma_ops; } -static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) +static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops) { dev->archdata.dma_ops = ops; } @@ -118,7 +119,7 @@ static inline int dma_supported(struct device *dev, u64 mask) { - struct dma_map_ops *dma_ops = get_dma_ops(dev); + const struct dma_map_ops *dma_ops = get_dma_ops(dev); if (unlikely(dma_ops == NULL)) return 0; @@ -132,7 +133,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { - struct dma_map_ops *dma_ops = get_dma_ops(dev); + const struct dma_map_ops *dma_ops = get_dma_ops(dev); void *cpu_addr; BUG_ON(!dma_ops); @@ -147,7 +148,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_handle) { - struct dma_map_ops *dma_ops = get_dma_ops(dev); + const struct dma_map_ops *dma_ops = get_dma_ops(dev); BUG_ON(!dma_ops); @@ -158,7 +159,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { - struct dma_map_ops *dma_ops = get_dma_ops(dev); + const struct dma_map_ops *dma_ops = get_dma_ops(dev); if (dma_ops->mapping_error) return dma_ops->mapping_error(dev, dma_addr); diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/elf.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/elf.h --- linux-2.6.38.4/arch/powerpc/include/asm/elf.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/elf.h 2011-05-01 17:02:10.000000000 -0500 @@ -178,8 +178,19 @@ the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ -extern unsigned long randomize_et_dyn(unsigned long base); -#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000)) +#define ELF_ET_DYN_BASE (0x20000000) + +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (0x10000000UL) + +#ifdef __powerpc64__ +#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28) +#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28) +#else +#define PAX_DELTA_MMAP_LEN 15 +#define PAX_DELTA_STACK_LEN 15 +#endif +#endif /* * Our registers are always unsigned longs, whether we're a 32 bit @@ -274,9 +285,6 @@ (0x7ff >> (PAGE_SHIFT - 12)) : \ (0x3ffff >> (PAGE_SHIFT - 12))) -extern unsigned long arch_randomize_brk(struct mm_struct *mm); -#define arch_randomize_brk arch_randomize_brk - #endif /* __KERNEL__ */ /* diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/iommu.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/iommu.h --- linux-2.6.38.4/arch/powerpc/include/asm/iommu.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/iommu.h 2011-05-01 17:02:10.000000000 -0500 @@ -116,6 +116,9 @@ extern void iommu_init_early_dart(void); extern void iommu_init_early_pasemi(void); +/* dma-iommu.c */ +extern int dma_iommu_dma_supported(struct device *dev, u64 mask); + #ifdef CONFIG_PCI extern void pci_iommu_init(void); extern void pci_direct_iommu_init(void); diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/kmap_types.h --- linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/kmap_types.h 2011-05-01 17:02:10.000000000 -0500 @@ -27,6 +27,7 @@ KM_PPC_SYNC_PAGE, KM_PPC_SYNC_ICACHE, KM_KDB, + KM_CLEARPAGE, KM_TYPE_NR }; diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/page_64.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/page_64.h --- linux-2.6.38.4/arch/powerpc/include/asm/page_64.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/page_64.h 2011-05-01 17:02:10.000000000 -0500 @@ -172,15 +172,18 @@ * stack by default, so in the absense of a PT_GNU_STACK program header * we turn execute permission off. */ -#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_STACK_DEFAULT_FLAGS32 \ + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#ifndef CONFIG_PAX_PAGEEXEC #define VM_STACK_DEFAULT_FLAGS \ (is_32bit_task() ? \ VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64) +#endif #include diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/page.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/page.h --- linux-2.6.38.4/arch/powerpc/include/asm/page.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/page.h 2011-05-01 17:02:10.000000000 -0500 @@ -129,8 +129,9 @@ * and needs to be executable. This means the whole heap ends * up being executable. */ -#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_DEFAULT_FLAGS32 \ + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -158,6 +159,9 @@ #define is_kernel_addr(x) ((x) >= PAGE_OFFSET) #endif +#define ktla_ktva(addr) (addr) +#define ktva_ktla(addr) (addr) + #ifndef __ASSEMBLY__ #undef STRICT_MM_TYPECHECKS diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/pci.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/pci.h --- linux-2.6.38.4/arch/powerpc/include/asm/pci.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/pci.h 2011-05-01 17:02:10.000000000 -0500 @@ -65,8 +65,8 @@ } #ifdef CONFIG_PCI -extern void set_pci_dma_ops(struct dma_map_ops *dma_ops); -extern struct dma_map_ops *get_pci_dma_ops(void); +extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops); +extern const struct dma_map_ops *get_pci_dma_ops(void); #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/pgtable.h --- linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/pgtable.h 2011-05-01 17:02:10.000000000 -0500 @@ -2,6 +2,7 @@ #define _ASM_POWERPC_PGTABLE_H #ifdef __KERNEL__ +#include #ifndef __ASSEMBLY__ #include /* For TASK_SIZE */ #include diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/pte-hash32.h --- linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/pte-hash32.h 2011-05-01 17:02:10.000000000 -0500 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */ +#define _PAGE_EXEC _PAGE_GUARDED #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/reg.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/reg.h --- linux-2.6.38.4/arch/powerpc/include/asm/reg.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/reg.h 2011-05-01 17:02:10.000000000 -0500 @@ -191,6 +191,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ #define DSISR_NOHPTE 0x40000000 /* no translation found */ +#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */ #define DSISR_PROTFAULT 0x08000000 /* protection fault */ #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/swiotlb.h --- linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/swiotlb.h 2011-05-01 17:02:10.000000000 -0500 @@ -13,7 +13,7 @@ #include -extern struct dma_map_ops swiotlb_dma_ops; +extern const struct dma_map_ops swiotlb_dma_ops; static inline void dma_mark_clean(void *addr, size_t size) {} diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/system.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/system.h --- linux-2.6.38.4/arch/powerpc/include/asm/system.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/system.h 2011-05-01 17:02:10.000000000 -0500 @@ -533,7 +533,7 @@ #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) #endif -extern unsigned long arch_align_stack(unsigned long sp); +#define arch_align_stack(x) ((x) & ~0xfUL) /* Used in very early kernel initialization. */ extern unsigned long reloc_offset(void); diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/uaccess.h --- linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/uaccess.h 2011-05-01 17:02:10.000000000 -0500 @@ -13,6 +13,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 +extern void check_object_size(const void *ptr, unsigned long n, bool to); + /* * The fs value determines whether argument validity checking should be * performed or not. If get_fs() == USER_DS, checking is performed, with @@ -327,52 +329,6 @@ extern unsigned long __copy_tofrom_user(void __user *to, const void __user *from, unsigned long size); -#ifndef __powerpc64__ - -static inline unsigned long copy_from_user(void *to, - const void __user *from, unsigned long n) -{ - unsigned long over; - - if (access_ok(VERIFY_READ, from, n)) - return __copy_tofrom_user((__force void __user *)to, from, n); - if ((unsigned long)from < TASK_SIZE) { - over = (unsigned long)from + n - TASK_SIZE; - return __copy_tofrom_user((__force void __user *)to, from, - n - over) + over; - } - return n; -} - -static inline unsigned long copy_to_user(void __user *to, - const void *from, unsigned long n) -{ - unsigned long over; - - if (access_ok(VERIFY_WRITE, to, n)) - return __copy_tofrom_user(to, (__force void __user *)from, n); - if ((unsigned long)to < TASK_SIZE) { - over = (unsigned long)to + n - TASK_SIZE; - return __copy_tofrom_user(to, (__force void __user *)from, - n - over) + over; - } - return n; -} - -#else /* __powerpc64__ */ - -#define __copy_in_user(to, from, size) \ - __copy_tofrom_user((to), (from), (size)) - -extern unsigned long copy_from_user(void *to, const void __user *from, - unsigned long n); -extern unsigned long copy_to_user(void __user *to, const void *from, - unsigned long n); -extern unsigned long copy_in_user(void __user *to, const void __user *from, - unsigned long n); - -#endif /* __powerpc64__ */ - static inline unsigned long __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) { @@ -396,6 +352,10 @@ if (ret == 0) return 0; } + + if (!__builtin_constant_p(n)) + check_object_size(to, n, false); + return __copy_tofrom_user((__force void __user *)to, from, n); } @@ -422,6 +382,10 @@ if (ret == 0) return 0; } + + if (!__builtin_constant_p(n)) + check_object_size(from, n, true); + return __copy_tofrom_user(to, (__force const void __user *)from, n); } @@ -439,6 +403,92 @@ return __copy_to_user_inatomic(to, from, size); } +#ifndef __powerpc64__ + +static inline unsigned long __must_check copy_from_user(void *to, + const void __user *from, unsigned long n) +{ + unsigned long over; + + if ((long)n < 0) + return n; + + if (access_ok(VERIFY_READ, from, n)) { + if (!__builtin_constant_p(n)) + check_object_size(to, n, false); + return __copy_tofrom_user((__force void __user *)to, from, n); + } + if ((unsigned long)from < TASK_SIZE) { + over = (unsigned long)from + n - TASK_SIZE; + if (!__builtin_constant_p(n - over)) + check_object_size(to, n - over, false); + return __copy_tofrom_user((__force void __user *)to, from, + n - over) + over; + } + return n; +} + +static inline unsigned long __must_check copy_to_user(void __user *to, + const void *from, unsigned long n) +{ + unsigned long over; + + if ((long)n < 0) + return n; + + if (access_ok(VERIFY_WRITE, to, n)) { + if (!__builtin_constant_p(n)) + check_object_size(from, n, true); + return __copy_tofrom_user(to, (__force void __user *)from, n); + } + if ((unsigned long)to < TASK_SIZE) { + over = (unsigned long)to + n - TASK_SIZE; + if (!__builtin_constant_p(n)) + check_object_size(from, n - over, true); + return __copy_tofrom_user(to, (__force void __user *)from, + n - over) + over; + } + return n; +} + +#else /* __powerpc64__ */ + +#define __copy_in_user(to, from, size) \ + __copy_tofrom_user((to), (from), (size)) + +static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) +{ + if ((long)n < 0 || n > INT_MAX) + return n; + + if (!__builtin_constant_p(n)) + check_object_size(to, n, false); + + if (likely(access_ok(VERIFY_READ, from, n))) + n = __copy_from_user(to, from, n); + else + memset(to, 0, n); + return n; +} + +static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) +{ + if ((long)n < 0 || n > INT_MAX) + return n; + + if (likely(access_ok(VERIFY_WRITE, to, n))) { + if (!__builtin_constant_p(n)) + check_object_size(from, n, true); + n = __copy_to_user(to, from, n); + } + return n; +} + +extern unsigned long copy_in_user(void __user *to, const void __user *from, + unsigned long n); + +#endif /* __powerpc64__ */ + extern unsigned long __clear_user(void __user *addr, unsigned long size); static inline unsigned long clear_user(void __user *addr, unsigned long size) diff -uriN linux-2.6.38.4/arch/powerpc/include/asm/unistd.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/unistd.h --- linux-2.6.38.4/arch/powerpc/include/asm/unistd.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/include/asm/unistd.h 2011-05-01 17:01:51.000000000 -0500 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 #define __NR_sys_debug_setcontext 256 -/* Number 257 is reserved for vserver */ +#define __NR_vserver 257 #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 diff -uriN linux-2.6.38.4/arch/powerpc/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/Kconfig --- linux-2.6.38.4/arch/powerpc/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -964,6 +964,8 @@ source "arch/powerpc/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" config KEYS_COMPAT diff -uriN linux-2.6.38.4/arch/powerpc/kernel/dma.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/dma.c --- linux-2.6.38.4/arch/powerpc/kernel/dma.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/dma.c 2011-05-01 17:02:10.000000000 -0500 @@ -136,7 +136,7 @@ } #endif -struct dma_map_ops dma_direct_ops = { +const struct dma_map_ops dma_direct_ops = { .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = dma_direct_map_sg, @@ -157,7 +157,7 @@ int dma_set_mask(struct device *dev, u64 dma_mask) { - struct dma_map_ops *dma_ops = get_dma_ops(dev); + const struct dma_map_ops *dma_ops = get_dma_ops(dev); if (ppc_md.dma_set_mask) return ppc_md.dma_set_mask(dev, dma_mask); diff -uriN linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/dma-iommu.c --- linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/dma-iommu.c 2011-05-01 17:02:10.000000000 -0500 @@ -70,7 +70,7 @@ } /* We support DMA to/from any memory page via the iommu */ -static int dma_iommu_dma_supported(struct device *dev, u64 mask) +int dma_iommu_dma_supported(struct device *dev, u64 mask) { struct iommu_table *tbl = get_iommu_table_base(dev); @@ -90,7 +90,7 @@ return 1; } -struct dma_map_ops dma_iommu_ops = { +struct dma_map_ops dma_iommu_ops = { /* cannot be const, see arch/powerpc/platforms/cell/iommu.c */ .alloc_coherent = dma_iommu_alloc_coherent, .free_coherent = dma_iommu_free_coherent, .map_sg = dma_iommu_map_sg, diff -uriN linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/dma-swiotlb.c --- linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/dma-swiotlb.c 2011-05-01 17:02:10.000000000 -0500 @@ -31,7 +31,7 @@ * map_page, and unmap_page on highmem, use normal dma_ops * for everything else. */ -struct dma_map_ops swiotlb_dma_ops = { +const struct dma_map_ops swiotlb_dma_ops = { .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = swiotlb_map_sg_attrs, diff -uriN linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/exceptions-64e.S --- linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/exceptions-64e.S 2011-05-01 17:02:10.000000000 -0500 @@ -495,6 +495,7 @@ std r14,_DAR(r1) std r15,_DSISR(r1) addi r3,r1,STACK_FRAME_OVERHEAD + bl .save_nvgprs mr r4,r14 mr r5,r15 ld r14,PACA_EXGEN+EX_R14(r13) @@ -504,8 +505,7 @@ cmpdi r3,0 bne- 1f b .ret_from_except_lite -1: bl .save_nvgprs - mr r5,r3 +1: mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD ld r4,_DAR(r1) bl .bad_page_fault diff -uriN linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/exceptions-64s.S --- linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/exceptions-64s.S 2011-05-01 17:02:10.000000000 -0500 @@ -848,10 +848,10 @@ 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) addi r3,r1,STACK_FRAME_OVERHEAD + bl .save_nvgprs bl .do_page_fault cmpdi r3,0 beq+ 13f - bl .save_nvgprs mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD lwz r4,_DAR(r1) diff -uriN linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/ibmebus.c --- linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/ibmebus.c 2011-05-01 17:02:10.000000000 -0500 @@ -128,7 +128,7 @@ return 1; } -static struct dma_map_ops ibmebus_dma_ops = { +static const struct dma_map_ops ibmebus_dma_ops = { .alloc_coherent = ibmebus_alloc_coherent, .free_coherent = ibmebus_free_coherent, .map_sg = ibmebus_map_sg, diff -uriN linux-2.6.38.4/arch/powerpc/kernel/kgdb.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/kgdb.c --- linux-2.6.38.4/arch/powerpc/kernel/kgdb.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/kgdb.c 2011-05-01 17:02:10.000000000 -0500 @@ -422,7 +422,7 @@ /* * Global data */ -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, }; diff -uriN linux-2.6.38.4/arch/powerpc/kernel/module_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/module_32.c --- linux-2.6.38.4/arch/powerpc/kernel/module_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/module_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -162,7 +162,7 @@ me->arch.core_plt_section = i; } if (!me->arch.core_plt_section || !me->arch.init_plt_section) { - printk("Module doesn't contain .plt or .init.plt sections.\n"); + printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name); return -ENOEXEC; } @@ -203,11 +203,16 @@ DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location); /* Init, or core PLT? */ - if (location >= mod->module_core - && location < mod->module_core + mod->core_size) + if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) || + (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw)) entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr; - else + else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) || + (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw)) entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr; + else { + printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name); + return ~0UL; + } /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { diff -uriN linux-2.6.38.4/arch/powerpc/kernel/module.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/module.c --- linux-2.6.38.4/arch/powerpc/kernel/module.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/module.c 2011-05-01 17:02:10.000000000 -0500 @@ -31,11 +31,24 @@ LIST_HEAD(module_bug_list); +#ifdef CONFIG_PAX_KERNEXEC void *module_alloc(unsigned long size) { if (size == 0) return NULL; + return vmalloc(size); +} + +void *module_alloc_exec(unsigned long size) +#else +void *module_alloc(unsigned long size) +#endif + +{ + if (size == 0) + return NULL; + return vmalloc_exec(size); } @@ -45,6 +58,13 @@ vfree(module_region); } +#ifdef CONFIG_PAX_KERNEXEC +void module_free_exec(struct module *mod, void *module_region) +{ + module_free(mod, module_region); +} +#endif + static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, const char *name) diff -uriN linux-2.6.38.4/arch/powerpc/kernel/pci-common.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/pci-common.c --- linux-2.6.38.4/arch/powerpc/kernel/pci-common.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/pci-common.c 2011-05-01 17:02:10.000000000 -0500 @@ -52,14 +52,14 @@ unsigned int ppc_pci_flags = 0; -static struct dma_map_ops *pci_dma_ops = &dma_direct_ops; +static const struct dma_map_ops *pci_dma_ops = &dma_direct_ops; -void set_pci_dma_ops(struct dma_map_ops *dma_ops) +void set_pci_dma_ops(const struct dma_map_ops *dma_ops) { pci_dma_ops = dma_ops; } -struct dma_map_ops *get_pci_dma_ops(void) +const struct dma_map_ops *get_pci_dma_ops(void) { return pci_dma_ops; } diff -uriN linux-2.6.38.4/arch/powerpc/kernel/process.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/process.c --- linux-2.6.38.4/arch/powerpc/kernel/process.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/process.c 2011-05-01 17:02:10.000000000 -0500 @@ -635,8 +635,9 @@ #else printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); #endif - printk("TASK = %p[%d] '%s' THREAD: %p", - current, task_pid_nr(current), current->comm, task_thread_info(current)); + printk("TASK = %p[%d,#%u] '%s' THREAD: %p", + current, task_pid_nr(current), current->xid, + current->comm, task_thread_info(current)); #ifdef CONFIG_SMP printk(" CPU: %d", raw_smp_processor_id()); @@ -655,8 +656,8 @@ * Lookup NIP late so we have the best change of getting the * above info out without failing */ - printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip); - printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link); + printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip); + printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link); #endif show_stack(current, (unsigned long *) regs->gpr[1]); if (!user_mode(regs)) @@ -1146,10 +1147,10 @@ newsp = stack[0]; ip = stack[STACK_FRAME_LR_SAVE]; if (!firstframe || ip != lr) { - printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip); + printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip); #ifdef CONFIG_FUNCTION_GRAPH_TRACER if ((ip == rth || ip == mrth) && curr_frame >= 0) { - printk(" (%pS)", + printk(" (%pA)", (void *)current->ret_stack[curr_frame].ret); curr_frame--; } @@ -1169,7 +1170,7 @@ struct pt_regs *regs = (struct pt_regs *) (sp + STACK_FRAME_OVERHEAD); lr = regs->link; - printk("--- Exception: %lx at %pS\n LR = %pS\n", + printk("--- Exception: %lx at %pA\n LR = %pA\n", regs->trap, (void *)regs->nip, (void *)lr); firstframe = 1; } @@ -1244,58 +1245,3 @@ } #endif /* THREAD_SHIFT < PAGE_SHIFT */ - -unsigned long arch_align_stack(unsigned long sp) -{ - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) - sp -= get_random_int() & ~PAGE_MASK; - return sp & ~0xf; -} - -static inline unsigned long brk_rnd(void) -{ - unsigned long rnd = 0; - - /* 8MB for 32bit, 1GB for 64bit */ - if (is_32bit_task()) - rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT))); - else - rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT))); - - return rnd << PAGE_SHIFT; -} - -unsigned long arch_randomize_brk(struct mm_struct *mm) -{ - unsigned long base = mm->brk; - unsigned long ret; - -#ifdef CONFIG_PPC_STD_MMU_64 - /* - * If we are using 1TB segments and we are allowed to randomise - * the heap, we can put it above 1TB so it is backed by a 1TB - * segment. Otherwise the heap will be in the bottom 1TB - * which always uses 256MB segments and this may result in a - * performance penalty. - */ - if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T)) - base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T); -#endif - - ret = PAGE_ALIGN(base + brk_rnd()); - - if (ret < mm->brk) - return mm->brk; - - return ret; -} - -unsigned long randomize_et_dyn(unsigned long base) -{ - unsigned long ret = PAGE_ALIGN(base + brk_rnd()); - - if (ret < base) - return base; - - return ret; -} diff -uriN linux-2.6.38.4/arch/powerpc/kernel/signal_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/signal_32.c --- linux-2.6.38.4/arch/powerpc/kernel/signal_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/signal_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -858,7 +858,7 @@ /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; addr = frame; - if (vdso32_rt_sigtramp && current->mm->context.vdso_base) { + if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) { if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; diff -uriN linux-2.6.38.4/arch/powerpc/kernel/signal_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/signal_64.c --- linux-2.6.38.4/arch/powerpc/kernel/signal_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/signal_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -429,7 +429,7 @@ current->thread.fpscr.val = 0; /* Set up to return from userspace. */ - if (vdso64_rt_sigtramp && current->mm->context.vdso_base) { + if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) { regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); diff -uriN linux-2.6.38.4/arch/powerpc/kernel/traps.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/traps.c --- linux-2.6.38.4/arch/powerpc/kernel/traps.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/traps.c 2011-05-01 17:01:51.000000000 -0500 @@ -1043,8 +1043,9 @@ void trace_syscall(struct pt_regs *regs) { - printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", - current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0], + printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", + current, task_pid_nr(current), current->xid, + regs->nip, regs->link, regs->gpr[0], regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } diff -uriN linux-2.6.38.4/arch/powerpc/kernel/vdso.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/vdso.c --- linux-2.6.38.4/arch/powerpc/kernel/vdso.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/vdso.c 2011-05-01 17:02:10.000000000 -0500 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -36,6 +37,7 @@ #include #include #include +#include #include "setup.h" @@ -220,7 +222,7 @@ vdso_base = VDSO32_MBASE; #endif - current->mm->context.vdso_base = 0; + current->mm->context.vdso_base = ~0UL; /* vDSO has a problem and was disabled, just don't "enable" it for the * process @@ -240,7 +242,7 @@ vdso_base = get_unmapped_area(NULL, vdso_base, (vdso_pages << PAGE_SHIFT) + ((VDSO_ALIGNMENT - 1) & PAGE_MASK), - 0, 0); + 0, MAP_PRIVATE | MAP_EXECUTABLE); if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; diff -uriN linux-2.6.38.4/arch/powerpc/kernel/vio.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/vio.c --- linux-2.6.38.4/arch/powerpc/kernel/vio.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/kernel/vio.c 2011-05-01 17:02:10.000000000 -0500 @@ -605,11 +605,12 @@ return dma_iommu_ops.dma_supported(dev, mask); } -struct dma_map_ops vio_dma_mapping_ops = { +const struct dma_map_ops vio_dma_mapping_ops = { .alloc_coherent = vio_dma_iommu_alloc_coherent, .free_coherent = vio_dma_iommu_free_coherent, .map_sg = vio_dma_iommu_map_sg, .unmap_sg = vio_dma_iommu_unmap_sg, + .dma_supported = dma_iommu_dma_supported, .map_page = vio_dma_iommu_map_page, .unmap_page = vio_dma_iommu_unmap_page, .dma_supported = vio_dma_iommu_dma_supported, diff -uriN linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/lib/usercopy_64.c --- linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/lib/usercopy_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -9,22 +9,6 @@ #include #include -unsigned long copy_from_user(void *to, const void __user *from, unsigned long n) -{ - if (likely(access_ok(VERIFY_READ, from, n))) - n = __copy_from_user(to, from, n); - else - memset(to, 0, n); - return n; -} - -unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) -{ - if (likely(access_ok(VERIFY_WRITE, to, n))) - n = __copy_to_user(to, from, n); - return n; -} - unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long n) { @@ -35,7 +19,5 @@ return n; } -EXPORT_SYMBOL(copy_from_user); -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); diff -uriN linux-2.6.38.4/arch/powerpc/mm/fault.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/mm/fault.c --- linux-2.6.38.4/arch/powerpc/mm/fault.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/mm/fault.c 2011-05-01 17:02:10.000000000 -0500 @@ -31,6 +31,10 @@ #include #include #include +#include +#include +#include +#include #include #include @@ -42,6 +46,7 @@ #include #include #include +#include #ifdef CONFIG_KPROBES static inline int notify_page_fault(struct pt_regs *regs) @@ -65,6 +70,33 @@ } #endif +#ifdef CONFIG_PAX_PAGEEXEC +/* + * PaX: decide what to do with offenders (regs->nip = fault address) + * + * returns 1 when task should be killed + */ +static int pax_handle_fetch_fault(struct pt_regs *regs) +{ + return 1; +} + +void pax_report_insns(void *pc, void *sp) +{ + unsigned long i; + + printk(KERN_ERR "PAX: bytes at PC: "); + for (i = 0; i < 5; i++) { + unsigned int c; + if (get_user(c, (unsigned int __user *)pc+i)) + printk(KERN_CONT "???????? "); + else + printk(KERN_CONT "%08x ", c); + } + printk("\n"); +} +#endif + /* * Check whether the instruction at regs->nip is a store using * an update addressing form which will update r1. @@ -135,7 +167,7 @@ * indicate errors in DSISR but can validly be set in SRR1. */ if (trap == 0x400) - error_code &= 0x48200000; + error_code &= 0x58200000; else is_write = error_code & DSISR_ISSTORE; #else @@ -258,7 +290,7 @@ * "undefined". Of those that can be set, this is the only * one which seems bad. */ - if (error_code & 0x10000000) + if (error_code & DSISR_GUARDED) /* Guarded storage error. */ goto bad_area; #endif /* CONFIG_8xx */ @@ -273,7 +305,7 @@ * processors use the same I/D cache coherency mechanism * as embedded. */ - if (error_code & DSISR_PROTFAULT) + if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED)) goto bad_area; #endif /* CONFIG_PPC_STD_MMU */ @@ -342,6 +374,23 @@ bad_area_nosemaphore: /* User mode accesses cause a SIGSEGV */ if (user_mode(regs)) { + +#ifdef CONFIG_PAX_PAGEEXEC + if (mm->pax_flags & MF_PAX_PAGEEXEC) { +#ifdef CONFIG_PPC_STD_MMU + if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) { +#else + if (is_exec && regs->nip == address) { +#endif + switch (pax_handle_fetch_fault(regs)) { + } + + pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]); + do_group_exit(SIGKILL); + } + } +#endif + _exception(SIGSEGV, regs, code, address); return 0; } diff -uriN linux-2.6.38.4/arch/powerpc/mm/mmap_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/mm/mmap_64.c --- linux-2.6.38.4/arch/powerpc/mm/mmap_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/mm/mmap_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -99,10 +99,22 @@ */ if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE; + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base += mm->delta_mmap; +#endif + mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } else { mm->mmap_base = mmap_base(); + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base -= mm->delta_mmap + mm->delta_stack; +#endif + mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } diff -uriN linux-2.6.38.4/arch/powerpc/mm/slice.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/mm/slice.c --- linux-2.6.38.4/arch/powerpc/mm/slice.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/mm/slice.c 2011-05-01 17:02:10.000000000 -0500 @@ -98,7 +98,7 @@ if ((mm->task_size - len) < addr) return 0; vma = find_vma(mm, addr); - return (!vma || (addr + len) <= vma->vm_start); + return check_heap_stack_gap(vma, addr, len); } static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice) @@ -256,7 +256,7 @@ addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT); continue; } - if (!vma || addr + len <= vma->vm_start) { + if (check_heap_stack_gap(vma, addr, len)) { /* * Remember the place where we stopped the search: */ @@ -313,10 +313,14 @@ } } - addr = mm->mmap_base; - while (addr > len) { + if (mm->mmap_base < len) + addr = -ENOMEM; + else + addr = mm->mmap_base - len; + + while (!IS_ERR_VALUE(addr)) { /* Go down by chunk size */ - addr = _ALIGN_DOWN(addr - len, 1ul << pshift); + addr = _ALIGN_DOWN(addr, 1ul << pshift); /* Check for hit with different page size */ mask = slice_range_to_mask(addr, len); @@ -336,7 +340,7 @@ * return with success: */ vma = find_vma(mm, addr); - if (!vma || (addr + len) <= vma->vm_start) { + if (check_heap_stack_gap(vma, addr, len)) { /* remember the address as a hint for next time */ if (use_cache) mm->free_area_cache = addr; @@ -348,7 +352,7 @@ mm->cached_hole_size = vma->vm_start - addr; /* try just below the current vma->vm_start */ - addr = vma->vm_start; + addr = skip_heap_stack_gap(vma, len); } /* @@ -426,6 +430,11 @@ if (fixed && addr > (mm->task_size - len)) return -EINVAL; +#ifdef CONFIG_PAX_RANDMMAP + if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP)) + addr = 0; +#endif + /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr = _ALIGN_UP(addr, 1ul << pshift); diff -uriN linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/platforms/cell/iommu.c --- linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/platforms/cell/iommu.c 2011-05-01 17:02:10.000000000 -0500 @@ -642,7 +642,7 @@ static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); -struct dma_map_ops dma_iommu_fixed_ops = { +const struct dma_map_ops dma_iommu_fixed_ops = { .alloc_coherent = dma_fixed_alloc_coherent, .free_coherent = dma_fixed_free_coherent, .map_sg = dma_fixed_map_sg, diff -uriN linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/platforms/ps3/system-bus.c --- linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/platforms/ps3/system-bus.c 2011-05-01 17:02:10.000000000 -0500 @@ -695,7 +695,7 @@ return mask >= DMA_BIT_MASK(32); } -static struct dma_map_ops ps3_sb_dma_ops = { +static const struct dma_map_ops ps3_sb_dma_ops = { .alloc_coherent = ps3_alloc_coherent, .free_coherent = ps3_free_coherent, .map_sg = ps3_sb_map_sg, @@ -705,7 +705,7 @@ .unmap_page = ps3_unmap_page, }; -static struct dma_map_ops ps3_ioc0_dma_ops = { +static const struct dma_map_ops ps3_ioc0_dma_ops = { .alloc_coherent = ps3_alloc_coherent, .free_coherent = ps3_free_coherent, .map_sg = ps3_ioc0_map_sg, diff -uriN linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/sysdev/ppc4xx_cpm.c --- linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-05-01 17:02:10.000000000 -0500 @@ -240,7 +240,7 @@ return 0; } -static struct platform_suspend_ops cpm_suspend_ops = { +static const struct platform_suspend_ops cpm_suspend_ops = { .valid = cpm_suspend_valid, .enter = cpm_suspend_enter, }; diff -uriN linux-2.6.38.4/arch/s390/include/asm/elf.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/include/asm/elf.h --- linux-2.6.38.4/arch/s390/include/asm/elf.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/include/asm/elf.h 2011-05-01 17:02:10.000000000 -0500 @@ -162,8 +162,14 @@ the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ -extern unsigned long randomize_et_dyn(unsigned long base); -#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2)) +#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) + +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL) + +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 ) +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 ) +#endif /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. */ @@ -222,7 +228,4 @@ #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1 int arch_setup_additional_pages(struct linux_binprm *, int); -extern unsigned long arch_randomize_brk(struct mm_struct *mm); -#define arch_randomize_brk arch_randomize_brk - #endif diff -uriN linux-2.6.38.4/arch/s390/include/asm/system.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/include/asm/system.h --- linux-2.6.38.4/arch/s390/include/asm/system.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/include/asm/system.h 2011-05-01 17:02:10.000000000 -0500 @@ -449,7 +449,7 @@ extern void (*_machine_halt)(void); extern void (*_machine_power_off)(void); -extern unsigned long arch_align_stack(unsigned long sp); +#define arch_align_stack(x) ((x) & ~0xfUL) static inline int tprot(unsigned long addr) { diff -uriN linux-2.6.38.4/arch/s390/include/asm/tlb.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/include/asm/tlb.h --- linux-2.6.38.4/arch/s390/include/asm/tlb.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/include/asm/tlb.h 2011-05-01 17:01:51.000000000 -0500 @@ -24,6 +24,8 @@ #include #include #include +#include + #include #include #include diff -uriN linux-2.6.38.4/arch/s390/include/asm/uaccess.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/include/asm/uaccess.h --- linux-2.6.38.4/arch/s390/include/asm/uaccess.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/include/asm/uaccess.h 2011-05-01 17:02:10.000000000 -0500 @@ -234,6 +234,10 @@ copy_to_user(void __user *to, const void *from, unsigned long n) { might_fault(); + + if ((long)n < 0) + return n; + if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; @@ -259,6 +263,9 @@ static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n) { + if ((long)n < 0) + return n; + if (__builtin_constant_p(n) && (n <= 256)) return uaccess.copy_from_user_small(n, from, to); else @@ -293,6 +300,10 @@ unsigned int sz = __compiletime_object_size(to); might_fault(); + + if ((long)n < 0) + return n; + if (unlikely(sz != -1 && sz < n)) { copy_from_user_overflow(); return n; diff -uriN linux-2.6.38.4/arch/s390/include/asm/unistd.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/include/asm/unistd.h --- linux-2.6.38.4/arch/s390/include/asm/unistd.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/include/asm/unistd.h 2011-05-01 17:01:51.000000000 -0500 @@ -202,7 +202,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) #define __NR_clock_nanosleep (__NR_timer_create+8) -/* Number 263 is reserved for vserver */ +#define __NR_vserver 263 #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 diff -uriN linux-2.6.38.4/arch/s390/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/Kconfig --- linux-2.6.38.4/arch/s390/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/Kconfig 2011-05-01 17:02:10.000000000 -0500 @@ -233,11 +233,9 @@ prompt "Data execute protection" help This option allows to enable a buffer overflow protection for user - space programs and it also selects the addressing mode option above. - The kernel parameter noexec=on will enable this feature and also - switch the addressing modes, default is disabled. Enabling this (via - kernel parameter) on machines earlier than IBM System z9 this will - reduce system performance. + space programs. + Enabling this (via kernel parameter) on machines earlier than IBM + System z9 this will reduce system performance. comment "Code generation options" @@ -645,6 +643,8 @@ source "arch/s390/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/s390/kernel/module.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/kernel/module.c --- linux-2.6.38.4/arch/s390/kernel/module.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/kernel/module.c 2011-05-01 17:02:10.000000000 -0500 @@ -168,11 +168,11 @@ /* Increase core size by size of got & plt and set start offsets for got and plt. */ - me->core_size = ALIGN(me->core_size, 4); - me->arch.got_offset = me->core_size; - me->core_size += me->arch.got_size; - me->arch.plt_offset = me->core_size; - me->core_size += me->arch.plt_size; + me->core_size_rw = ALIGN(me->core_size_rw, 4); + me->arch.got_offset = me->core_size_rw; + me->core_size_rw += me->arch.got_size; + me->arch.plt_offset = me->core_size_rx; + me->core_size_rx += me->arch.plt_size; return 0; } @@ -258,7 +258,7 @@ if (info->got_initialized == 0) { Elf_Addr *gotent; - gotent = me->module_core + me->arch.got_offset + + gotent = me->module_core_rw + me->arch.got_offset + info->got_offset; *gotent = val; info->got_initialized = 1; @@ -282,7 +282,7 @@ else if (r_type == R_390_GOTENT || r_type == R_390_GOTPLTENT) *(unsigned int *) loc = - (val + (Elf_Addr) me->module_core - loc) >> 1; + (val + (Elf_Addr) me->module_core_rw - loc) >> 1; else if (r_type == R_390_GOT64 || r_type == R_390_GOTPLT64) *(unsigned long *) loc = val; @@ -296,7 +296,7 @@ case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */ if (info->plt_initialized == 0) { unsigned int *ip; - ip = me->module_core + me->arch.plt_offset + + ip = me->module_core_rx + me->arch.plt_offset + info->plt_offset; #ifndef CONFIG_64BIT ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */ @@ -321,7 +321,7 @@ val - loc + 0xffffUL < 0x1ffffeUL) || (r_type == R_390_PLT32DBL && val - loc + 0xffffffffULL < 0x1fffffffeULL))) - val = (Elf_Addr) me->module_core + + val = (Elf_Addr) me->module_core_rx + me->arch.plt_offset + info->plt_offset; val += rela->r_addend - loc; @@ -343,7 +343,7 @@ case R_390_GOTOFF32: /* 32 bit offset to GOT. */ case R_390_GOTOFF64: /* 64 bit offset to GOT. */ val = val + rela->r_addend - - ((Elf_Addr) me->module_core + me->arch.got_offset); + ((Elf_Addr) me->module_core_rw + me->arch.got_offset); if (r_type == R_390_GOTOFF16) *(unsigned short *) loc = val; else if (r_type == R_390_GOTOFF32) @@ -353,7 +353,7 @@ break; case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */ case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */ - val = (Elf_Addr) me->module_core + me->arch.got_offset + + val = (Elf_Addr) me->module_core_rw + me->arch.got_offset + rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; diff -uriN linux-2.6.38.4/arch/s390/kernel/process.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/kernel/process.c --- linux-2.6.38.4/arch/s390/kernel/process.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/kernel/process.c 2011-05-01 17:02:10.000000000 -0500 @@ -334,39 +334,3 @@ } return 0; } - -unsigned long arch_align_stack(unsigned long sp) -{ - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) - sp -= get_random_int() & ~PAGE_MASK; - return sp & ~0xf; -} - -static inline unsigned long brk_rnd(void) -{ - /* 8MB for 32bit, 1GB for 64bit */ - if (is_32bit_task()) - return (get_random_int() & 0x7ffUL) << PAGE_SHIFT; - else - return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT; -} - -unsigned long arch_randomize_brk(struct mm_struct *mm) -{ - unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd()); - - if (ret < mm->brk) - return mm->brk; - return ret; -} - -unsigned long randomize_et_dyn(unsigned long base) -{ - unsigned long ret = PAGE_ALIGN(base + brk_rnd()); - - if (!(current->flags & PF_RANDOMIZE)) - return base; - if (ret < base) - return base; - return ret; -} diff -uriN linux-2.6.38.4/arch/s390/kernel/ptrace.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/kernel/ptrace.c --- linux-2.6.38.4/arch/s390/kernel/ptrace.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/kernel/ptrace.c 2011-05-01 17:01:51.000000000 -0500 @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff -uriN linux-2.6.38.4/arch/s390/kernel/setup.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/kernel/setup.c --- linux-2.6.38.4/arch/s390/kernel/setup.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/kernel/setup.c 2011-05-01 17:02:10.000000000 -0500 @@ -281,7 +281,7 @@ } early_param("mem", early_parse_mem); -unsigned int user_mode = HOME_SPACE_MODE; +unsigned int user_mode = SECONDARY_SPACE_MODE; EXPORT_SYMBOL_GPL(user_mode); static int set_amode_and_uaccess(unsigned long user_amode, @@ -310,17 +310,6 @@ } } -/* - * Switch kernel/user addressing modes? - */ -static int __init early_parse_switch_amode(char *p) -{ - if (user_mode != SECONDARY_SPACE_MODE) - user_mode = PRIMARY_SPACE_MODE; - return 0; -} -early_param("switch_amode", early_parse_switch_amode); - static int __init early_parse_user_mode(char *p) { if (p && strcmp(p, "primary") == 0) @@ -337,20 +326,6 @@ } early_param("user_mode", early_parse_user_mode); -#ifdef CONFIG_S390_EXEC_PROTECT -/* - * Enable execute protection? - */ -static int __init early_parse_noexec(char *p) -{ - if (!strncmp(p, "off", 3)) - return 0; - user_mode = SECONDARY_SPACE_MODE; - return 0; -} -early_param("noexec", early_parse_noexec); -#endif /* CONFIG_S390_EXEC_PROTECT */ - static void setup_addressing_mode(void) { if (user_mode == SECONDARY_SPACE_MODE) { diff -uriN linux-2.6.38.4/arch/s390/kernel/syscalls.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/kernel/syscalls.S --- linux-2.6.38.4/arch/s390/kernel/syscalls.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/kernel/syscalls.S 2011-05-01 17:01:51.000000000 -0500 @@ -271,7 +271,7 @@ SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */ SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper) SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper) -NI_SYSCALL /* reserved for vserver */ +SYSCALL(sys_vserver,sys_vserver,sys32_vserver) SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper) SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper) SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper) diff -uriN linux-2.6.38.4/arch/s390/mm/maccess.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/mm/maccess.c --- linux-2.6.38.4/arch/s390/mm/maccess.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/mm/maccess.c 2011-05-01 17:02:10.000000000 -0500 @@ -45,7 +45,7 @@ return rc ? rc : count; } -long probe_kernel_write(void *dst, void *src, size_t size) +long probe_kernel_write(void *dst, const void *src, size_t size) { long copied = 0; diff -uriN linux-2.6.38.4/arch/s390/mm/mmap.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/mm/mmap.c --- linux-2.6.38.4/arch/s390/mm/mmap.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/s390/mm/mmap.c 2011-05-01 17:02:10.000000000 -0500 @@ -91,10 +91,22 @@ */ if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE; + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base += mm->delta_mmap; +#endif + mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } else { mm->mmap_base = mmap_base(); + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base -= mm->delta_mmap + mm->delta_stack; +#endif + mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } @@ -166,10 +178,22 @@ */ if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE; + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base += mm->delta_mmap; +#endif + mm->get_unmapped_area = s390_get_unmapped_area; mm->unmap_area = arch_unmap_area; } else { mm->mmap_base = mmap_base(); + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base -= mm->delta_mmap + mm->delta_stack; +#endif + mm->get_unmapped_area = s390_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } diff -uriN linux-2.6.38.4/arch/score/include/asm/system.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/score/include/asm/system.h --- linux-2.6.38.4/arch/score/include/asm/system.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/score/include/asm/system.h 2011-05-01 17:02:10.000000000 -0500 @@ -17,7 +17,7 @@ #define finish_arch_switch(prev) do {} while (0) typedef void (*vi_handler_t)(void); -extern unsigned long arch_align_stack(unsigned long sp); +#define arch_align_stack(x) (x) #define mb() barrier() #define rmb() barrier() diff -uriN linux-2.6.38.4/arch/score/kernel/process.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/score/kernel/process.c --- linux-2.6.38.4/arch/score/kernel/process.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/score/kernel/process.c 2011-05-01 17:02:10.000000000 -0500 @@ -161,8 +161,3 @@ return task_pt_regs(task)->cp0_epc; } - -unsigned long arch_align_stack(unsigned long sp) -{ - return sp; -} diff -uriN linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/include/asm/dma-mapping.h --- linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/include/asm/dma-mapping.h 2011-05-01 17:02:10.000000000 -0500 @@ -1,10 +1,10 @@ #ifndef __ASM_SH_DMA_MAPPING_H #define __ASM_SH_DMA_MAPPING_H -extern struct dma_map_ops *dma_ops; +extern const struct dma_map_ops *dma_ops; extern void no_iommu_init(void); -static inline struct dma_map_ops *get_dma_ops(struct device *dev) +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) { return dma_ops; } @@ -14,7 +14,7 @@ static inline int dma_supported(struct device *dev, u64 mask) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); if (ops->dma_supported) return ops->dma_supported(dev, mask); @@ -24,7 +24,7 @@ static inline int dma_set_mask(struct device *dev, u64 mask) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); if (!dev->dma_mask || !dma_supported(dev, mask)) return -EIO; @@ -44,7 +44,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); if (ops->mapping_error) return ops->mapping_error(dev, dma_addr); @@ -55,7 +55,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); void *memory; if (dma_alloc_from_coherent(dev, size, dma_handle, &memory)) @@ -72,7 +72,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); if (dma_release_from_coherent(dev, get_order(size), vaddr)) return; diff -uriN linux-2.6.38.4/arch/sh/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/Kconfig --- linux-2.6.38.4/arch/sh/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -889,6 +889,8 @@ source "arch/sh/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/sh/kernel/dma-nommu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/kernel/dma-nommu.c --- linux-2.6.38.4/arch/sh/kernel/dma-nommu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/kernel/dma-nommu.c 2011-05-01 17:02:10.000000000 -0500 @@ -62,7 +62,7 @@ } #endif -struct dma_map_ops nommu_dma_ops = { +const struct dma_map_ops nommu_dma_ops = { .alloc_coherent = dma_generic_alloc_coherent, .free_coherent = dma_generic_free_coherent, .map_page = nommu_map_page, diff -uriN linux-2.6.38.4/arch/sh/kernel/irq.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/kernel/irq.c --- linux-2.6.38.4/arch/sh/kernel/irq.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/kernel/irq.c 2011-05-01 17:01:51.000000000 -0500 @@ -13,6 +13,7 @@ #include #include #include +// #include #include #include #include diff -uriN linux-2.6.38.4/arch/sh/kernel/kgdb.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/kernel/kgdb.c --- linux-2.6.38.4/arch/sh/kernel/kgdb.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/kernel/kgdb.c 2011-05-01 17:02:10.000000000 -0500 @@ -319,7 +319,7 @@ unregister_die_notifier(&kgdb_notifier); } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { /* Breakpoint instruction: trapa #0x3c */ #ifdef CONFIG_CPU_LITTLE_ENDIAN .gdb_bpt_instr = { 0x3c, 0xc3 }, diff -uriN linux-2.6.38.4/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/kernel/vsyscall/vsyscall.c --- linux-2.6.38.4/arch/sh/kernel/vsyscall/vsyscall.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/kernel/vsyscall/vsyscall.c 2011-05-01 17:01:51.000000000 -0500 @@ -18,6 +18,7 @@ #include #include #include +#include /* * Should the kernel map a VDSO page into processes and pass its diff -uriN linux-2.6.38.4/arch/sh/mm/consistent.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/mm/consistent.c --- linux-2.6.38.4/arch/sh/mm/consistent.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/mm/consistent.c 2011-05-01 17:02:10.000000000 -0500 @@ -22,7 +22,7 @@ #define PREALLOC_DMA_DEBUG_ENTRIES 4096 -struct dma_map_ops *dma_ops; +const struct dma_map_ops *dma_ops; EXPORT_SYMBOL(dma_ops); static int __init dma_init(void) diff -uriN linux-2.6.38.4/arch/sh/mm/mmap.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/mm/mmap.c --- linux-2.6.38.4/arch/sh/mm/mmap.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sh/mm/mmap.c 2011-05-01 17:02:10.000000000 -0500 @@ -74,8 +74,7 @@ addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); - if (TASK_SIZE - len >= addr && - (!vma || addr + len <= vma->vm_start)) + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len)) return addr; } @@ -106,7 +105,7 @@ } return -ENOMEM; } - if (likely(!vma || addr + len <= vma->vm_start)) { + if (likely(check_heap_stack_gap(vma, addr, len))) { /* * Remember the place where we stopped the search: */ @@ -157,8 +156,7 @@ addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); - if (TASK_SIZE - len >= addr && - (!vma || addr + len <= vma->vm_start)) + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len)) return addr; } @@ -179,7 +177,7 @@ /* make sure it can fit in the remaining address space */ if (likely(addr > len)) { vma = find_vma(mm, addr-len); - if (!vma || addr <= vma->vm_start) { + if (check_heap_stack_gap(vma, addr - len, len)) { /* remember the address as a hint for next time */ return (mm->free_area_cache = addr-len); } @@ -188,18 +186,18 @@ if (unlikely(mm->mmap_base < len)) goto bottomup; - addr = mm->mmap_base-len; - if (do_colour_align) - addr = COLOUR_ALIGN_DOWN(addr, pgoff); + addr = mm->mmap_base - len; do { + if (do_colour_align) + addr = COLOUR_ALIGN_DOWN(addr, pgoff); /* * Lookup failure means no vma is above this address, * else if new region fits below vma->vm_start, * return with success: */ vma = find_vma(mm, addr); - if (likely(!vma || addr+len <= vma->vm_start)) { + if (likely(check_heap_stack_gap(vma, addr, len))) { /* remember the address as a hint for next time */ return (mm->free_area_cache = addr); } @@ -209,10 +207,8 @@ mm->cached_hole_size = vma->vm_start - addr; /* try just below the current vma->vm_start */ - addr = vma->vm_start-len; - if (do_colour_align) - addr = COLOUR_ALIGN_DOWN(addr, pgoff); - } while (likely(len < vma->vm_start)); + addr = skip_heap_stack_gap(vma, len); + } while (!IS_ERR_VALUE(addr)); bottomup: /* diff -uriN linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/atomic_64.h --- linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/atomic_64.h 2011-05-01 17:02:10.000000000 -0500 @@ -14,18 +14,40 @@ #define ATOMIC64_INIT(i) { (i) } #define atomic_read(v) (*(volatile int *)&(v)->counter) +static inline int atomic_read_unchecked(const atomic_unchecked_t *v) +{ + return v->counter; +} #define atomic64_read(v) (*(volatile long *)&(v)->counter) +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v) +{ + return v->counter; +} #define atomic_set(v, i) (((v)->counter) = i) +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i) +{ + v->counter = i; +} #define atomic64_set(v, i) (((v)->counter) = i) +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i) +{ + v->counter = i; +} extern void atomic_add(int, atomic_t *); +extern void atomic_add_unchecked(int, atomic_unchecked_t *); extern void atomic64_add(long, atomic64_t *); +extern void atomic64_add_unchecked(long, atomic64_unchecked_t *); extern void atomic_sub(int, atomic_t *); +extern void atomic_sub_unchecked(int, atomic_unchecked_t *); extern void atomic64_sub(long, atomic64_t *); +extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *); extern int atomic_add_ret(int, atomic_t *); +extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *); extern long atomic64_add_ret(long, atomic64_t *); +extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *); extern int atomic_sub_ret(int, atomic_t *); extern long atomic64_sub_ret(long, atomic64_t *); @@ -33,12 +55,24 @@ #define atomic64_dec_return(v) atomic64_sub_ret(1, v) #define atomic_inc_return(v) atomic_add_ret(1, v) +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v) +{ + return atomic_add_ret_unchecked(1, v); +} #define atomic64_inc_return(v) atomic64_add_ret(1, v) +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v) +{ + return atomic64_add_ret_unchecked(1, v); +} #define atomic_sub_return(i, v) atomic_sub_ret(i, v) #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v) #define atomic_add_return(i, v) atomic_add_ret(i, v) +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v) +{ + return atomic_add_ret_unchecked(i, v); +} #define atomic64_add_return(i, v) atomic64_add_ret(i, v) /* @@ -59,10 +93,26 @@ #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0) #define atomic_inc(v) atomic_add(1, v) +static inline void atomic_inc_unchecked(atomic_unchecked_t *v) +{ + atomic_add_unchecked(1, v); +} #define atomic64_inc(v) atomic64_add(1, v) +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v) +{ + atomic64_add_unchecked(1, v); +} #define atomic_dec(v) atomic_sub(1, v) +static inline void atomic_dec_unchecked(atomic_unchecked_t *v) +{ + atomic_sub_unchecked(1, v); +} #define atomic64_dec(v) atomic64_sub(1, v) +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v) +{ + atomic64_sub_unchecked(1, v); +} #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0) #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0) @@ -72,17 +122,28 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) { - int c, old; + int c, old, new; c = atomic_read(v); for (;;) { - if (unlikely(c == (u))) + if (unlikely(c == u)) break; - old = atomic_cmpxchg((v), c, c + (a)); + + asm volatile("addcc %2, %0, %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "tvs %%icc, 6\n" +#endif + + : "=r" (new) + : "0" (c), "ir" (a) + : "cc"); + + old = atomic_cmpxchg(v, c, new); if (likely(old == c)) break; c = old; } - return c != (u); + return c != u; } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) @@ -93,17 +154,28 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u) { - long c, old; + long c, old, new; c = atomic64_read(v); for (;;) { - if (unlikely(c == (u))) + if (unlikely(c == u)) break; - old = atomic64_cmpxchg((v), c, c + (a)); + + asm volatile("addcc %2, %0, %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "tvs %%xcc, 6\n" +#endif + + : "=r" (new) + : "0" (c), "ir" (a) + : "cc"); + + old = atomic64_cmpxchg(v, c, new); if (likely(old == c)) break; c = old; } - return c != (u); + return c != u; } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) diff -uriN linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/dma-mapping.h --- linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/dma-mapping.h 2011-05-01 17:02:10.000000000 -0500 @@ -12,10 +12,10 @@ #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) -extern struct dma_map_ops *dma_ops, pci32_dma_ops; +extern const struct dma_map_ops *dma_ops, pci32_dma_ops; extern struct bus_type pci_bus_type; -static inline struct dma_map_ops *get_dma_ops(struct device *dev) +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) { #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI) if (dev->bus == &pci_bus_type) @@ -29,7 +29,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); void *cpu_addr; cpu_addr = ops->alloc_coherent(dev, size, dma_handle, flag); @@ -40,7 +40,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_handle) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); ops->free_coherent(dev, size, cpu_addr, dma_handle); diff -uriN linux-2.6.38.4/arch/sparc/include/asm/elf_32.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/elf_32.h --- linux-2.6.38.4/arch/sparc/include/asm/elf_32.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/elf_32.h 2011-05-01 17:02:10.000000000 -0500 @@ -114,6 +114,13 @@ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE 0x10000UL + +#define PAX_DELTA_MMAP_LEN 16 +#define PAX_DELTA_STACK_LEN 16 +#endif + /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspace on Sparc. */ diff -uriN linux-2.6.38.4/arch/sparc/include/asm/elf_64.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/elf_64.h --- linux-2.6.38.4/arch/sparc/include/asm/elf_64.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/elf_64.h 2011-05-01 17:02:10.000000000 -0500 @@ -162,6 +162,12 @@ #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL) + +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28) +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29) +#endif /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ diff -uriN linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/pgtable_32.h --- linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/pgtable_32.h 2011-05-01 17:02:10.000000000 -0500 @@ -43,6 +43,13 @@ BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) BTFIXUPDEF_INT(page_readonly) + +#ifdef CONFIG_PAX_PAGEEXEC +BTFIXUPDEF_INT(page_shared_noexec) +BTFIXUPDEF_INT(page_copy_noexec) +BTFIXUPDEF_INT(page_readonly_noexec) +#endif + BTFIXUPDEF_INT(page_kernel) #define PMD_SHIFT SUN4C_PMD_SHIFT @@ -64,6 +71,16 @@ #define PAGE_COPY __pgprot(BTFIXUP_INT(page_copy)) #define PAGE_READONLY __pgprot(BTFIXUP_INT(page_readonly)) +#ifdef CONFIG_PAX_PAGEEXEC +extern pgprot_t PAGE_SHARED_NOEXEC; +# define PAGE_COPY_NOEXEC __pgprot(BTFIXUP_INT(page_copy_noexec)) +# define PAGE_READONLY_NOEXEC __pgprot(BTFIXUP_INT(page_readonly_noexec)) +#else +# define PAGE_SHARED_NOEXEC PAGE_SHARED +# define PAGE_COPY_NOEXEC PAGE_COPY +# define PAGE_READONLY_NOEXEC PAGE_READONLY +#endif + extern unsigned long page_kernel; #ifdef MODULE diff -uriN linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/pgtsrmmu.h --- linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/pgtsrmmu.h 2011-05-01 17:02:10.000000000 -0500 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ SRMMU_EXEC | SRMMU_REF) + +#ifdef CONFIG_PAX_PAGEEXEC +#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF) +#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF) +#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF) +#endif + #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) diff -uriN linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/spinlock_64.h --- linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/spinlock_64.h 2011-05-01 17:02:10.000000000 -0500 @@ -99,7 +99,12 @@ __asm__ __volatile__ ( "1: ldsw [%2], %0\n" " brlz,pn %0, 2f\n" -"4: add %0, 1, %1\n" +"4: addcc %0, 1, %1\n" + +#ifdef CONFIG_PAX_REFCOUNT +" tvs %%icc, 6\n" +#endif + " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%icc, 1b\n" @@ -112,7 +117,7 @@ " .previous" : "=&r" (tmp1), "=&r" (tmp2) : "r" (lock) - : "memory"); + : "memory", "cc"); } static int inline arch_read_trylock(arch_rwlock_t *lock) @@ -123,7 +128,12 @@ "1: ldsw [%2], %0\n" " brlz,a,pn %0, 2f\n" " mov 0, %0\n" -" add %0, 1, %1\n" +" addcc %0, 1, %1\n" + +#ifdef CONFIG_PAX_REFCOUNT +" tvs %%icc, 6\n" +#endif + " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%icc, 1b\n" @@ -142,7 +152,12 @@ __asm__ __volatile__( "1: lduw [%2], %0\n" -" sub %0, 1, %1\n" +" subcc %0, 1, %1\n" + +#ifdef CONFIG_PAX_REFCOUNT +" tvs %%icc, 6\n" +#endif + " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%xcc, 1b\n" diff -uriN linux-2.6.38.4/arch/sparc/include/asm/tlb_64.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/tlb_64.h --- linux-2.6.38.4/arch/sparc/include/asm/tlb_64.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/tlb_64.h 2011-05-01 17:01:51.000000000 -0500 @@ -3,6 +3,7 @@ #include #include +#include #include #include #include diff -uriN linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/uaccess_32.h --- linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/uaccess_32.h 2011-05-01 17:02:10.000000000 -0500 @@ -249,27 +249,46 @@ static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) { - if (n && __access_ok((unsigned long) to, n)) + if ((long)n < 0) + return n; + + if (n && __access_ok((unsigned long) to, n)) { + if (!__builtin_constant_p(n)) + check_object_size(from, n, true); return __copy_user(to, (__force void __user *) from, n); - else + } else return n; } static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n) { + if ((long)n < 0) + return n; + + if (!__builtin_constant_p(n)) + check_object_size(from, n, true); + return __copy_user(to, (__force void __user *) from, n); } static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n) { - if (n && __access_ok((unsigned long) from, n)) + if ((long)n < 0) + return n; + + if (n && __access_ok((unsigned long) from, n)) { + if (!__builtin_constant_p(n)) + check_object_size(to, n, false); return __copy_user((__force void __user *) to, from, n); - else + } else return n; } static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n) { + if ((long)n < 0) + return n; + return __copy_user((__force void __user *) to, from, n); } diff -uriN linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/uaccess_64.h --- linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/uaccess_64.h 2011-05-01 17:02:10.000000000 -0500 @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -213,8 +214,15 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long size) { - unsigned long ret = ___copy_from_user(to, from, size); + unsigned long ret; + if ((long)size < 0 || size > INT_MAX) + return size; + + if (!__builtin_constant_p(size)) + check_object_size(to, size, false); + + ret = ___copy_from_user(to, from, size); if (unlikely(ret)) ret = copy_from_user_fixup(to, from, size); @@ -230,8 +238,15 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long size) { - unsigned long ret = ___copy_to_user(to, from, size); + unsigned long ret; + + if ((long)size < 0 || size > INT_MAX) + return size; + + if (!__builtin_constant_p(size)) + check_object_size(from, size, true); + ret = ___copy_to_user(to, from, size); if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); return ret; diff -uriN linux-2.6.38.4/arch/sparc/include/asm/uaccess.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/uaccess.h --- linux-2.6.38.4/arch/sparc/include/asm/uaccess.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/uaccess.h 2011-05-01 17:02:10.000000000 -0500 @@ -1,5 +1,13 @@ #ifndef ___ASM_SPARC_UACCESS_H #define ___ASM_SPARC_UACCESS_H + +#ifdef __KERNEL__ +#ifndef __ASSEMBLY__ +#include +extern void check_object_size(const void *ptr, unsigned long n, bool to); +#endif +#endif + #if defined(__sparc__) && defined(__arch64__) #include #else diff -uriN linux-2.6.38.4/arch/sparc/include/asm/unistd.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/unistd.h --- linux-2.6.38.4/arch/sparc/include/asm/unistd.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/include/asm/unistd.h 2011-05-01 17:01:51.000000000 -0500 @@ -335,7 +335,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 #define __NR_timer_create 266 -/* #define __NR_vserver 267 Reserved for VSERVER */ +#define __NR_vserver 267 #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 diff -uriN linux-2.6.38.4/arch/sparc/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/Kconfig --- linux-2.6.38.4/arch/sparc/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -553,6 +553,8 @@ source "arch/sparc/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/sparc/kernel/iommu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/iommu.c --- linux-2.6.38.4/arch/sparc/kernel/iommu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/iommu.c 2011-05-01 17:02:10.000000000 -0500 @@ -824,7 +824,7 @@ spin_unlock_irqrestore(&iommu->lock, flags); } -static struct dma_map_ops sun4u_dma_ops = { +static const struct dma_map_ops sun4u_dma_ops = { .alloc_coherent = dma_4u_alloc_coherent, .free_coherent = dma_4u_free_coherent, .map_page = dma_4u_map_page, @@ -835,7 +835,7 @@ .sync_sg_for_cpu = dma_4u_sync_sg_for_cpu, }; -struct dma_map_ops *dma_ops = &sun4u_dma_ops; +const struct dma_map_ops *dma_ops = &sun4u_dma_ops; EXPORT_SYMBOL(dma_ops); extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); diff -uriN linux-2.6.38.4/arch/sparc/kernel/ioport.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/ioport.c --- linux-2.6.38.4/arch/sparc/kernel/ioport.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/ioport.c 2011-05-01 17:02:10.000000000 -0500 @@ -397,7 +397,7 @@ BUG(); } -struct dma_map_ops sbus_dma_ops = { +const struct dma_map_ops sbus_dma_ops = { .alloc_coherent = sbus_alloc_coherent, .free_coherent = sbus_free_coherent, .map_page = sbus_map_page, @@ -408,7 +408,7 @@ .sync_sg_for_device = sbus_sync_sg_for_device, }; -struct dma_map_ops *dma_ops = &sbus_dma_ops; +const struct dma_map_ops *dma_ops = &sbus_dma_ops; EXPORT_SYMBOL(dma_ops); static int __init sparc_register_ioport(void) @@ -645,7 +645,7 @@ } } -struct dma_map_ops pci32_dma_ops = { +const struct dma_map_ops pci32_dma_ops = { .alloc_coherent = pci32_alloc_coherent, .free_coherent = pci32_free_coherent, .map_page = pci32_map_page, diff -uriN linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/kgdb_32.c --- linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/kgdb_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -164,7 +164,7 @@ regs->npc = regs->pc + 4; } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { /* Breakpoint instruction: ta 0x7d */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, }; diff -uriN linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/kgdb_64.c --- linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/kgdb_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -187,7 +187,7 @@ regs->tnpc = regs->tpc + 4; } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { /* Breakpoint instruction: ta 0x72 */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, }; diff -uriN linux-2.6.38.4/arch/sparc/kernel/Makefile linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/Makefile --- linux-2.6.38.4/arch/sparc/kernel/Makefile 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/Makefile 2011-05-01 17:02:10.000000000 -0500 @@ -3,7 +3,7 @@ # asflags-y := -ansi -ccflags-y := -Werror +#ccflags-y := -Werror extra-y := head_$(BITS).o extra-y += init_task.o diff -uriN linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/pci_sun4v.c --- linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/pci_sun4v.c 2011-05-01 17:02:10.000000000 -0500 @@ -525,7 +525,7 @@ spin_unlock_irqrestore(&iommu->lock, flags); } -static struct dma_map_ops sun4v_dma_ops = { +static const struct dma_map_ops sun4v_dma_ops = { .alloc_coherent = dma_4v_alloc_coherent, .free_coherent = dma_4v_free_coherent, .map_page = dma_4v_map_page, diff -uriN linux-2.6.38.4/arch/sparc/kernel/process_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/process_32.c --- linux-2.6.38.4/arch/sparc/kernel/process_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/process_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -196,7 +196,7 @@ rw->ins[4], rw->ins[5], rw->ins[6], rw->ins[7]); - printk("%pS\n", (void *) rw->ins[7]); + printk("%pA\n", (void *) rw->ins[7]); rw = (struct reg_window32 *) rw->ins[6]; } spin_unlock_irqrestore(&sparc_backtrace_lock, flags); @@ -263,14 +263,14 @@ printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n", r->psr, r->pc, r->npc, r->y, print_tainted()); - printk("PC: <%pS>\n", (void *) r->pc); + printk("PC: <%pA>\n", (void *) r->pc); printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3], r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]); printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11], r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]); - printk("RPC: <%pS>\n", (void *) r->u_regs[15]); + printk("RPC: <%pA>\n", (void *) r->u_regs[15]); printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3], @@ -305,7 +305,7 @@ rw = (struct reg_window32 *) fp; pc = rw->ins[7]; printk("[%08lx : ", pc); - printk("%pS ] ", (void *) pc); + printk("%pA ] ", (void *) pc); fp = rw->ins[6]; } while (++count < 16); printk("\n"); diff -uriN linux-2.6.38.4/arch/sparc/kernel/process_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/process_64.c --- linux-2.6.38.4/arch/sparc/kernel/process_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/process_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -180,14 +180,14 @@ printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n", rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]); if (regs->tstate & TSTATE_PRIV) - printk("I7: <%pS>\n", (void *) rwk->ins[7]); + printk("I7: <%pA>\n", (void *) rwk->ins[7]); } void show_regs(struct pt_regs *regs) { printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate, regs->tpc, regs->tnpc, regs->y, print_tainted()); - printk("TPC: <%pS>\n", (void *) regs->tpc); + printk("TPC: <%pA>\n", (void *) regs->tpc); printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n", regs->u_regs[0], regs->u_regs[1], regs->u_regs[2], regs->u_regs[3]); @@ -200,7 +200,7 @@ printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n", regs->u_regs[12], regs->u_regs[13], regs->u_regs[14], regs->u_regs[15]); - printk("RPC: <%pS>\n", (void *) regs->u_regs[15]); + printk("RPC: <%pA>\n", (void *) regs->u_regs[15]); show_regwindow(regs); show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]); } @@ -285,7 +285,7 @@ ((tp && tp->task) ? tp->task->pid : -1)); if (gp->tstate & TSTATE_PRIV) { - printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n", + printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n", (void *) gp->tpc, (void *) gp->o7, (void *) gp->i7, diff -uriN linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/sys_sparc_32.c --- linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/sys_sparc_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -56,7 +56,7 @@ if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; if (!addr) - addr = TASK_UNMAPPED_BASE; + addr = current->mm->mmap_base; if (flags & MAP_SHARED) addr = COLOUR_ALIGN(addr); @@ -71,7 +71,7 @@ } if (TASK_SIZE - PAGE_SIZE - len < addr) return -ENOMEM; - if (!vmm || addr + len <= vmm->vm_start) + if (check_heap_stack_gap(vmm, addr, len)) return addr; addr = vmm->vm_end; if (flags & MAP_SHARED) diff -uriN linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/sys_sparc_64.c --- linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/sys_sparc_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -124,7 +124,7 @@ /* We do not accept a shared mapping if it would violate * cache aliasing constraints. */ - if ((flags & MAP_SHARED) && + if ((filp || (flags & MAP_SHARED)) && ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))) return -EINVAL; return addr; @@ -139,6 +139,10 @@ if (filp || (flags & MAP_SHARED)) do_color_align = 1; +#ifdef CONFIG_PAX_RANDMMAP + if (!(mm->pax_flags & MF_PAX_RANDMMAP)) +#endif + if (addr) { if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); @@ -146,15 +150,14 @@ addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); - if (task_size - len >= addr && - (!vma || addr + len <= vma->vm_start)) + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len)) return addr; } if (len > mm->cached_hole_size) { - start_addr = addr = mm->free_area_cache; + start_addr = addr = mm->free_area_cache; } else { - start_addr = addr = TASK_UNMAPPED_BASE; + start_addr = addr = mm->mmap_base; mm->cached_hole_size = 0; } @@ -174,14 +177,14 @@ vma = find_vma(mm, VA_EXCLUDE_END); } if (unlikely(task_size < addr)) { - if (start_addr != TASK_UNMAPPED_BASE) { - start_addr = addr = TASK_UNMAPPED_BASE; + if (start_addr != mm->mmap_base) { + start_addr = addr = mm->mmap_base; mm->cached_hole_size = 0; goto full_search; } return -ENOMEM; } - if (likely(!vma || addr + len <= vma->vm_start)) { + if (likely(check_heap_stack_gap(vma, addr, len))) { /* * Remember the place where we stopped the search: */ @@ -215,7 +218,7 @@ /* We do not accept a shared mapping if it would violate * cache aliasing constraints. */ - if ((flags & MAP_SHARED) && + if ((filp || (flags & MAP_SHARED)) && ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))) return -EINVAL; return addr; @@ -236,8 +239,7 @@ addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); - if (task_size - len >= addr && - (!vma || addr + len <= vma->vm_start)) + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len)) return addr; } @@ -258,7 +260,7 @@ /* make sure it can fit in the remaining address space */ if (likely(addr > len)) { vma = find_vma(mm, addr-len); - if (!vma || addr <= vma->vm_start) { + if (check_heap_stack_gap(vma, addr - len, len)) { /* remember the address as a hint for next time */ return (mm->free_area_cache = addr-len); } @@ -267,18 +269,18 @@ if (unlikely(mm->mmap_base < len)) goto bottomup; - addr = mm->mmap_base-len; - if (do_color_align) - addr = COLOUR_ALIGN_DOWN(addr, pgoff); + addr = mm->mmap_base - len; do { + if (do_color_align) + addr = COLOUR_ALIGN_DOWN(addr, pgoff); /* * Lookup failure means no vma is above this address, * else if new region fits below vma->vm_start, * return with success: */ vma = find_vma(mm, addr); - if (likely(!vma || addr+len <= vma->vm_start)) { + if (likely(check_heap_stack_gap(vma, addr, len))) { /* remember the address as a hint for next time */ return (mm->free_area_cache = addr); } @@ -288,10 +290,8 @@ mm->cached_hole_size = vma->vm_start - addr; /* try just below the current vma->vm_start */ - addr = vma->vm_start-len; - if (do_color_align) - addr = COLOUR_ALIGN_DOWN(addr, pgoff); - } while (likely(len < vma->vm_start)); + addr = skip_heap_stack_gap(vma, len); + } while (!IS_ERR_VALUE(addr)); bottomup: /* @@ -385,6 +385,12 @@ gap == RLIM_INFINITY || sysctl_legacy_va_layout) { mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base += mm->delta_mmap; +#endif + mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } else { @@ -397,6 +403,12 @@ gap = (task_size / 6 * 5); mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor); + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base -= mm->delta_mmap + mm->delta_stack; +#endif + mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } diff -uriN linux-2.6.38.4/arch/sparc/kernel/systbls_32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/systbls_32.S --- linux-2.6.38.4/arch/sparc/kernel/systbls_32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/systbls_32.S 2011-05-01 17:01:51.000000000 -0500 @@ -70,7 +70,7 @@ /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep /*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun -/*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy +/*265*/ .long sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat diff -uriN linux-2.6.38.4/arch/sparc/kernel/systbls_64.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/systbls_64.S --- linux-2.6.38.4/arch/sparc/kernel/systbls_64.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/systbls_64.S 2011-05-01 17:01:51.000000000 -0500 @@ -71,7 +71,7 @@ /*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep /*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun - .word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy + .word sys_timer_delete, compat_sys_timer_create, sys32_vserver, compat_sys_io_setup, sys_io_destroy /*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid /*280*/ .word sys32_tee, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat @@ -147,7 +147,7 @@ /*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl .word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep /*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun - .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy + .word sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat diff -uriN linux-2.6.38.4/arch/sparc/kernel/traps_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/traps_32.c --- linux-2.6.38.4/arch/sparc/kernel/traps_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/traps_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -76,7 +76,7 @@ count++ < 30 && (((unsigned long) rw) >= PAGE_OFFSET) && !(((unsigned long) rw) & 0x7)) { - printk("Caller[%08lx]: %pS\n", rw->ins[7], + printk("Caller[%08lx]: %pA\n", rw->ins[7], (void *) rw->ins[7]); rw = (struct reg_window32 *)rw->ins[6]; } diff -uriN linux-2.6.38.4/arch/sparc/kernel/traps_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/traps_64.c --- linux-2.6.38.4/arch/sparc/kernel/traps_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/traps_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -75,7 +75,7 @@ i + 1, p->trapstack[i].tstate, p->trapstack[i].tpc, p->trapstack[i].tnpc, p->trapstack[i].tt); - printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc); + printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc); } } @@ -95,6 +95,12 @@ lvl -= 0x100; if (regs->tstate & TSTATE_PRIV) { + +#ifdef CONFIG_PAX_REFCOUNT + if (lvl == 6) + pax_report_refcount_overflow(regs); +#endif + sprintf(buffer, "Kernel bad sw trap %lx", lvl); die_if_kernel(buffer, regs); } @@ -113,11 +119,16 @@ void bad_trap_tl1(struct pt_regs *regs, long lvl) { char buffer[32]; - + if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs, 0, lvl, SIGTRAP) == NOTIFY_STOP) return; +#ifdef CONFIG_PAX_REFCOUNT + if (lvl == 6) + pax_report_refcount_overflow(regs); +#endif + dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); sprintf (buffer, "Bad trap %lx at tl>0", lvl); @@ -1141,7 +1152,7 @@ regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate); printk("%s" "ERROR(%d): ", (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id()); - printk("TPC<%pS>\n", (void *) regs->tpc); + printk("TPC<%pA>\n", (void *) regs->tpc); printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n", (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(), (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT, @@ -1748,7 +1759,7 @@ smp_processor_id(), (type & 0x1) ? 'I' : 'D', regs->tpc); - printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc); + printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc); panic("Irrecoverable Cheetah+ parity error."); } @@ -1756,7 +1767,7 @@ smp_processor_id(), (type & 0x1) ? 'I' : 'D', regs->tpc); - printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc); + printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc); } struct sun4v_error_entry { @@ -1963,9 +1974,9 @@ printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n", regs->tpc, tl); - printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc); + printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc); printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]); - printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n", + printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n", (void *) regs->u_regs[UREG_I7]); printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] " "pte[%lx] error[%lx]\n", @@ -1987,9 +1998,9 @@ printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n", regs->tpc, tl); - printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc); + printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc); printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]); - printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n", + printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n", (void *) regs->u_regs[UREG_I7]); printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] " "pte[%lx] error[%lx]\n", @@ -2195,13 +2206,13 @@ fp = (unsigned long)sf->fp + STACK_BIAS; } - printk(" [%016lx] %pS\n", pc, (void *) pc); + printk(" [%016lx] %pA\n", pc, (void *) pc); #ifdef CONFIG_FUNCTION_GRAPH_TRACER if ((pc + 8UL) == (unsigned long) &return_to_handler) { int index = tsk->curr_ret_stack; if (tsk->ret_stack && index >= graph) { pc = tsk->ret_stack[index - graph].ret; - printk(" [%016lx] %pS\n", pc, (void *) pc); + printk(" [%016lx] %pA\n", pc, (void *) pc); graph++; } } @@ -2254,7 +2265,7 @@ while (rw && count++ < 30 && kstack_valid(tp, (unsigned long) rw)) { - printk("Caller[%016lx]: %pS\n", rw->ins[7], + printk("Caller[%016lx]: %pA\n", rw->ins[7], (void *) rw->ins[7]); rw = kernel_stack_up(rw); diff -uriN linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/unaligned_64.c --- linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/kernel/unaligned_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -278,7 +278,7 @@ static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5); if (__ratelimit(&ratelimit)) { - printk("Kernel unaligned access at TPC[%lx] %pS\n", + printk("Kernel unaligned access at TPC[%lx] %pA\n", regs->tpc, (void *) regs->tpc); } } diff -uriN linux-2.6.38.4/arch/sparc/lib/atomic_64.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/lib/atomic_64.S --- linux-2.6.38.4/arch/sparc/lib/atomic_64.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/lib/atomic_64.S 2011-05-01 17:02:10.000000000 -0500 @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) 1: lduw [%o1], %g1 - add %g1, %o0, %g7 + addcc %g1, %o0, %g7 + +#ifdef CONFIG_PAX_REFCOUNT + tvs %icc, 6 +#endif + cas [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %icc, BACKOFF_LABEL(2f, 1b) @@ -28,12 +33,32 @@ 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic_add, .-atomic_add + .globl atomic_add_unchecked + .type atomic_add_unchecked,#function +atomic_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */ + BACKOFF_SETUP(%o2) +1: lduw [%o1], %g1 + add %g1, %o0, %g7 + cas [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %icc, 2f + nop + retl + nop +2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic_add_unchecked, .-atomic_add_unchecked + .globl atomic_sub .type atomic_sub,#function atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) 1: lduw [%o1], %g1 - sub %g1, %o0, %g7 + subcc %g1, %o0, %g7 + +#ifdef CONFIG_PAX_REFCOUNT + tvs %icc, 6 +#endif + cas [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %icc, BACKOFF_LABEL(2f, 1b) @@ -43,12 +68,32 @@ 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic_sub, .-atomic_sub + .globl atomic_sub_unchecked + .type atomic_sub_unchecked,#function +atomic_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */ + BACKOFF_SETUP(%o2) +1: lduw [%o1], %g1 + sub %g1, %o0, %g7 + cas [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %icc, 2f + nop + retl + nop +2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic_sub_unchecked, .-atomic_sub_unchecked + .globl atomic_add_ret .type atomic_add_ret,#function atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) 1: lduw [%o1], %g1 - add %g1, %o0, %g7 + addcc %g1, %o0, %g7 + +#ifdef CONFIG_PAX_REFCOUNT + tvs %icc, 6 +#endif + cas [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %icc, BACKOFF_LABEL(2f, 1b) @@ -58,12 +103,33 @@ 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic_add_ret, .-atomic_add_ret + .globl atomic_add_ret_unchecked + .type atomic_add_ret_unchecked,#function +atomic_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */ + BACKOFF_SETUP(%o2) +1: lduw [%o1], %g1 + addcc %g1, %o0, %g7 + cas [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %icc, 2f + add %g7, %o0, %g7 + sra %g7, 0, %o0 + retl + nop +2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic_add_ret_unchecked, .-atomic_add_ret_unchecked + .globl atomic_sub_ret .type atomic_sub_ret,#function atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) 1: lduw [%o1], %g1 - sub %g1, %o0, %g7 + subcc %g1, %o0, %g7 + +#ifdef CONFIG_PAX_REFCOUNT + tvs %icc, 6 +#endif + cas [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %icc, BACKOFF_LABEL(2f, 1b) @@ -78,7 +144,12 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) 1: ldx [%o1], %g1 - add %g1, %o0, %g7 + addcc %g1, %o0, %g7 + +#ifdef CONFIG_PAX_REFCOUNT + tvs %xcc, 6 +#endif + casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, BACKOFF_LABEL(2f, 1b) @@ -88,12 +159,32 @@ 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic64_add, .-atomic64_add + .globl atomic64_add_unchecked + .type atomic64_add_unchecked,#function +atomic64_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */ + BACKOFF_SETUP(%o2) +1: ldx [%o1], %g1 + addcc %g1, %o0, %g7 + casx [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %xcc, 2f + nop + retl + nop +2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic64_add_unchecked, .-atomic64_add_unchecked + .globl atomic64_sub .type atomic64_sub,#function atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) 1: ldx [%o1], %g1 - sub %g1, %o0, %g7 + subcc %g1, %o0, %g7 + +#ifdef CONFIG_PAX_REFCOUNT + tvs %xcc, 6 +#endif + casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, BACKOFF_LABEL(2f, 1b) @@ -103,12 +194,32 @@ 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic64_sub, .-atomic64_sub + .globl atomic64_sub_unchecked + .type atomic64_sub_unchecked,#function +atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */ + BACKOFF_SETUP(%o2) +1: ldx [%o1], %g1 + subcc %g1, %o0, %g7 + casx [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %xcc, 2f + nop + retl + nop +2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic64_sub_unchecked, .-atomic64_sub_unchecked + .globl atomic64_add_ret .type atomic64_add_ret,#function atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) 1: ldx [%o1], %g1 - add %g1, %o0, %g7 + addcc %g1, %o0, %g7 + +#ifdef CONFIG_PAX_REFCOUNT + tvs %xcc, 6 +#endif + casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, BACKOFF_LABEL(2f, 1b) @@ -118,12 +229,33 @@ 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic64_add_ret, .-atomic64_add_ret + .globl atomic64_add_ret_unchecked + .type atomic64_add_ret_unchecked,#function +atomic64_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */ + BACKOFF_SETUP(%o2) +1: ldx [%o1], %g1 + addcc %g1, %o0, %g7 + casx [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %xcc, 2f + add %g7, %o0, %g7 + mov %g7, %o0 + retl + nop +2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic64_add_ret_unchecked, .-atomic64_add_ret_unchecked + .globl atomic64_sub_ret .type atomic64_sub_ret,#function atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) 1: ldx [%o1], %g1 - sub %g1, %o0, %g7 + subcc %g1, %o0, %g7 + +#ifdef CONFIG_PAX_REFCOUNT + tvs %xcc, 6 +#endif + casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, BACKOFF_LABEL(2f, 1b) diff -uriN linux-2.6.38.4/arch/sparc/lib/ksyms.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/lib/ksyms.c --- linux-2.6.38.4/arch/sparc/lib/ksyms.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/lib/ksyms.c 2011-05-01 17:02:10.000000000 -0500 @@ -142,12 +142,17 @@ /* Atomic counter implementation. */ EXPORT_SYMBOL(atomic_add); +EXPORT_SYMBOL(atomic_add_unchecked); EXPORT_SYMBOL(atomic_add_ret); EXPORT_SYMBOL(atomic_sub); +EXPORT_SYMBOL(atomic_sub_unchecked); EXPORT_SYMBOL(atomic_sub_ret); EXPORT_SYMBOL(atomic64_add); +EXPORT_SYMBOL(atomic64_add_unchecked); EXPORT_SYMBOL(atomic64_add_ret); +EXPORT_SYMBOL(atomic64_add_ret_unchecked); EXPORT_SYMBOL(atomic64_sub); +EXPORT_SYMBOL(atomic64_sub_unchecked); EXPORT_SYMBOL(atomic64_sub_ret); /* Atomic bit operations. */ diff -uriN linux-2.6.38.4/arch/sparc/Makefile linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/Makefile --- linux-2.6.38.4/arch/sparc/Makefile 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/Makefile 2011-05-01 17:02:10.000000000 -0500 @@ -75,7 +75,7 @@ # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN VMLINUX_INIT := $(head-y) $(init-y) -VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ +VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/ VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN += $(drivers-y) $(net-y) diff -uriN linux-2.6.38.4/arch/sparc/mm/fault_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/mm/fault_32.c --- linux-2.6.38.4/arch/sparc/mm/fault_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/mm/fault_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -22,6 +22,9 @@ #include #include #include +#include +#include +#include #include #include @@ -209,6 +212,268 @@ return safe_compute_effective_address(regs, insn); } +#ifdef CONFIG_PAX_PAGEEXEC +#ifdef CONFIG_PAX_DLRESOLVE +static void pax_emuplt_close(struct vm_area_struct *vma) +{ + vma->vm_mm->call_dl_resolve = 0UL; +} + +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf) +{ + unsigned int *kaddr; + + vmf->page = alloc_page(GFP_HIGHUSER); + if (!vmf->page) + return VM_FAULT_OOM; + + kaddr = kmap(vmf->page); + memset(kaddr, 0, PAGE_SIZE); + kaddr[0] = 0x9DE3BFA8U; /* save */ + flush_dcache_page(vmf->page); + kunmap(vmf->page); + return VM_FAULT_MAJOR; +} + +static const struct vm_operations_struct pax_vm_ops = { + .close = pax_emuplt_close, + .fault = pax_emuplt_fault +}; + +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr) +{ + int ret; + + INIT_LIST_HEAD(&vma->anon_vma_chain); + vma->vm_mm = current->mm; + vma->vm_start = addr; + vma->vm_end = addr + PAGE_SIZE; + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC; + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); + vma->vm_ops = &pax_vm_ops; + + ret = insert_vm_struct(current->mm, vma); + if (ret) + return ret; + + ++current->mm->total_vm; + return 0; +} +#endif + +/* + * PaX: decide what to do with offenders (regs->pc = fault address) + * + * returns 1 when task should be killed + * 2 when patched PLT trampoline was detected + * 3 when unpatched PLT trampoline was detected + */ +static int pax_handle_fetch_fault(struct pt_regs *regs) +{ + +#ifdef CONFIG_PAX_EMUPLT + int err; + + do { /* PaX: patched PLT emulation #1 */ + unsigned int sethi1, sethi2, jmpl; + + err = get_user(sethi1, (unsigned int *)regs->pc); + err |= get_user(sethi2, (unsigned int *)(regs->pc+4)); + err |= get_user(jmpl, (unsigned int *)(regs->pc+8)); + + if (err) + break; + + if ((sethi1 & 0xFFC00000U) == 0x03000000U && + (sethi2 & 0xFFC00000U) == 0x03000000U && + (jmpl & 0xFFFFE000U) == 0x81C06000U) + { + unsigned int addr; + + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10; + addr = regs->u_regs[UREG_G1]; + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U); + regs->pc = addr; + regs->npc = addr+4; + return 2; + } + } while (0); + + { /* PaX: patched PLT emulation #2 */ + unsigned int ba; + + err = get_user(ba, (unsigned int *)regs->pc); + + if (!err && (ba & 0xFFC00000U) == 0x30800000U) { + unsigned int addr; + + addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2); + regs->pc = addr; + regs->npc = addr+4; + return 2; + } + } + + do { /* PaX: patched PLT emulation #3 */ + unsigned int sethi, jmpl, nop; + + err = get_user(sethi, (unsigned int *)regs->pc); + err |= get_user(jmpl, (unsigned int *)(regs->pc+4)); + err |= get_user(nop, (unsigned int *)(regs->pc+8)); + + if (err) + break; + + if ((sethi & 0xFFC00000U) == 0x03000000U && + (jmpl & 0xFFFFE000U) == 0x81C06000U && + nop == 0x01000000U) + { + unsigned int addr; + + addr = (sethi & 0x003FFFFFU) << 10; + regs->u_regs[UREG_G1] = addr; + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U); + regs->pc = addr; + regs->npc = addr+4; + return 2; + } + } while (0); + + do { /* PaX: unpatched PLT emulation step 1 */ + unsigned int sethi, ba, nop; + + err = get_user(sethi, (unsigned int *)regs->pc); + err |= get_user(ba, (unsigned int *)(regs->pc+4)); + err |= get_user(nop, (unsigned int *)(regs->pc+8)); + + if (err) + break; + + if ((sethi & 0xFFC00000U) == 0x03000000U && + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) && + nop == 0x01000000U) + { + unsigned int addr, save, call; + + if ((ba & 0xFFC00000U) == 0x30800000U) + addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2); + else + addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2); + + err = get_user(save, (unsigned int *)addr); + err |= get_user(call, (unsigned int *)(addr+4)); + err |= get_user(nop, (unsigned int *)(addr+8)); + if (err) + break; + +#ifdef CONFIG_PAX_DLRESOLVE + if (save == 0x9DE3BFA8U && + (call & 0xC0000000U) == 0x40000000U && + nop == 0x01000000U) + { + struct vm_area_struct *vma; + unsigned long call_dl_resolve; + + down_read(¤t->mm->mmap_sem); + call_dl_resolve = current->mm->call_dl_resolve; + up_read(¤t->mm->mmap_sem); + if (likely(call_dl_resolve)) + goto emulate; + + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); + + down_write(¤t->mm->mmap_sem); + if (current->mm->call_dl_resolve) { + call_dl_resolve = current->mm->call_dl_resolve; + up_write(¤t->mm->mmap_sem); + if (vma) + kmem_cache_free(vm_area_cachep, vma); + goto emulate; + } + + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE); + if (!vma || (call_dl_resolve & ~PAGE_MASK)) { + up_write(¤t->mm->mmap_sem); + if (vma) + kmem_cache_free(vm_area_cachep, vma); + return 1; + } + + if (pax_insert_vma(vma, call_dl_resolve)) { + up_write(¤t->mm->mmap_sem); + kmem_cache_free(vm_area_cachep, vma); + return 1; + } + + current->mm->call_dl_resolve = call_dl_resolve; + up_write(¤t->mm->mmap_sem); + +emulate: + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10; + regs->pc = call_dl_resolve; + regs->npc = addr+4; + return 3; + } +#endif + + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */ + if ((save & 0xFFC00000U) == 0x05000000U && + (call & 0xFFFFE000U) == 0x85C0A000U && + nop == 0x01000000U) + { + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10; + regs->u_regs[UREG_G2] = addr + 4; + addr = (save & 0x003FFFFFU) << 10; + addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U); + regs->pc = addr; + regs->npc = addr+4; + return 3; + } + } + } while (0); + + do { /* PaX: unpatched PLT emulation step 2 */ + unsigned int save, call, nop; + + err = get_user(save, (unsigned int *)(regs->pc-4)); + err |= get_user(call, (unsigned int *)regs->pc); + err |= get_user(nop, (unsigned int *)(regs->pc+4)); + if (err) + break; + + if (save == 0x9DE3BFA8U && + (call & 0xC0000000U) == 0x40000000U && + nop == 0x01000000U) + { + unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2); + + regs->u_regs[UREG_RETPC] = regs->pc; + regs->pc = dl_resolve; + regs->npc = dl_resolve+4; + return 3; + } + } while (0); +#endif + + return 1; +} + +void pax_report_insns(void *pc, void *sp) +{ + unsigned long i; + + printk(KERN_ERR "PAX: bytes at PC: "); + for (i = 0; i < 8; i++) { + unsigned int c; + if (get_user(c, (unsigned int *)pc+i)) + printk(KERN_CONT "???????? "); + else + printk(KERN_CONT "%08x ", c); + } + printk("\n"); +} +#endif + static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs, int text_fault) { @@ -281,6 +546,24 @@ if(!(vma->vm_flags & VM_WRITE)) goto bad_area; } else { + +#ifdef CONFIG_PAX_PAGEEXEC + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) { + up_read(&mm->mmap_sem); + switch (pax_handle_fetch_fault(regs)) { + +#ifdef CONFIG_PAX_EMUPLT + case 2: + case 3: + return; +#endif + + } + pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]); + do_group_exit(SIGKILL); + } +#endif + /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; diff -uriN linux-2.6.38.4/arch/sparc/mm/fault_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/mm/fault_64.c --- linux-2.6.38.4/arch/sparc/mm/fault_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/mm/fault_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -21,6 +21,9 @@ #include #include #include +#include +#include +#include #include #include @@ -74,7 +77,7 @@ printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n", regs->tpc); printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]); - printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]); + printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]); printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr); dump_stack(); unhandled_fault(regs->tpc, current, regs); @@ -272,6 +275,457 @@ show_regs(regs); } +#ifdef CONFIG_PAX_PAGEEXEC +#ifdef CONFIG_PAX_DLRESOLVE +static void pax_emuplt_close(struct vm_area_struct *vma) +{ + vma->vm_mm->call_dl_resolve = 0UL; +} + +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf) +{ + unsigned int *kaddr; + + vmf->page = alloc_page(GFP_HIGHUSER); + if (!vmf->page) + return VM_FAULT_OOM; + + kaddr = kmap(vmf->page); + memset(kaddr, 0, PAGE_SIZE); + kaddr[0] = 0x9DE3BFA8U; /* save */ + flush_dcache_page(vmf->page); + kunmap(vmf->page); + return VM_FAULT_MAJOR; +} + +static const struct vm_operations_struct pax_vm_ops = { + .close = pax_emuplt_close, + .fault = pax_emuplt_fault +}; + +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr) +{ + int ret; + + INIT_LIST_HEAD(&vma->anon_vma_chain); + vma->vm_mm = current->mm; + vma->vm_start = addr; + vma->vm_end = addr + PAGE_SIZE; + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC; + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); + vma->vm_ops = &pax_vm_ops; + + ret = insert_vm_struct(current->mm, vma); + if (ret) + return ret; + + ++current->mm->total_vm; + return 0; +} +#endif + +/* + * PaX: decide what to do with offenders (regs->tpc = fault address) + * + * returns 1 when task should be killed + * 2 when patched PLT trampoline was detected + * 3 when unpatched PLT trampoline was detected + */ +static int pax_handle_fetch_fault(struct pt_regs *regs) +{ + +#ifdef CONFIG_PAX_EMUPLT + int err; + + do { /* PaX: patched PLT emulation #1 */ + unsigned int sethi1, sethi2, jmpl; + + err = get_user(sethi1, (unsigned int *)regs->tpc); + err |= get_user(sethi2, (unsigned int *)(regs->tpc+4)); + err |= get_user(jmpl, (unsigned int *)(regs->tpc+8)); + + if (err) + break; + + if ((sethi1 & 0xFFC00000U) == 0x03000000U && + (sethi2 & 0xFFC00000U) == 0x03000000U && + (jmpl & 0xFFFFE000U) == 0x81C06000U) + { + unsigned long addr; + + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10; + addr = regs->u_regs[UREG_G1]; + addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL); + + if (test_thread_flag(TIF_32BIT)) + addr &= 0xFFFFFFFFUL; + + regs->tpc = addr; + regs->tnpc = addr+4; + return 2; + } + } while (0); + + { /* PaX: patched PLT emulation #2 */ + unsigned int ba; + + err = get_user(ba, (unsigned int *)regs->tpc); + + if (!err && (ba & 0xFFC00000U) == 0x30800000U) { + unsigned long addr; + + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2); + + if (test_thread_flag(TIF_32BIT)) + addr &= 0xFFFFFFFFUL; + + regs->tpc = addr; + regs->tnpc = addr+4; + return 2; + } + } + + do { /* PaX: patched PLT emulation #3 */ + unsigned int sethi, jmpl, nop; + + err = get_user(sethi, (unsigned int *)regs->tpc); + err |= get_user(jmpl, (unsigned int *)(regs->tpc+4)); + err |= get_user(nop, (unsigned int *)(regs->tpc+8)); + + if (err) + break; + + if ((sethi & 0xFFC00000U) == 0x03000000U && + (jmpl & 0xFFFFE000U) == 0x81C06000U && + nop == 0x01000000U) + { + unsigned long addr; + + addr = (sethi & 0x003FFFFFU) << 10; + regs->u_regs[UREG_G1] = addr; + addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL); + + if (test_thread_flag(TIF_32BIT)) + addr &= 0xFFFFFFFFUL; + + regs->tpc = addr; + regs->tnpc = addr+4; + return 2; + } + } while (0); + + do { /* PaX: patched PLT emulation #4 */ + unsigned int sethi, mov1, call, mov2; + + err = get_user(sethi, (unsigned int *)regs->tpc); + err |= get_user(mov1, (unsigned int *)(regs->tpc+4)); + err |= get_user(call, (unsigned int *)(regs->tpc+8)); + err |= get_user(mov2, (unsigned int *)(regs->tpc+12)); + + if (err) + break; + + if ((sethi & 0xFFC00000U) == 0x03000000U && + mov1 == 0x8210000FU && + (call & 0xC0000000U) == 0x40000000U && + mov2 == 0x9E100001U) + { + unsigned long addr; + + regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC]; + addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2); + + if (test_thread_flag(TIF_32BIT)) + addr &= 0xFFFFFFFFUL; + + regs->tpc = addr; + regs->tnpc = addr+4; + return 2; + } + } while (0); + + do { /* PaX: patched PLT emulation #5 */ + unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop; + + err = get_user(sethi, (unsigned int *)regs->tpc); + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4)); + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8)); + err |= get_user(or1, (unsigned int *)(regs->tpc+12)); + err |= get_user(or2, (unsigned int *)(regs->tpc+16)); + err |= get_user(sllx, (unsigned int *)(regs->tpc+20)); + err |= get_user(jmpl, (unsigned int *)(regs->tpc+24)); + err |= get_user(nop, (unsigned int *)(regs->tpc+28)); + + if (err) + break; + + if ((sethi & 0xFFC00000U) == 0x03000000U && + (sethi1 & 0xFFC00000U) == 0x03000000U && + (sethi2 & 0xFFC00000U) == 0x0B000000U && + (or1 & 0xFFFFE000U) == 0x82106000U && + (or2 & 0xFFFFE000U) == 0x8A116000U && + sllx == 0x83287020U && + jmpl == 0x81C04005U && + nop == 0x01000000U) + { + unsigned long addr; + + regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU); + regs->u_regs[UREG_G1] <<= 32; + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU); + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5]; + regs->tpc = addr; + regs->tnpc = addr+4; + return 2; + } + } while (0); + + do { /* PaX: patched PLT emulation #6 */ + unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop; + + err = get_user(sethi, (unsigned int *)regs->tpc); + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4)); + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8)); + err |= get_user(sllx, (unsigned int *)(regs->tpc+12)); + err |= get_user(or, (unsigned int *)(regs->tpc+16)); + err |= get_user(jmpl, (unsigned int *)(regs->tpc+20)); + err |= get_user(nop, (unsigned int *)(regs->tpc+24)); + + if (err) + break; + + if ((sethi & 0xFFC00000U) == 0x03000000U && + (sethi1 & 0xFFC00000U) == 0x03000000U && + (sethi2 & 0xFFC00000U) == 0x0B000000U && + sllx == 0x83287020U && + (or & 0xFFFFE000U) == 0x8A116000U && + jmpl == 0x81C04005U && + nop == 0x01000000U) + { + unsigned long addr; + + regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10; + regs->u_regs[UREG_G1] <<= 32; + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU); + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5]; + regs->tpc = addr; + regs->tnpc = addr+4; + return 2; + } + } while (0); + + do { /* PaX: unpatched PLT emulation step 1 */ + unsigned int sethi, ba, nop; + + err = get_user(sethi, (unsigned int *)regs->tpc); + err |= get_user(ba, (unsigned int *)(regs->tpc+4)); + err |= get_user(nop, (unsigned int *)(regs->tpc+8)); + + if (err) + break; + + if ((sethi & 0xFFC00000U) == 0x03000000U && + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) && + nop == 0x01000000U) + { + unsigned long addr; + unsigned int save, call; + unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl; + + if ((ba & 0xFFC00000U) == 0x30800000U) + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2); + else + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2); + + if (test_thread_flag(TIF_32BIT)) + addr &= 0xFFFFFFFFUL; + + err = get_user(save, (unsigned int *)addr); + err |= get_user(call, (unsigned int *)(addr+4)); + err |= get_user(nop, (unsigned int *)(addr+8)); + if (err) + break; + +#ifdef CONFIG_PAX_DLRESOLVE + if (save == 0x9DE3BFA8U && + (call & 0xC0000000U) == 0x40000000U && + nop == 0x01000000U) + { + struct vm_area_struct *vma; + unsigned long call_dl_resolve; + + down_read(¤t->mm->mmap_sem); + call_dl_resolve = current->mm->call_dl_resolve; + up_read(¤t->mm->mmap_sem); + if (likely(call_dl_resolve)) + goto emulate; + + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); + + down_write(¤t->mm->mmap_sem); + if (current->mm->call_dl_resolve) { + call_dl_resolve = current->mm->call_dl_resolve; + up_write(¤t->mm->mmap_sem); + if (vma) + kmem_cache_free(vm_area_cachep, vma); + goto emulate; + } + + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE); + if (!vma || (call_dl_resolve & ~PAGE_MASK)) { + up_write(¤t->mm->mmap_sem); + if (vma) + kmem_cache_free(vm_area_cachep, vma); + return 1; + } + + if (pax_insert_vma(vma, call_dl_resolve)) { + up_write(¤t->mm->mmap_sem); + kmem_cache_free(vm_area_cachep, vma); + return 1; + } + + current->mm->call_dl_resolve = call_dl_resolve; + up_write(¤t->mm->mmap_sem); + +emulate: + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10; + regs->tpc = call_dl_resolve; + regs->tnpc = addr+4; + return 3; + } +#endif + + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */ + if ((save & 0xFFC00000U) == 0x05000000U && + (call & 0xFFFFE000U) == 0x85C0A000U && + nop == 0x01000000U) + { + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10; + regs->u_regs[UREG_G2] = addr + 4; + addr = (save & 0x003FFFFFU) << 10; + addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL); + + if (test_thread_flag(TIF_32BIT)) + addr &= 0xFFFFFFFFUL; + + regs->tpc = addr; + regs->tnpc = addr+4; + return 3; + } + + /* PaX: 64-bit PLT stub */ + err = get_user(sethi1, (unsigned int *)addr); + err |= get_user(sethi2, (unsigned int *)(addr+4)); + err |= get_user(or1, (unsigned int *)(addr+8)); + err |= get_user(or2, (unsigned int *)(addr+12)); + err |= get_user(sllx, (unsigned int *)(addr+16)); + err |= get_user(add, (unsigned int *)(addr+20)); + err |= get_user(jmpl, (unsigned int *)(addr+24)); + err |= get_user(nop, (unsigned int *)(addr+28)); + if (err) + break; + + if ((sethi1 & 0xFFC00000U) == 0x09000000U && + (sethi2 & 0xFFC00000U) == 0x0B000000U && + (or1 & 0xFFFFE000U) == 0x88112000U && + (or2 & 0xFFFFE000U) == 0x8A116000U && + sllx == 0x89293020U && + add == 0x8A010005U && + jmpl == 0x89C14000U && + nop == 0x01000000U) + { + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10; + regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU); + regs->u_regs[UREG_G4] <<= 32; + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU); + regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4]; + regs->u_regs[UREG_G4] = addr + 24; + addr = regs->u_regs[UREG_G5]; + regs->tpc = addr; + regs->tnpc = addr+4; + return 3; + } + } + } while (0); + +#ifdef CONFIG_PAX_DLRESOLVE + do { /* PaX: unpatched PLT emulation step 2 */ + unsigned int save, call, nop; + + err = get_user(save, (unsigned int *)(regs->tpc-4)); + err |= get_user(call, (unsigned int *)regs->tpc); + err |= get_user(nop, (unsigned int *)(regs->tpc+4)); + if (err) + break; + + if (save == 0x9DE3BFA8U && + (call & 0xC0000000U) == 0x40000000U && + nop == 0x01000000U) + { + unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2); + + if (test_thread_flag(TIF_32BIT)) + dl_resolve &= 0xFFFFFFFFUL; + + regs->u_regs[UREG_RETPC] = regs->tpc; + regs->tpc = dl_resolve; + regs->tnpc = dl_resolve+4; + return 3; + } + } while (0); +#endif + + do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */ + unsigned int sethi, ba, nop; + + err = get_user(sethi, (unsigned int *)regs->tpc); + err |= get_user(ba, (unsigned int *)(regs->tpc+4)); + err |= get_user(nop, (unsigned int *)(regs->tpc+8)); + + if (err) + break; + + if ((sethi & 0xFFC00000U) == 0x03000000U && + (ba & 0xFFF00000U) == 0x30600000U && + nop == 0x01000000U) + { + unsigned long addr; + + addr = (sethi & 0x003FFFFFU) << 10; + regs->u_regs[UREG_G1] = addr; + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2); + + if (test_thread_flag(TIF_32BIT)) + addr &= 0xFFFFFFFFUL; + + regs->tpc = addr; + regs->tnpc = addr+4; + return 2; + } + } while (0); + +#endif + + return 1; +} + +void pax_report_insns(void *pc, void *sp) +{ + unsigned long i; + + printk(KERN_ERR "PAX: bytes at PC: "); + for (i = 0; i < 8; i++) { + unsigned int c; + if (get_user(c, (unsigned int *)pc+i)) + printk(KERN_CONT "???????? "); + else + printk(KERN_CONT "%08x ", c); + } + printk("\n"); +} +#endif + asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) { struct mm_struct *mm = current->mm; @@ -340,6 +794,29 @@ if (!vma) goto bad_area; +#ifdef CONFIG_PAX_PAGEEXEC + /* PaX: detect ITLB misses on non-exec pages */ + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address && + !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB)) + { + if (address != regs->tpc) + goto good_area; + + up_read(&mm->mmap_sem); + switch (pax_handle_fetch_fault(regs)) { + +#ifdef CONFIG_PAX_EMUPLT + case 2: + case 3: + return; +#endif + + } + pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS)); + do_group_exit(SIGKILL); + } +#endif + /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the diff -uriN linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/mm/hugetlbpage.c --- linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/mm/hugetlbpage.c 2011-05-01 17:02:10.000000000 -0500 @@ -68,7 +68,7 @@ } return -ENOMEM; } - if (likely(!vma || addr + len <= vma->vm_start)) { + if (likely(check_heap_stack_gap(vma, addr, len))) { /* * Remember the place where we stopped the search: */ @@ -107,7 +107,7 @@ /* make sure it can fit in the remaining address space */ if (likely(addr > len)) { vma = find_vma(mm, addr-len); - if (!vma || addr <= vma->vm_start) { + if (check_heap_stack_gap(vma, addr - len, len)) { /* remember the address as a hint for next time */ return (mm->free_area_cache = addr-len); } @@ -116,16 +116,17 @@ if (unlikely(mm->mmap_base < len)) goto bottomup; - addr = (mm->mmap_base-len) & HPAGE_MASK; + addr = mm->mmap_base - len; do { + addr &= HPAGE_MASK; /* * Lookup failure means no vma is above this address, * else if new region fits below vma->vm_start, * return with success: */ vma = find_vma(mm, addr); - if (likely(!vma || addr+len <= vma->vm_start)) { + if (likely(check_heap_stack_gap(vma, addr, len))) { /* remember the address as a hint for next time */ return (mm->free_area_cache = addr); } @@ -135,8 +136,8 @@ mm->cached_hole_size = vma->vm_start - addr; /* try just below the current vma->vm_start */ - addr = (vma->vm_start-len) & HPAGE_MASK; - } while (likely(len < vma->vm_start)); + addr = skip_heap_stack_gap(vma, len); + } while (!IS_ERR_VALUE(addr)); bottomup: /* @@ -182,8 +183,7 @@ if (addr) { addr = ALIGN(addr, HPAGE_SIZE); vma = find_vma(mm, addr); - if (task_size - len >= addr && - (!vma || addr + len <= vma->vm_start)) + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len)) return addr; } if (mm->get_unmapped_area == arch_get_unmapped_area) diff -uriN linux-2.6.38.4/arch/sparc/mm/init_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/mm/init_32.c --- linux-2.6.38.4/arch/sparc/mm/init_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/mm/init_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -318,6 +318,9 @@ pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); +pgprot_t PAGE_SHARED_NOEXEC __read_mostly; +EXPORT_SYMBOL(PAGE_SHARED_NOEXEC); + void __init paging_init(void) { switch(sparc_cpu_model) { @@ -346,17 +349,17 @@ /* Initialize the protection map with non-constant, MMU dependent values. */ protection_map[0] = PAGE_NONE; - protection_map[1] = PAGE_READONLY; - protection_map[2] = PAGE_COPY; - protection_map[3] = PAGE_COPY; + protection_map[1] = PAGE_READONLY_NOEXEC; + protection_map[2] = PAGE_COPY_NOEXEC; + protection_map[3] = PAGE_COPY_NOEXEC; protection_map[4] = PAGE_READONLY; protection_map[5] = PAGE_READONLY; protection_map[6] = PAGE_COPY; protection_map[7] = PAGE_COPY; protection_map[8] = PAGE_NONE; - protection_map[9] = PAGE_READONLY; - protection_map[10] = PAGE_SHARED; - protection_map[11] = PAGE_SHARED; + protection_map[9] = PAGE_READONLY_NOEXEC; + protection_map[10] = PAGE_SHARED_NOEXEC; + protection_map[11] = PAGE_SHARED_NOEXEC; protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; diff -uriN linux-2.6.38.4/arch/sparc/mm/Makefile linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/mm/Makefile --- linux-2.6.38.4/arch/sparc/mm/Makefile 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/mm/Makefile 2011-05-01 17:02:10.000000000 -0500 @@ -2,7 +2,7 @@ # asflags-y := -ansi -ccflags-y := -Werror +#ccflags-y := -Werror obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o obj-y += fault_$(BITS).o diff -uriN linux-2.6.38.4/arch/sparc/mm/srmmu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/mm/srmmu.c --- linux-2.6.38.4/arch/sparc/mm/srmmu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/sparc/mm/srmmu.c 2011-05-01 17:02:10.000000000 -0500 @@ -2200,6 +2200,13 @@ PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY)); + +#ifdef CONFIG_PAX_PAGEEXEC + PAGE_SHARED_NOEXEC = pgprot_val(SRMMU_PAGE_SHARED_NOEXEC); + BTFIXUPSET_INT(page_copy_noexec, pgprot_val(SRMMU_PAGE_COPY_NOEXEC)); + BTFIXUPSET_INT(page_readonly_noexec, pgprot_val(SRMMU_PAGE_RDONLY_NOEXEC)); +#endif + BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); diff -uriN linux-2.6.38.4/arch/um/include/asm/kmap_types.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/include/asm/kmap_types.h --- linux-2.6.38.4/arch/um/include/asm/kmap_types.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/include/asm/kmap_types.h 2011-05-01 17:02:10.000000000 -0500 @@ -23,6 +23,7 @@ KM_IRQ1, KM_SOFTIRQ0, KM_SOFTIRQ1, + KM_CLEARPAGE, KM_TYPE_NR }; diff -uriN linux-2.6.38.4/arch/um/include/asm/page.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/include/asm/page.h --- linux-2.6.38.4/arch/um/include/asm/page.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/include/asm/page.h 2011-05-01 17:02:10.000000000 -0500 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) +#define ktla_ktva(addr) (addr) +#define ktva_ktla(addr) (addr) + #ifndef __ASSEMBLY__ struct page; diff -uriN linux-2.6.38.4/arch/um/include/asm/tlb.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/include/asm/tlb.h --- linux-2.6.38.4/arch/um/include/asm/tlb.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/include/asm/tlb.h 2011-05-01 17:01:51.000000000 -0500 @@ -3,6 +3,7 @@ #include #include +#include #include #include #include diff -uriN linux-2.6.38.4/arch/um/include/shared/kern_constants.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/include/shared/kern_constants.h --- linux-2.6.38.4/arch/um/include/shared/kern_constants.h 1969-12-31 18:00:00.000000000 -0600 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/include/shared/kern_constants.h 2011-05-01 17:01:51.000000000 -0500 @@ -0,0 +1 @@ +#include "../../../../include/generated/asm-offsets.h" diff -uriN linux-2.6.38.4/arch/um/include/shared/user_constants.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/include/shared/user_constants.h --- linux-2.6.38.4/arch/um/include/shared/user_constants.h 1969-12-31 18:00:00.000000000 -0600 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/include/shared/user_constants.h 2011-05-01 17:01:51.000000000 -0500 @@ -0,0 +1,40 @@ +/* + * DO NOT MODIFY. + * + * This file was generated by arch/um/Makefile + * + */ + +#define HOST_SC_CR2 176 /* offsetof(struct sigcontext, cr2) # */ +#define HOST_SC_ERR 152 /* offsetof(struct sigcontext, err) # */ +#define HOST_SC_TRAPNO 160 /* offsetof(struct sigcontext, trapno) # */ +#define HOST_FP_SIZE 64 /* sizeof(struct _fpstate) / sizeof(unsigned long) # */ +#define HOST_RBX 5 /* RBX # */ +#define HOST_RCX 11 /* RCX # */ +#define HOST_RDI 14 /* RDI # */ +#define HOST_RSI 13 /* RSI # */ +#define HOST_RDX 12 /* RDX # */ +#define HOST_RBP 4 /* RBP # */ +#define HOST_RAX 10 /* RAX # */ +#define HOST_R8 9 /* R8 # */ +#define HOST_R9 8 /* R9 # */ +#define HOST_R10 7 /* R10 # */ +#define HOST_R11 6 /* R11 # */ +#define HOST_R12 3 /* R12 # */ +#define HOST_R13 2 /* R13 # */ +#define HOST_R14 1 /* R14 # */ +#define HOST_R15 0 /* R15 # */ +#define HOST_ORIG_RAX 15 /* ORIG_RAX # */ +#define HOST_CS 17 /* CS # */ +#define HOST_SS 20 /* SS # */ +#define HOST_EFLAGS 18 /* EFLAGS # */ +#define HOST_IP 16 /* RIP # */ +#define HOST_SP 19 /* RSP # */ +#define UM_FRAME_SIZE 216 /* sizeof(struct user_regs_struct) # */ +#define UM_POLLIN 1 /* POLLIN # */ +#define UM_POLLPRI 2 /* POLLPRI # */ +#define UM_POLLOUT 4 /* POLLOUT # */ +#define UM_PROT_READ 1 /* PROT_READ # */ +#define UM_PROT_WRITE 2 /* PROT_WRITE # */ +#define UM_PROT_EXEC 4 /* PROT_EXEC # */ + diff -uriN linux-2.6.38.4/arch/um/Kconfig.rest linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/Kconfig.rest --- linux-2.6.38.4/arch/um/Kconfig.rest 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/Kconfig.rest 2011-05-01 17:01:51.000000000 -0500 @@ -18,6 +18,8 @@ source "fs/Kconfig" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/um/kernel/process.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/kernel/process.c --- linux-2.6.38.4/arch/um/kernel/process.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/kernel/process.c 2011-05-01 17:02:10.000000000 -0500 @@ -404,22 +404,6 @@ return 2; } -/* - * Only x86 and x86_64 have an arch_align_stack(). - * All other arches have "#define arch_align_stack(x) (x)" - * in their asm/system.h - * As this is included in UML from asm-um/system-generic.h, - * we can use it to behave as the subarch does. - */ -#ifndef arch_align_stack -unsigned long arch_align_stack(unsigned long sp) -{ - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) - sp -= get_random_int() % 8192; - return sp & ~0xf; -} -#endif - unsigned long get_wchan(struct task_struct *p) { unsigned long stack_page, sp, ip; diff -uriN linux-2.6.38.4/arch/um/sys-i386/syscalls.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/sys-i386/syscalls.c --- linux-2.6.38.4/arch/um/sys-i386/syscalls.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/um/sys-i386/syscalls.c 2011-05-01 17:02:10.000000000 -0500 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags) +{ + unsigned long pax_task_size = TASK_SIZE; + +#ifdef CONFIG_PAX_SEGMEXEC + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) + pax_task_size = SEGMEXEC_TASK_SIZE; +#endif + + if (len > pax_task_size || addr > pax_task_size - len) + return -EINVAL; + + return 0; +} + /* * The prototype on i386 is: * diff -uriN linux-2.6.38.4/arch/x86/boot/bitops.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/bitops.h --- linux-2.6.38.4/arch/x86/boot/bitops.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/bitops.h 2011-05-01 17:02:10.000000000 -0500 @@ -26,7 +26,7 @@ u8 v; const u32 *p = (const u32 *)addr; - asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr)); + asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr)); return v; } @@ -37,7 +37,7 @@ static inline void set_bit(int nr, void *addr) { - asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr)); + asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr)); } #endif /* BOOT_BITOPS_H */ diff -uriN linux-2.6.38.4/arch/x86/boot/boot.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/boot.h --- linux-2.6.38.4/arch/x86/boot/boot.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/boot.h 2011-05-01 17:02:10.000000000 -0500 @@ -85,7 +85,7 @@ static inline u16 ds(void) { u16 seg; - asm("movw %%ds,%0" : "=rm" (seg)); + asm volatile("movw %%ds,%0" : "=rm" (seg)); return seg; } @@ -181,7 +181,7 @@ static inline int memcmp(const void *s1, const void *s2, size_t len) { u8 diff; - asm("repe; cmpsb; setnz %0" + asm volatile("repe; cmpsb; setnz %0" : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } diff -uriN linux-2.6.38.4/arch/x86/boot/compressed/head_32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/compressed/head_32.S --- linux-2.6.38.4/arch/x86/boot/compressed/head_32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/compressed/head_32.S 2011-05-01 17:02:10.000000000 -0500 @@ -76,7 +76,7 @@ notl %eax andl %eax, %ebx #else - movl $LOAD_PHYSICAL_ADDR, %ebx + movl $____LOAD_PHYSICAL_ADDR, %ebx #endif /* Target address to relocate to for decompression */ @@ -162,7 +162,7 @@ * and where it was actually loaded. */ movl %ebp, %ebx - subl $LOAD_PHYSICAL_ADDR, %ebx + subl $____LOAD_PHYSICAL_ADDR, %ebx jz 2f /* Nothing to be done if loaded at compiled addr. */ /* * Process relocations. @@ -170,8 +170,7 @@ 1: subl $4, %edi movl (%edi), %ecx - testl %ecx, %ecx - jz 2f + jecxz 2f addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: diff -uriN linux-2.6.38.4/arch/x86/boot/compressed/head_64.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/compressed/head_64.S --- linux-2.6.38.4/arch/x86/boot/compressed/head_64.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/compressed/head_64.S 2011-05-01 17:02:10.000000000 -0500 @@ -91,7 +91,7 @@ notl %eax andl %eax, %ebx #else - movl $LOAD_PHYSICAL_ADDR, %ebx + movl $____LOAD_PHYSICAL_ADDR, %ebx #endif /* Target address to relocate to for decompression */ @@ -233,7 +233,7 @@ notq %rax andq %rax, %rbp #else - movq $LOAD_PHYSICAL_ADDR, %rbp + movq $____LOAD_PHYSICAL_ADDR, %rbp #endif /* Target address to relocate to for decompression */ diff -uriN linux-2.6.38.4/arch/x86/boot/compressed/misc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/compressed/misc.c --- linux-2.6.38.4/arch/x86/boot/compressed/misc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/compressed/misc.c 2011-05-01 17:02:10.000000000 -0500 @@ -310,7 +310,7 @@ case PT_LOAD: #ifdef CONFIG_RELOCATABLE dest = output; - dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR); + dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR); #else dest = (void *)(phdr->p_paddr); #endif @@ -363,7 +363,7 @@ error("Destination address too large"); #endif #ifndef CONFIG_RELOCATABLE - if ((unsigned long)output != LOAD_PHYSICAL_ADDR) + if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR) error("Wrong destination address"); #endif diff -uriN linux-2.6.38.4/arch/x86/boot/compressed/relocs.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/compressed/relocs.c --- linux-2.6.38.4/arch/x86/boot/compressed/relocs.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/compressed/relocs.c 2011-05-01 17:02:10.000000000 -0500 @@ -13,8 +13,11 @@ static void die(char *fmt, ...); +#include "../../../../include/generated/autoconf.h" + #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) static Elf32_Ehdr ehdr; +static Elf32_Phdr *phdr; static unsigned long reloc_count, reloc_idx; static unsigned long *relocs; @@ -270,9 +273,39 @@ } } +static void read_phdrs(FILE *fp) +{ + unsigned int i; + + phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr)); + if (!phdr) { + die("Unable to allocate %d program headers\n", + ehdr.e_phnum); + } + if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) { + die("Seek to %d failed: %s\n", + ehdr.e_phoff, strerror(errno)); + } + if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) { + die("Cannot read ELF program headers: %s\n", + strerror(errno)); + } + for(i = 0; i < ehdr.e_phnum; i++) { + phdr[i].p_type = elf32_to_cpu(phdr[i].p_type); + phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset); + phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr); + phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr); + phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz); + phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz); + phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags); + phdr[i].p_align = elf32_to_cpu(phdr[i].p_align); + } + +} + static void read_shdrs(FILE *fp) { - int i; + unsigned int i; Elf32_Shdr shdr; secs = calloc(ehdr.e_shnum, sizeof(struct section)); @@ -307,7 +340,7 @@ static void read_strtabs(FILE *fp) { - int i; + unsigned int i; for (i = 0; i < ehdr.e_shnum; i++) { struct section *sec = &secs[i]; if (sec->shdr.sh_type != SHT_STRTAB) { @@ -332,7 +365,7 @@ static void read_symtabs(FILE *fp) { - int i,j; + unsigned int i,j; for (i = 0; i < ehdr.e_shnum; i++) { struct section *sec = &secs[i]; if (sec->shdr.sh_type != SHT_SYMTAB) { @@ -365,7 +398,9 @@ static void read_relocs(FILE *fp) { - int i,j; + unsigned int i,j; + uint32_t base; + for (i = 0; i < ehdr.e_shnum; i++) { struct section *sec = &secs[i]; if (sec->shdr.sh_type != SHT_REL) { @@ -385,9 +420,18 @@ die("Cannot read symbol table: %s\n", strerror(errno)); } + base = 0; + for (j = 0; j < ehdr.e_phnum; j++) { + if (phdr[j].p_type != PT_LOAD ) + continue; + if (secs[sec->shdr.sh_info].shdr.sh_offset < phdr[j].p_offset || secs[sec->shdr.sh_info].shdr.sh_offset >= phdr[j].p_offset + phdr[j].p_filesz) + continue; + base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr; + break; + } for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) { Elf32_Rel *rel = &sec->reltab[j]; - rel->r_offset = elf32_to_cpu(rel->r_offset); + rel->r_offset = elf32_to_cpu(rel->r_offset) + base; rel->r_info = elf32_to_cpu(rel->r_info); } } @@ -396,14 +440,14 @@ static void print_absolute_symbols(void) { - int i; + unsigned int i; printf("Absolute symbols\n"); printf(" Num: Value Size Type Bind Visibility Name\n"); for (i = 0; i < ehdr.e_shnum; i++) { struct section *sec = &secs[i]; char *sym_strtab; Elf32_Sym *sh_symtab; - int j; + unsigned int j; if (sec->shdr.sh_type != SHT_SYMTAB) { continue; @@ -431,14 +475,14 @@ static void print_absolute_relocs(void) { - int i, printed = 0; + unsigned int i, printed = 0; for (i = 0; i < ehdr.e_shnum; i++) { struct section *sec = &secs[i]; struct section *sec_applies, *sec_symtab; char *sym_strtab; Elf32_Sym *sh_symtab; - int j; + unsigned int j; if (sec->shdr.sh_type != SHT_REL) { continue; } @@ -499,13 +543,13 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym)) { - int i; + unsigned int i; /* Walk through the relocations */ for (i = 0; i < ehdr.e_shnum; i++) { char *sym_strtab; Elf32_Sym *sh_symtab; struct section *sec_applies, *sec_symtab; - int j; + unsigned int j; struct section *sec = &secs[i]; if (sec->shdr.sh_type != SHT_REL) { @@ -530,6 +574,22 @@ !is_rel_reloc(sym_name(sym_strtab, sym))) { continue; } + /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */ + if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load")) + continue; + +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32) + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */ + if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext")) + continue; + if (!strcmp(sec_name(sym->st_shndx), ".init.text")) + continue; + if (!strcmp(sec_name(sym->st_shndx), ".exit.text")) + continue; + if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR")) + continue; +#endif + switch (r_type) { case R_386_NONE: case R_386_PC32: @@ -571,7 +631,7 @@ static void emit_relocs(int as_text) { - int i; + unsigned int i; /* Count how many relocations I have and allocate space for them. */ reloc_count = 0; walk_relocs(count_reloc); @@ -665,6 +725,7 @@ fname, strerror(errno)); } read_ehdr(fp); + read_phdrs(fp); read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); diff -uriN linux-2.6.38.4/arch/x86/boot/cpucheck.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/cpucheck.c --- linux-2.6.38.4/arch/x86/boot/cpucheck.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/cpucheck.c 2011-05-01 17:02:10.000000000 -0500 @@ -74,7 +74,7 @@ u16 fcw = -1, fsw = -1; u32 cr0; - asm("movl %%cr0,%0" : "=r" (cr0)); + asm volatile("movl %%cr0,%0" : "=r" (cr0)); if (cr0 & (X86_CR0_EM|X86_CR0_TS)) { cr0 &= ~(X86_CR0_EM|X86_CR0_TS); asm volatile("movl %0,%%cr0" : : "r" (cr0)); @@ -90,7 +90,7 @@ { u32 f0, f1; - asm("pushfl ; " + asm volatile("pushfl ; " "pushfl ; " "popl %0 ; " "movl %0,%1 ; " @@ -115,7 +115,7 @@ set_bit(X86_FEATURE_FPU, cpu.flags); if (has_eflag(X86_EFLAGS_ID)) { - asm("cpuid" + asm volatile("cpuid" : "=a" (max_intel_level), "=b" (cpu_vendor[0]), "=d" (cpu_vendor[1]), @@ -124,7 +124,7 @@ if (max_intel_level >= 0x00000001 && max_intel_level <= 0x0000ffff) { - asm("cpuid" + asm volatile("cpuid" : "=a" (tfms), "=c" (cpu.flags[4]), "=d" (cpu.flags[0]) @@ -136,7 +136,7 @@ cpu.model += ((tfms >> 16) & 0xf) << 4; } - asm("cpuid" + asm volatile("cpuid" : "=a" (max_amd_level) : "a" (0x80000000) : "ebx", "ecx", "edx"); @@ -144,7 +144,7 @@ if (max_amd_level >= 0x80000001 && max_amd_level <= 0x8000ffff) { u32 eax = 0x80000001; - asm("cpuid" + asm volatile("cpuid" : "+a" (eax), "=c" (cpu.flags[6]), "=d" (cpu.flags[1]) @@ -203,9 +203,9 @@ u32 ecx = MSR_K7_HWCR; u32 eax, edx; - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx)); + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx)); eax &= ~(1 << 15); - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx)); + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx)); get_flags(); /* Make sure it really did something */ err = check_flags(); @@ -218,9 +218,9 @@ u32 ecx = MSR_VIA_FCR; u32 eax, edx; - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx)); + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx)); eax |= (1<<1)|(1<<7); - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx)); + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx)); set_bit(X86_FEATURE_CX8, cpu.flags); err = check_flags(); @@ -231,12 +231,12 @@ u32 eax, edx; u32 level = 1; - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx)); - asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx)); - asm("cpuid" + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx)); + asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx)); + asm volatile("cpuid" : "+a" (level), "=d" (cpu.flags[0]) : : "ecx", "ebx"); - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx)); + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx)); err = check_flags(); } diff -uriN linux-2.6.38.4/arch/x86/boot/header.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/header.S --- linux-2.6.38.4/arch/x86/boot/header.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/header.S 2011-05-01 17:02:10.000000000 -0500 @@ -224,7 +224,7 @@ # single linked list of # struct setup_data -pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr +pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) #define VO_INIT_SIZE (VO__end - VO__text) diff -uriN linux-2.6.38.4/arch/x86/boot/memory.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/memory.c --- linux-2.6.38.4/arch/x86/boot/memory.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/memory.c 2011-05-01 17:02:10.000000000 -0500 @@ -19,7 +19,7 @@ static int detect_memory_e820(void) { - int count = 0; + unsigned int count = 0; struct biosregs ireg, oreg; struct e820entry *desc = boot_params.e820_map; static struct e820entry buf; /* static so it is zeroed */ diff -uriN linux-2.6.38.4/arch/x86/boot/video.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/video.c --- linux-2.6.38.4/arch/x86/boot/video.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/video.c 2011-05-01 17:02:10.000000000 -0500 @@ -96,7 +96,7 @@ static unsigned int get_entry(void) { char entry_buf[4]; - int i, len = 0; + unsigned int i, len = 0; int key; unsigned int v; diff -uriN linux-2.6.38.4/arch/x86/boot/video-vesa.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/video-vesa.c --- linux-2.6.38.4/arch/x86/boot/video-vesa.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/boot/video-vesa.c 2011-05-01 17:02:10.000000000 -0500 @@ -200,6 +200,7 @@ boot_params.screen_info.vesapm_seg = oreg.es; boot_params.screen_info.vesapm_off = oreg.di; + boot_params.screen_info.vesapm_size = oreg.cx; } /* diff -uriN linux-2.6.38.4/arch/x86/ia32/ia32_aout.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/ia32/ia32_aout.c --- linux-2.6.38.4/arch/x86/ia32/ia32_aout.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/ia32/ia32_aout.c 2011-05-01 17:02:10.000000000 -0500 @@ -162,6 +162,8 @@ unsigned long dump_start, dump_size; struct user32 dump; + memset(&dump, 0, sizeof(dump)); + fs = get_fs(); set_fs(KERNEL_DS); has_dumped = 1; diff -uriN linux-2.6.38.4/arch/x86/ia32/ia32entry.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/ia32/ia32entry.S --- linux-2.6.38.4/arch/x86/ia32/ia32entry.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/ia32/ia32entry.S 2011-05-01 17:02:10.000000000 -0500 @@ -13,6 +13,7 @@ #include #include #include +#include #include /* Avoid __ASSEMBLER__'ifying just for this. */ @@ -93,6 +94,23 @@ ENDPROC(native_irq_enable_sysexit) #endif + .macro pax_enter_kernel_user +#ifdef CONFIG_PAX_MEMORY_UDEREF + call pax_enter_kernel_user +#endif + .endm + + .macro pax_exit_kernel_user +#ifdef CONFIG_PAX_MEMORY_UDEREF + call pax_exit_kernel_user +#endif +#ifdef CONFIG_PAX_RANDKSTACK + push %rax + call pax_randomize_kstack + pop %rax +#endif + .endm + /* * 32bit SYSENTER instruction entry. * @@ -119,7 +137,7 @@ CFI_REGISTER rsp,rbp SWAPGS_UNSAFE_STACK movq PER_CPU_VAR(kernel_stack), %rsp - addq $(KERNEL_STACK_OFFSET),%rsp + pax_enter_kernel_user /* * No need to follow this irqs on/off section: the syscall * disabled irqs, here we enable it straight after entry: @@ -135,7 +153,8 @@ pushfq CFI_ADJUST_CFA_OFFSET 8 /*CFI_REL_OFFSET rflags,0*/ - movl 8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d + GET_THREAD_INFO(%r10) + movl TI_sysenter_return(%r10), %r10d CFI_REGISTER rip,r10 pushq $__USER32_CS CFI_ADJUST_CFA_OFFSET 8 @@ -150,6 +169,12 @@ SAVE_ARGS 0,0,1 /* no need to do an access_ok check here because rbp has been 32bit zero extended */ + +#ifdef CONFIG_PAX_MEMORY_UDEREF + mov $PAX_USER_SHADOW_BASE,%r10 + add %r10,%rbp +#endif + 1: movl (%rbp),%ebp .section __ex_table,"a" .quad 1b,ia32_badarg @@ -172,6 +197,7 @@ testl $_TIF_ALLWORK_MASK,TI_flags(%r10) jnz sysexit_audit sysexit_from_sys_call: + pax_exit_kernel_user andl $~TS_COMPAT,TI_status(%r10) /* clear IF, that popfq doesn't enable interrupts early */ andl $~0x200,EFLAGS-R11(%rsp) @@ -283,19 +309,24 @@ ENTRY(ia32_cstar_target) CFI_STARTPROC32 simple CFI_SIGNAL_FRAME - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET + CFI_DEF_CFA rsp,0 CFI_REGISTER rip,rcx /*CFI_REGISTER rflags,r11*/ SWAPGS_UNSAFE_STACK movl %esp,%r8d CFI_REGISTER rsp,r8 movq PER_CPU_VAR(kernel_stack),%rsp + +#ifdef CONFIG_PAX_MEMORY_UDEREF + pax_enter_kernel_user +#endif + /* * No need to follow this irqs on/off section: the syscall * disabled irqs and here we enable it straight after entry: */ ENABLE_INTERRUPTS(CLBR_NONE) - SAVE_ARGS 8,1,1 + SAVE_ARGS 8*6,1,1 movl %eax,%eax /* zero extension */ movq %rax,ORIG_RAX-ARGOFFSET(%rsp) movq %rcx,RIP-ARGOFFSET(%rsp) @@ -311,6 +342,12 @@ /* no need to do an access_ok check here because r8 has been 32bit zero extended */ /* hardware stack frame is complete now */ + +#ifdef CONFIG_PAX_MEMORY_UDEREF + mov $PAX_USER_SHADOW_BASE,%r10 + add %r10,%r8 +#endif + 1: movl (%r8),%r9d .section __ex_table,"a" .quad 1b,ia32_badarg @@ -323,7 +360,7 @@ cmpq $IA32_NR_syscalls-1,%rax ja ia32_badsys cstar_do_call: - IA32_ARG_FIXUP 1 + IA32_ARG_FIXUP 0 cstar_dispatch: call *ia32_sys_call_table(,%rax,8) movq %rax,RAX-ARGOFFSET(%rsp) @@ -333,6 +370,7 @@ testl $_TIF_ALLWORK_MASK,TI_flags(%r10) jnz sysretl_audit sysretl_from_sys_call: + pax_exit_kernel_user andl $~TS_COMPAT,TI_status(%r10) RESTORE_ARGS 1,-ARG_SKIP,1,1,1 movl RIP-ARGOFFSET(%rsp),%ecx @@ -415,6 +453,7 @@ CFI_REL_OFFSET rip,RIP-RIP PARAVIRT_ADJUST_EXCEPTION_FRAME SWAPGS + pax_enter_kernel_user /* * No need to follow this irqs on/off section: the syscall * disabled irqs and here we enable it straight after entry: @@ -783,7 +822,7 @@ .quad sys_tgkill /* 270 */ .quad compat_sys_utimes .quad sys32_fadvise64_64 - .quad quiet_ni_syscall /* sys_vserver */ + .quad sys32_vserver .quad sys_mbind .quad compat_sys_get_mempolicy /* 275 */ .quad sys_set_mempolicy diff -uriN linux-2.6.38.4/arch/x86/ia32/ia32_signal.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/ia32/ia32_signal.c --- linux-2.6.38.4/arch/x86/ia32/ia32_signal.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/ia32/ia32_signal.c 2011-05-01 17:02:10.000000000 -0500 @@ -403,7 +403,7 @@ sp -= frame_size; /* Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) == 0. */ - sp = ((sp + 4) & -16ul) - 4; + sp = ((sp - 12) & -16ul) - 4; return (void __user *) sp; } @@ -461,7 +461,7 @@ * These are actually not used anymore, but left because some * gdb versions depend on them as a marker. */ - put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); + put_user_ex(*((const u64 *)&code), (u64 *)frame->retcode); } put_user_catch(err); if (err) @@ -503,7 +503,7 @@ 0xb8, __NR_ia32_rt_sigreturn, 0x80cd, - 0, + 0 }; frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); @@ -533,16 +533,18 @@ if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; + else if (current->mm->context.vdso) + /* Return stub is in 32bit vsyscall page */ + restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); else - restorer = VDSO32_SYMBOL(current->mm->context.vdso, - rt_sigreturn); + restorer = &frame->retcode; put_user_ex(ptr_to_compat(restorer), &frame->pretcode); /* * Not actually used anymore, but left because some gdb * versions need it. */ - put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); + put_user_ex(*((const u64 *)&code), (u64 *)frame->retcode); } put_user_catch(err); if (err) diff -uriN linux-2.6.38.4/arch/x86/include/asm/alternative.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/alternative.h --- linux-2.6.38.4/arch/x86/include/asm/alternative.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/alternative.h 2011-05-01 17:02:10.000000000 -0500 @@ -94,7 +94,7 @@ ".section .discard,\"aw\",@progbits\n" \ " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \ ".previous\n" \ - ".section .altinstr_replacement, \"ax\"\n" \ + ".section .altinstr_replacement, \"a\"\n" \ "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" diff -uriN linux-2.6.38.4/arch/x86/include/asm/apm.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/apm.h --- linux-2.6.38.4/arch/x86/include/asm/apm.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/apm.h 2011-05-01 17:02:10.000000000 -0500 @@ -34,7 +34,7 @@ __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" "pushl %%ebp\n\t" - "lcall *%%cs:apm_bios_entry\n\t" + "lcall *%%ss:apm_bios_entry\n\t" "setc %%al\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" @@ -58,7 +58,7 @@ __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" "pushl %%ebp\n\t" - "lcall *%%cs:apm_bios_entry\n\t" + "lcall *%%ss:apm_bios_entry\n\t" "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" diff -uriN linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/atomic64_32.h --- linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/atomic64_32.h 2011-05-01 17:02:10.000000000 -0500 @@ -12,6 +12,14 @@ u64 __aligned(8) counter; } atomic64_t; +#ifdef CONFIG_PAX_REFCOUNT +typedef struct { + u64 __aligned(8) counter; +} atomic64_unchecked_t; +#else +typedef atomic64_t atomic64_unchecked_t; +#endif + #define ATOMIC64_INIT(val) { (val) } #ifdef CONFIG_X86_CMPXCHG64 diff -uriN linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/atomic64_64.h --- linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/atomic64_64.h 2011-05-01 17:02:10.000000000 -0500 @@ -18,7 +18,19 @@ */ static inline long atomic64_read(const atomic64_t *v) { - return (*(volatile long *)&(v)->counter); + return (*(volatile const long *)&(v)->counter); +} + +/** + * atomic64_read_unchecked - read atomic64 variable + * @v: pointer of type atomic64_unchecked_t + * + * Atomically reads the value of @v. + * Doesn't imply a read memory barrier. + */ +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v) +{ + return (*(volatile const long *)&(v)->counter); } /** @@ -34,6 +46,18 @@ } /** + * atomic64_set_unchecked - set atomic64 variable + * @v: pointer to type atomic64_unchecked_t + * @i: required value + * + * Atomically sets the value of @v to @i. + */ +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i) +{ + v->counter = i; +} + +/** * atomic64_add - add integer to atomic64 variable * @i: integer value to add * @v: pointer to type atomic64_t @@ -42,6 +66,28 @@ */ static inline void atomic64_add(long i, atomic64_t *v) { + asm volatile(LOCK_PREFIX "addq %1,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "subq %1,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "=m" (v->counter) + : "er" (i), "m" (v->counter)); +} + +/** + * atomic64_add_unchecked - add integer to atomic64 variable + * @i: integer value to add + * @v: pointer to type atomic64_unchecked_t + * + * Atomically adds @i to @v. + */ +static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v) +{ asm volatile(LOCK_PREFIX "addq %1,%0" : "=m" (v->counter) : "er" (i), "m" (v->counter)); @@ -56,7 +102,29 @@ */ static inline void atomic64_sub(long i, atomic64_t *v) { - asm volatile(LOCK_PREFIX "subq %1,%0" + asm volatile(LOCK_PREFIX "subq %1,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "addq %1,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "=m" (v->counter) + : "er" (i), "m" (v->counter)); +} + +/** + * atomic64_sub_unchecked - subtract the atomic64 variable + * @i: integer value to subtract + * @v: pointer to type atomic64_unchecked_t + * + * Atomically subtracts @i from @v. + */ +static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v) +{ + asm volatile(LOCK_PREFIX "subq %1,%0\n" : "=m" (v->counter) : "er" (i), "m" (v->counter)); } @@ -74,7 +142,16 @@ { unsigned char c; - asm volatile(LOCK_PREFIX "subq %2,%0; sete %1" + asm volatile(LOCK_PREFIX "subq %2,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "addq %2,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + "sete %1\n" : "=m" (v->counter), "=qm" (c) : "er" (i), "m" (v->counter) : "memory"); return c; @@ -88,6 +165,27 @@ */ static inline void atomic64_inc(atomic64_t *v) { + asm volatile(LOCK_PREFIX "incq %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "decq %0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "=m" (v->counter) + : "m" (v->counter)); +} + +/** + * atomic64_inc_unchecked - increment atomic64 variable + * @v: pointer to type atomic64_unchecked_t + * + * Atomically increments @v by 1. + */ +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v) +{ asm volatile(LOCK_PREFIX "incq %0" : "=m" (v->counter) : "m" (v->counter)); @@ -101,7 +199,28 @@ */ static inline void atomic64_dec(atomic64_t *v) { - asm volatile(LOCK_PREFIX "decq %0" + asm volatile(LOCK_PREFIX "decq %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "incq %0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "=m" (v->counter) + : "m" (v->counter)); +} + +/** + * atomic64_dec_unchecked - decrement atomic64 variable + * @v: pointer to type atomic64_t + * + * Atomically decrements @v by 1. + */ +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v) +{ + asm volatile(LOCK_PREFIX "decq %0\n" : "=m" (v->counter) : "m" (v->counter)); } @@ -118,7 +237,16 @@ { unsigned char c; - asm volatile(LOCK_PREFIX "decq %0; sete %1" + asm volatile(LOCK_PREFIX "decq %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "incq %0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + "sete %1\n" : "=m" (v->counter), "=qm" (c) : "m" (v->counter) : "memory"); return c != 0; @@ -136,7 +264,16 @@ { unsigned char c; - asm volatile(LOCK_PREFIX "incq %0; sete %1" + asm volatile(LOCK_PREFIX "incq %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "decq %0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + "sete %1\n" : "=m" (v->counter), "=qm" (c) : "m" (v->counter) : "memory"); return c != 0; @@ -155,7 +292,16 @@ { unsigned char c; - asm volatile(LOCK_PREFIX "addq %2,%0; sets %1" + asm volatile(LOCK_PREFIX "addq %2,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "subq %2,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + "sets %1\n" : "=m" (v->counter), "=qm" (c) : "er" (i), "m" (v->counter) : "memory"); return c; @@ -171,7 +317,31 @@ static inline long atomic64_add_return(long i, atomic64_t *v) { long __i = i; - asm volatile(LOCK_PREFIX "xaddq %0, %1;" + asm volatile(LOCK_PREFIX "xaddq %0, %1\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + "movq %0, %1\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "+r" (i), "+m" (v->counter) + : : "memory"); + return i + __i; +} + +/** + * atomic64_add_return_unchecked - add and return + * @i: integer value to add + * @v: pointer to type atomic64_unchecked_t + * + * Atomically adds @i to @v and returns @i + @v + */ +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v) +{ + long __i = i; + asm volatile(LOCK_PREFIX "xaddq %0, %1" : "+r" (i), "+m" (v->counter) : : "memory"); return i + __i; @@ -183,6 +353,10 @@ } #define atomic64_inc_return(v) (atomic64_add_return(1, (v))) +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v) +{ + return atomic64_add_return_unchecked(1, v); +} #define atomic64_dec_return(v) (atomic64_sub_return(1, (v))) static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new) @@ -206,17 +380,30 @@ */ static inline int atomic64_add_unless(atomic64_t *v, long a, long u) { - long c, old; + long c, old, new; c = atomic64_read(v); for (;;) { - if (unlikely(c == (u))) + if (unlikely(c == u)) break; - old = atomic64_cmpxchg((v), c, c + (a)); + + asm volatile("add %2,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + "sub %2,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "=r" (new) + : "0" (c), "ir" (a)); + + old = atomic64_cmpxchg(v, c, new); if (likely(old == c)) break; c = old; } - return c != (u); + return c != u; } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) diff -uriN linux-2.6.38.4/arch/x86/include/asm/atomic.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/atomic.h --- linux-2.6.38.4/arch/x86/include/asm/atomic.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/atomic.h 2011-05-01 17:02:10.000000000 -0500 @@ -22,7 +22,18 @@ */ static inline int atomic_read(const atomic_t *v) { - return (*(volatile int *)&(v)->counter); + return (*(volatile const int *)&(v)->counter); +} + +/** + * atomic_read_unchecked - read atomic variable + * @v: pointer of type atomic_unchecked_t + * + * Atomically reads the value of @v. + */ +static inline int atomic_read_unchecked(const atomic_unchecked_t *v) +{ + return (*(volatile const int *)&(v)->counter); } /** @@ -38,6 +49,18 @@ } /** + * atomic_set_unchecked - set atomic variable + * @v: pointer of type atomic_unchecked_t + * @i: required value + * + * Atomically sets the value of @v to @i. + */ +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i) +{ + v->counter = i; +} + +/** * atomic_add - add integer to atomic variable * @i: integer value to add * @v: pointer of type atomic_t @@ -46,7 +69,29 @@ */ static inline void atomic_add(int i, atomic_t *v) { - asm volatile(LOCK_PREFIX "addl %1,%0" + asm volatile(LOCK_PREFIX "addl %1,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "subl %1,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "+m" (v->counter) + : "ir" (i)); +} + +/** + * atomic_add_unchecked - add integer to atomic variable + * @i: integer value to add + * @v: pointer of type atomic_unchecked_t + * + * Atomically adds @i to @v. + */ +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v) +{ + asm volatile(LOCK_PREFIX "addl %1,%0\n" : "+m" (v->counter) : "ir" (i)); } @@ -60,7 +105,29 @@ */ static inline void atomic_sub(int i, atomic_t *v) { - asm volatile(LOCK_PREFIX "subl %1,%0" + asm volatile(LOCK_PREFIX "subl %1,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "addl %1,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "+m" (v->counter) + : "ir" (i)); +} + +/** + * atomic_sub_unchecked - subtract integer from atomic variable + * @i: integer value to subtract + * @v: pointer of type atomic_t + * + * Atomically subtracts @i from @v. + */ +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v) +{ + asm volatile(LOCK_PREFIX "subl %1,%0\n" : "+m" (v->counter) : "ir" (i)); } @@ -78,7 +145,16 @@ { unsigned char c; - asm volatile(LOCK_PREFIX "subl %2,%0; sete %1" + asm volatile(LOCK_PREFIX "subl %2,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "addl %2,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + "sete %1\n" : "+m" (v->counter), "=qm" (c) : "ir" (i) : "memory"); return c; @@ -92,7 +168,27 @@ */ static inline void atomic_inc(atomic_t *v) { - asm volatile(LOCK_PREFIX "incl %0" + asm volatile(LOCK_PREFIX "incl %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "decl %0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "+m" (v->counter)); +} + +/** + * atomic_inc_unchecked - increment atomic variable + * @v: pointer of type atomic_unchecked_t + * + * Atomically increments @v by 1. + */ +static inline void atomic_inc_unchecked(atomic_unchecked_t *v) +{ + asm volatile(LOCK_PREFIX "incl %0\n" : "+m" (v->counter)); } @@ -104,7 +200,27 @@ */ static inline void atomic_dec(atomic_t *v) { - asm volatile(LOCK_PREFIX "decl %0" + asm volatile(LOCK_PREFIX "decl %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "incl %0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "+m" (v->counter)); +} + +/** + * atomic_dec_unchecked - decrement atomic variable + * @v: pointer of type atomic_t + * + * Atomically decrements @v by 1. + */ +static inline void atomic_dec_unchecked(atomic_unchecked_t *v) +{ + asm volatile(LOCK_PREFIX "decl %0\n" : "+m" (v->counter)); } @@ -120,7 +236,16 @@ { unsigned char c; - asm volatile(LOCK_PREFIX "decl %0; sete %1" + asm volatile(LOCK_PREFIX "decl %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "incl %0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + "sete %1\n" : "+m" (v->counter), "=qm" (c) : : "memory"); return c != 0; @@ -138,7 +263,16 @@ { unsigned char c; - asm volatile(LOCK_PREFIX "incl %0; sete %1" + asm volatile(LOCK_PREFIX "incl %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "decl %0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + "sete %1\n" : "+m" (v->counter), "=qm" (c) : : "memory"); return c != 0; @@ -157,7 +291,16 @@ { unsigned char c; - asm volatile(LOCK_PREFIX "addl %2,%0; sets %1" + asm volatile(LOCK_PREFIX "addl %2,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "subl %2,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + "sets %1\n" : "+m" (v->counter), "=qm" (c) : "ir" (i) : "memory"); return c; @@ -180,6 +323,46 @@ #endif /* Modern 486+ processor */ __i = i; + asm volatile(LOCK_PREFIX "xaddl %0, %1\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + "movl %0, %1\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "+r" (i), "+m" (v->counter) + : : "memory"); + return i + __i; + +#ifdef CONFIG_M386 +no_xadd: /* Legacy 386 processor */ + local_irq_save(flags); + __i = atomic_read(v); + atomic_set(v, i + __i); + local_irq_restore(flags); + return i + __i; +#endif +} + +/** + * atomic_add_return_unchecked - add integer and return + * @v: pointer of type atomic_unchecked_t + * @i: integer value to add + * + * Atomically adds @i to @v and returns @i + @v + */ +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v) +{ + int __i; +#ifdef CONFIG_M386 + unsigned long flags; + if (unlikely(boot_cpu_data.x86 <= 3)) + goto no_xadd; +#endif + /* Modern 486+ processor */ + __i = i; asm volatile(LOCK_PREFIX "xaddl %0, %1" : "+r" (i), "+m" (v->counter) : : "memory"); @@ -208,6 +391,10 @@ } #define atomic_inc_return(v) (atomic_add_return(1, v)) +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v) +{ + return atomic_add_return_unchecked(1, v); +} #define atomic_dec_return(v) (atomic_sub_return(1, v)) static inline int atomic_cmpxchg(atomic_t *v, int old, int new) @@ -231,21 +418,77 @@ */ static inline int atomic_add_unless(atomic_t *v, int a, int u) { - int c, old; + int c, old, new; c = atomic_read(v); for (;;) { - if (unlikely(c == (u))) + if (unlikely(c == u)) break; - old = atomic_cmpxchg((v), c, c + (a)); + + asm volatile("addl %2,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + "subl %2,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "=r" (new) + : "0" (c), "ir" (a)); + + old = atomic_cmpxchg(v, c, new); if (likely(old == c)) break; c = old; } - return c != (u); + return c != u; } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +/** + * atomic_inc_not_zero_hint - increment if not null + * @v: pointer of type atomic_t + * @hint: probable value of the atomic before the increment + * + * This version of atomic_inc_not_zero() gives a hint of probable + * value of the atomic. This helps processor to not read the memory + * before doing the atomic read/modify/write cycle, lowering + * number of bus transactions on some arches. + * + * Returns: 0 if increment was not done, 1 otherwise. + */ +#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint +static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint) +{ + int val, c = hint, new; + + /* sanity test, should be removed by compiler if hint is a constant */ + if (!hint) + return atomic_inc_not_zero(v); + + do { + asm volatile("incl %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + "decl %0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + : "=r" (new) + : "0" (c)); + + val = atomic_cmpxchg(v, c, new); + if (val == c) + return 1; + c = val; + } while (c); + + return 0; +} + /* * atomic_dec_if_positive - decrement by 1 if old value positive * @v: pointer of type atomic_t diff -uriN linux-2.6.38.4/arch/x86/include/asm/bitops.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/bitops.h --- linux-2.6.38.4/arch/x86/include/asm/bitops.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/bitops.h 2011-05-01 17:02:10.000000000 -0500 @@ -38,7 +38,7 @@ * a mask operation on a byte. */ #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr)) -#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3)) +#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3)) #define CONST_MASK(nr) (1 << ((nr) & 7)) /** diff -uriN linux-2.6.38.4/arch/x86/include/asm/boot.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/boot.h --- linux-2.6.38.4/arch/x86/include/asm/boot.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/boot.h 2011-05-01 17:02:10.000000000 -0500 @@ -11,10 +11,15 @@ #include /* Physical address where kernel should be loaded. */ -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \ +#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \ + (CONFIG_PHYSICAL_ALIGN - 1)) \ & ~(CONFIG_PHYSICAL_ALIGN - 1)) +#ifndef __ASSEMBLY__ +extern unsigned char __LOAD_PHYSICAL_ADDR[]; +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR) +#endif + /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT diff -uriN linux-2.6.38.4/arch/x86/include/asm/cacheflush.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/cacheflush.h --- linux-2.6.38.4/arch/x86/include/asm/cacheflush.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/cacheflush.h 2011-05-01 17:02:10.000000000 -0500 @@ -26,7 +26,7 @@ unsigned long pg_flags = pg->flags & _PGMT_MASK; if (pg_flags == _PGMT_DEFAULT) - return -1; + return ~0UL; else if (pg_flags == _PGMT_WC) return _PAGE_CACHE_WC; else if (pg_flags == _PGMT_UC_MINUS) diff -uriN linux-2.6.38.4/arch/x86/include/asm/cache.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/cache.h --- linux-2.6.38.4/arch/x86/include/asm/cache.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/cache.h 2011-05-01 17:02:10.000000000 -0500 @@ -8,6 +8,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) #define __read_mostly __attribute__((__section__(".data..read_mostly"))) +#define __read_only __attribute__((__section__(".data..read_only"))) #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT) diff -uriN linux-2.6.38.4/arch/x86/include/asm/checksum_32.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/checksum_32.h --- linux-2.6.38.4/arch/x86/include/asm/checksum_32.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/checksum_32.h 2011-05-01 17:02:10.000000000 -0500 @@ -31,6 +31,14 @@ int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); +asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst, + int len, __wsum sum, + int *src_err_ptr, int *dst_err_ptr); + +asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst, + int len, __wsum sum, + int *src_err_ptr, int *dst_err_ptr); + /* * Note: when you get a NULL pointer exception here this means someone * passed in an incorrect kernel address to one of these functions. @@ -50,7 +58,7 @@ int *err_ptr) { might_sleep(); - return csum_partial_copy_generic((__force void *)src, dst, + return csum_partial_copy_generic_from_user((__force void *)src, dst, len, sum, err_ptr, NULL); } @@ -178,7 +186,7 @@ { might_sleep(); if (access_ok(VERIFY_WRITE, dst, len)) - return csum_partial_copy_generic(src, (__force void *)dst, + return csum_partial_copy_generic_to_user(src, (__force void *)dst, len, sum, NULL, err_ptr); if (len) diff -uriN linux-2.6.38.4/arch/x86/include/asm/cpufeature.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/cpufeature.h --- linux-2.6.38.4/arch/x86/include/asm/cpufeature.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/cpufeature.h 2011-05-01 17:02:10.000000000 -0500 @@ -349,7 +349,7 @@ ".section .discard,\"aw\",@progbits\n" " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */ ".previous\n" - ".section .altinstr_replacement,\"ax\"\n" + ".section .altinstr_replacement,\"a\"\n" "3: movb $1,%0\n" "4:\n" ".previous\n" diff -uriN linux-2.6.38.4/arch/x86/include/asm/desc_defs.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/desc_defs.h --- linux-2.6.38.4/arch/x86/include/asm/desc_defs.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/desc_defs.h 2011-05-01 17:02:10.000000000 -0500 @@ -31,6 +31,12 @@ unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; }; + struct { + u16 offset_low; + u16 seg; + unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1; + unsigned offset_high: 16; + } gate; }; } __attribute__((packed)); diff -uriN linux-2.6.38.4/arch/x86/include/asm/desc.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/desc.h --- linux-2.6.38.4/arch/x86/include/asm/desc.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/desc.h 2011-05-01 17:02:10.000000000 -0500 @@ -4,6 +4,7 @@ #include #include #include +#include #include static inline void fill_ldt(struct desc_struct *desc, @@ -15,6 +16,7 @@ desc->base1 = (info->base_addr & 0x00ff0000) >> 16; desc->type = (info->read_exec_only ^ 1) << 1; desc->type |= info->contents << 2; + desc->type |= info->seg_not_present ^ 1; desc->s = 1; desc->dpl = 0x3; desc->p = info->seg_not_present ^ 1; @@ -31,16 +33,12 @@ } extern struct desc_ptr idt_descr; -extern gate_desc idt_table[]; - -struct gdt_page { - struct desc_struct gdt[GDT_ENTRIES]; -} __attribute__((aligned(PAGE_SIZE))); -DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page); +extern gate_desc idt_table[256]; +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)]; static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu) { - return per_cpu(gdt_page, cpu).gdt; + return cpu_gdt_table[cpu]; } #ifdef CONFIG_X86_64 @@ -65,9 +63,14 @@ unsigned long base, unsigned dpl, unsigned flags, unsigned short seg) { - gate->a = (seg << 16) | (base & 0xffff); - gate->b = (base & 0xffff0000) | - (((0x80 | type | (dpl << 5)) & 0xff) << 8); + gate->gate.offset_low = base; + gate->gate.seg = seg; + gate->gate.reserved = 0; + gate->gate.type = type; + gate->gate.s = 0; + gate->gate.dpl = dpl; + gate->gate.p = 1; + gate->gate.offset_high = base >> 16; } #endif @@ -115,13 +118,17 @@ static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate) { + pax_open_kernel(); memcpy(&idt[entry], gate, sizeof(*gate)); + pax_close_kernel(); } static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc) { + pax_open_kernel(); memcpy(&ldt[entry], desc, 8); + pax_close_kernel(); } static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry, @@ -139,7 +146,10 @@ size = sizeof(struct desc_struct); break; } + + pax_open_kernel(); memcpy(&gdt[entry], desc, size); + pax_close_kernel(); } static inline void pack_descriptor(struct desc_struct *desc, unsigned long base, @@ -211,7 +221,9 @@ static inline void native_load_tr_desc(void) { + pax_open_kernel(); asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8)); + pax_close_kernel(); } static inline void native_load_gdt(const struct desc_ptr *dtr) @@ -246,8 +258,10 @@ unsigned int i; struct desc_struct *gdt = get_cpu_gdt_table(cpu); + pax_open_kernel(); for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++) gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i]; + pax_close_kernel(); } #define _LDT_empty(info) \ @@ -309,7 +323,7 @@ desc->limit = (limit >> 16) & 0xf; } -static inline void _set_gate(int gate, unsigned type, void *addr, +static inline void _set_gate(int gate, unsigned type, const void *addr, unsigned dpl, unsigned ist, unsigned seg) { gate_desc s; @@ -327,7 +341,7 @@ * Pentium F0 0F bugfix can have resulted in the mapped * IDT being write-protected. */ -static inline void set_intr_gate(unsigned int n, void *addr) +static inline void set_intr_gate(unsigned int n, const void *addr) { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS); @@ -356,19 +370,19 @@ /* * This routine sets up an interrupt gate at directory privilege level 3. */ -static inline void set_system_intr_gate(unsigned int n, void *addr) +static inline void set_system_intr_gate(unsigned int n, const void *addr) { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS); } -static inline void set_system_trap_gate(unsigned int n, void *addr) +static inline void set_system_trap_gate(unsigned int n, const void *addr) { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS); } -static inline void set_trap_gate(unsigned int n, void *addr) +static inline void set_trap_gate(unsigned int n, const void *addr) { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS); @@ -377,19 +391,31 @@ static inline void set_task_gate(unsigned int n, unsigned int gdt_entry) { BUG_ON((unsigned)n > 0xFF); - _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3)); + _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3)); } -static inline void set_intr_gate_ist(int n, void *addr, unsigned ist) +static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist) { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS); } -static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist) +static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist) { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS); } +#ifdef CONFIG_X86_32 +static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu) +{ + struct desc_struct d; + + if (likely(limit)) + limit = (limit - 1UL) >> PAGE_SHIFT; + pack_descriptor(&d, base, limit, 0xFB, 0xC); + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S); +} +#endif + #endif /* _ASM_X86_DESC_H */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/device.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/device.h --- linux-2.6.38.4/arch/x86/include/asm/device.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/device.h 2011-05-01 17:02:10.000000000 -0500 @@ -6,7 +6,7 @@ void *acpi_handle; #endif #ifdef CONFIG_X86_64 -struct dma_map_ops *dma_ops; + const struct dma_map_ops *dma_ops; #endif #if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU) void *iommu; /* hook for IOMMU specific extension */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/dma-mapping.h --- linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/dma-mapping.h 2011-05-01 17:02:10.000000000 -0500 @@ -26,9 +26,9 @@ extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; -extern struct dma_map_ops *dma_ops; +extern const struct dma_map_ops *dma_ops; -static inline struct dma_map_ops *get_dma_ops(struct device *dev) +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) { #ifdef CONFIG_X86_32 return dma_ops; @@ -45,7 +45,7 @@ /* Make sure we keep the same behaviour */ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); if (ops->mapping_error) return ops->mapping_error(dev, dma_addr); @@ -115,7 +115,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); void *memory; gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); @@ -142,7 +142,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t bus) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); WARN_ON(irqs_disabled()); /* for portability */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/e820.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/e820.h --- linux-2.6.38.4/arch/x86/include/asm/e820.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/e820.h 2011-05-01 17:02:10.000000000 -0500 @@ -69,7 +69,7 @@ #define ISA_START_ADDRESS 0xa0000 #define ISA_END_ADDRESS 0x100000 -#define BIOS_BEGIN 0x000a0000 +#define BIOS_BEGIN 0x000c0000 #define BIOS_END 0x00100000 #define BIOS_ROM_BASE 0xffe00000 diff -uriN linux-2.6.38.4/arch/x86/include/asm/elf.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/elf.h --- linux-2.6.38.4/arch/x86/include/asm/elf.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/elf.h 2011-05-01 17:02:10.000000000 -0500 @@ -237,7 +237,25 @@ the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ +#ifdef CONFIG_PAX_SEGMEXEC +#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2) +#else #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) +#endif + +#ifdef CONFIG_PAX_ASLR +#ifdef CONFIG_X86_32 +#define PAX_ELF_ET_DYN_BASE 0x10000000UL + +#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16) +#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16) +#else +#define PAX_ELF_ET_DYN_BASE 0x400000UL + +#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3) +#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3) +#endif +#endif /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, @@ -291,8 +309,7 @@ #define ARCH_DLINFO \ do { \ if (vdso_enabled) \ - NEW_AUX_ENT(AT_SYSINFO_EHDR, \ - (unsigned long)current->mm->context.vdso); \ + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso);\ } while (0) #define AT_SYSINFO 32 @@ -303,7 +320,7 @@ #endif /* !CONFIG_X86_32 */ -#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso) +#define VDSO_CURRENT_BASE (current->mm->context.vdso) #define VDSO_ENTRY \ ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall)) @@ -317,7 +334,4 @@ extern int syscall32_setup_pages(struct linux_binprm *, int exstack); #define compat_arch_setup_additional_pages syscall32_setup_pages -extern unsigned long arch_randomize_brk(struct mm_struct *mm); -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/futex.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/futex.h --- linux-2.6.38.4/arch/x86/include/asm/futex.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/futex.h 2011-05-01 17:02:10.000000000 -0500 @@ -12,16 +12,18 @@ #include #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \ + typecheck(u32 *, uaddr); \ asm volatile("1:\t" insn "\n" \ "2:\t.section .fixup,\"ax\"\n" \ "3:\tmov\t%3, %1\n" \ "\tjmp\t2b\n" \ "\t.previous\n" \ _ASM_EXTABLE(1b, 3b) \ - : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \ + : "=r" (oldval), "=r" (ret), "+m" (*(u32 *)____m(uaddr))\ : "i" (-EFAULT), "0" (oparg), "1" (0)) #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \ + typecheck(u32 *, uaddr); \ asm volatile("1:\tmovl %2, %0\n" \ "\tmovl\t%0, %3\n" \ "\t" insn "\n" \ @@ -34,10 +36,10 @@ _ASM_EXTABLE(1b, 4b) \ _ASM_EXTABLE(2b, 4b) \ : "=&a" (oldval), "=&r" (ret), \ - "+m" (*uaddr), "=&r" (tem) \ + "+m" (*(u32 *)____m(uaddr)), "=&r" (tem) \ : "r" (oparg), "i" (-EFAULT), "1" (0)) -static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr) +static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) { int op = (encoded_op >> 28) & 7; int cmp = (encoded_op >> 24) & 15; @@ -61,10 +63,10 @@ switch (op) { case FUTEX_OP_SET: - __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg); + __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg); break; case FUTEX_OP_ADD: - __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval, + __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval, uaddr, oparg); break; case FUTEX_OP_OR: @@ -109,7 +111,7 @@ return ret; } -static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, +static inline int futex_atomic_cmpxchg_inatomic(u32 __user *uaddr, int oldval, int newval) { @@ -119,16 +121,16 @@ return -ENOSYS; #endif - if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int))) + if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; - asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n" + asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %1\n" "2:\t.section .fixup, \"ax\"\n" "3:\tmov %2, %0\n" "\tjmp 2b\n" "\t.previous\n" _ASM_EXTABLE(1b, 3b) - : "=a" (oldval), "+m" (*uaddr) + : "=a" (oldval), "+m" (*(u32 *)____m(uaddr)) : "i" (-EFAULT), "r" (newval), "0" (oldval) : "memory" ); diff -uriN linux-2.6.38.4/arch/x86/include/asm/i387.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/i387.h --- linux-2.6.38.4/arch/x86/include/asm/i387.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/i387.h 2011-05-01 17:02:10.000000000 -0500 @@ -92,6 +92,11 @@ { int err; +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + if ((unsigned long)fx < PAX_USER_SHADOW_BASE) + fx = (struct i387_fxsave_struct *)((void *)fx + PAX_USER_SHADOW_BASE); +#endif + /* See comment in fxsave() below. */ #ifdef CONFIG_AS_FXSAVEQ asm volatile("1: fxrstorq %[fx]\n\t" @@ -121,6 +126,11 @@ { int err; +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + if ((unsigned long)fx < PAX_USER_SHADOW_BASE) + fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE); +#endif + /* * Clear the bytes not touched by the fxsave and reserved * for the SW usage. @@ -213,13 +223,8 @@ #endif /* CONFIG_X86_64 */ /* We need a safe address that is cheap to find and that is already - in L1 during context switch. The best choices are unfortunately - different for UP and SMP */ -#ifdef CONFIG_SMP -#define safe_address (__per_cpu_offset[0]) -#else -#define safe_address (kstat_cpu(0).cpustat.user) -#endif + in L1 during context switch. */ +#define safe_address (init_tss[smp_processor_id()].x86_tss.sp0) /* * These must be called with preempt disabled @@ -237,7 +242,7 @@ } else if (use_fxsr()) { fpu_fxsave(fpu); } else { - asm volatile("fsave %[fx]; fwait" + asm volatile("fnsave %[fx]; fwait" : [fx] "=m" (fpu->state->fsave)); return; } @@ -312,7 +317,7 @@ struct thread_info *me = current_thread_info(); preempt_disable(); if (me->status & TS_USEDFPU) - __save_init_fpu(me->task); + __save_init_fpu(current); else clts(); } diff -uriN linux-2.6.38.4/arch/x86/include/asm/io.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/io.h --- linux-2.6.38.4/arch/x86/include/asm/io.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/io.h 2011-05-01 17:02:10.000000000 -0500 @@ -216,6 +216,17 @@ #include +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE +static inline int valid_phys_addr_range(unsigned long addr, size_t count) +{ + return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; +} + +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count) +{ + return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; +} + /* * Convert a virtual cached pointer to an uncached pointer */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/iommu.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/iommu.h --- linux-2.6.38.4/arch/x86/include/asm/iommu.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/iommu.h 2011-05-01 17:02:10.000000000 -0500 @@ -1,7 +1,7 @@ #ifndef _ASM_X86_IOMMU_H #define _ASM_X86_IOMMU_H -extern struct dma_map_ops nommu_dma_ops; +extern const struct dma_map_ops nommu_dma_ops; extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; diff -uriN linux-2.6.38.4/arch/x86/include/asm/irqflags.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/irqflags.h --- linux-2.6.38.4/arch/x86/include/asm/irqflags.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/irqflags.h 2011-05-01 17:02:10.000000000 -0500 @@ -140,6 +140,11 @@ sti; \ sysexit +#define GET_CR0_INTO_RDI mov %cr0, %rdi +#define SET_RDI_INTO_CR0 mov %rdi, %cr0 +#define GET_CR3_INTO_RDI mov %cr3, %rdi +#define SET_RDI_INTO_CR3 mov %rdi, %cr3 + #else #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit diff -uriN linux-2.6.38.4/arch/x86/include/asm/kprobes.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/kprobes.h --- linux-2.6.38.4/arch/x86/include/asm/kprobes.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/kprobes.h 2011-05-01 17:02:10.000000000 -0500 @@ -37,13 +37,8 @@ #define RELATIVEJUMP_SIZE 5 #define RELATIVECALL_OPCODE 0xe8 #define RELATIVE_ADDR_SIZE 4 -#define MAX_STACK_SIZE 64 -#define MIN_STACK_SIZE(ADDR) \ - (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \ - THREAD_SIZE - (unsigned long)(ADDR))) \ - ? (MAX_STACK_SIZE) \ - : (((unsigned long)current_thread_info()) + \ - THREAD_SIZE - (unsigned long)(ADDR))) +#define MAX_STACK_SIZE 64UL +#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR)) #define flush_insn_slot(p) do { } while (0) diff -uriN linux-2.6.38.4/arch/x86/include/asm/kvm_host.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/kvm_host.h --- linux-2.6.38.4/arch/x86/include/asm/kvm_host.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/kvm_host.h 2011-05-01 17:02:10.000000000 -0500 @@ -603,7 +603,7 @@ bool direct_map; }; -extern struct kvm_x86_ops *kvm_x86_ops; +extern const struct kvm_x86_ops *kvm_x86_ops; int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); diff -uriN linux-2.6.38.4/arch/x86/include/asm/local.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/local.h --- linux-2.6.38.4/arch/x86/include/asm/local.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/local.h 2011-05-01 17:02:10.000000000 -0500 @@ -18,26 +18,58 @@ static inline void local_inc(local_t *l) { - asm volatile(_ASM_INC "%0" + asm volatile(_ASM_INC "%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + _ASM_DEC "%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + : "+m" (l->a.counter)); } static inline void local_dec(local_t *l) { - asm volatile(_ASM_DEC "%0" + asm volatile(_ASM_DEC "%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + _ASM_INC "%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + : "+m" (l->a.counter)); } static inline void local_add(long i, local_t *l) { - asm volatile(_ASM_ADD "%1,%0" + asm volatile(_ASM_ADD "%1,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + _ASM_SUB "%1,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + : "+m" (l->a.counter) : "ir" (i)); } static inline void local_sub(long i, local_t *l) { - asm volatile(_ASM_SUB "%1,%0" + asm volatile(_ASM_SUB "%1,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + _ASM_ADD "%1,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + : "+m" (l->a.counter) : "ir" (i)); } @@ -55,7 +87,16 @@ { unsigned char c; - asm volatile(_ASM_SUB "%2,%0; sete %1" + asm volatile(_ASM_SUB "%2,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + _ASM_ADD "%2,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + "sete %1\n" : "+m" (l->a.counter), "=qm" (c) : "ir" (i) : "memory"); return c; @@ -73,7 +114,16 @@ { unsigned char c; - asm volatile(_ASM_DEC "%0; sete %1" + asm volatile(_ASM_DEC "%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + _ASM_INC "%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + "sete %1\n" : "+m" (l->a.counter), "=qm" (c) : : "memory"); return c != 0; @@ -91,7 +141,16 @@ { unsigned char c; - asm volatile(_ASM_INC "%0; sete %1" + asm volatile(_ASM_INC "%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + _ASM_DEC "%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + "sete %1\n" : "+m" (l->a.counter), "=qm" (c) : : "memory"); return c != 0; @@ -110,7 +169,16 @@ { unsigned char c; - asm volatile(_ASM_ADD "%2,%0; sets %1" + asm volatile(_ASM_ADD "%2,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + _ASM_SUB "%2,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + "sets %1\n" : "+m" (l->a.counter), "=qm" (c) : "ir" (i) : "memory"); return c; @@ -133,7 +201,15 @@ #endif /* Modern 486+ processor */ __i = i; - asm volatile(_ASM_XADD "%0, %1;" + asm volatile(_ASM_XADD "%0, %1\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + _ASM_MOV "%0,%1\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; diff -uriN linux-2.6.38.4/arch/x86/include/asm/mce.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/mce.h --- linux-2.6.38.4/arch/x86/include/asm/mce.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/mce.h 2011-05-01 17:02:10.000000000 -0500 @@ -198,7 +198,7 @@ void mce_notify_process(void); DECLARE_PER_CPU(struct mce, injectm); -extern struct file_operations mce_chrdev_ops; +extern struct file_operations mce_chrdev_ops; /* cannot be const, see arch/x86/kernel/cpu/mcheck/mce. */ /* * Exception handler diff -uriN linux-2.6.38.4/arch/x86/include/asm/microcode.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/microcode.h --- linux-2.6.38.4/arch/x86/include/asm/microcode.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/microcode.h 2011-05-01 17:02:10.000000000 -0500 @@ -12,13 +12,13 @@ enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; struct microcode_ops { - enum ucode_state (*request_microcode_user) (int cpu, + enum ucode_state (* const request_microcode_user) (int cpu, const void __user *buf, size_t size); - enum ucode_state (*request_microcode_fw) (int cpu, + enum ucode_state (* const request_microcode_fw) (int cpu, struct device *device); - void (*microcode_fini_cpu) (int cpu); + void (* const microcode_fini_cpu) (int cpu); /* * The generic 'microcode_core' part guarantees that @@ -38,16 +38,16 @@ extern struct ucode_cpu_info ucode_cpu_info[]; #ifdef CONFIG_MICROCODE_INTEL -extern struct microcode_ops * __init init_intel_microcode(void); +extern const struct microcode_ops * __init init_intel_microcode(void); #else -static inline struct microcode_ops * __init init_intel_microcode(void) +static inline const struct microcode_ops * __init init_intel_microcode(void) { return NULL; } #endif /* CONFIG_MICROCODE_INTEL */ #ifdef CONFIG_MICROCODE_AMD -extern struct microcode_ops * __init init_amd_microcode(void); +extern const struct microcode_ops * __init init_amd_microcode(void); static inline void get_ucode_data(void *to, const u8 *from, size_t n) { @@ -55,7 +55,7 @@ } #else -static inline struct microcode_ops * __init init_amd_microcode(void) +static inline const struct microcode_ops * __init init_amd_microcode(void) { return NULL; } diff -uriN linux-2.6.38.4/arch/x86/include/asm/mman.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/mman.h --- linux-2.6.38.4/arch/x86/include/asm/mman.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/mman.h 2011-05-01 17:02:10.000000000 -0500 @@ -5,4 +5,14 @@ #include +#ifdef __KERNEL__ +#ifndef __ASSEMBLY__ +#ifdef CONFIG_X86_32 +#define arch_mmap_check i386_mmap_check +int i386_mmap_check(unsigned long addr, unsigned long len, + unsigned long flags); +#endif +#endif +#endif + #endif /* _ASM_X86_MMAN_H */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/mmu_context.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/mmu_context.h --- linux-2.6.38.4/arch/x86/include/asm/mmu_context.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/mmu_context.h 2011-05-01 17:02:10.000000000 -0500 @@ -24,6 +24,21 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) { + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + unsigned int i; + pgd_t *pgd; + + pax_open_kernel(); + pgd = get_cpu_pgd(smp_processor_id()); + for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i) + if (paravirt_enabled()) + set_pgd(pgd+i, native_make_pgd(0)); + else + pgd[i] = native_make_pgd(0); + pax_close_kernel(); +#endif + #ifdef CONFIG_SMP if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK) percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY); @@ -34,16 +49,30 @@ struct task_struct *tsk) { unsigned cpu = smp_processor_id(); +#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) + int tlbstate = TLBSTATE_OK; +#endif if (likely(prev != next)) { #ifdef CONFIG_SMP +#ifdef CONFIG_X86_32 + tlbstate = percpu_read(cpu_tlbstate.state); +#endif percpu_write(cpu_tlbstate.state, TLBSTATE_OK); percpu_write(cpu_tlbstate.active_mm, next); #endif cpumask_set_cpu(cpu, mm_cpumask(next)); /* Re-load page tables */ +#ifdef CONFIG_PAX_PER_CPU_PGD + pax_open_kernel(); + __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS); + __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS); + pax_close_kernel(); + load_cr3(get_cpu_pgd(cpu)); +#else load_cr3(next->pgd); +#endif /* stop flush ipis for the previous mm */ cpumask_clear_cpu(cpu, mm_cpumask(prev)); @@ -53,9 +82,38 @@ */ if (unlikely(prev->context.ldt != next->context.ldt)) load_LDT_nolock(&next->context); - } + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP) + if (!(__supported_pte_mask & _PAGE_NX)) { + smp_mb__before_clear_bit(); + cpu_clear(cpu, prev->context.cpu_user_cs_mask); + smp_mb__after_clear_bit(); + cpu_set(cpu, next->context.cpu_user_cs_mask); + } +#endif + +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)) + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base || + prev->context.user_cs_limit != next->context.user_cs_limit)) + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu); #ifdef CONFIG_SMP + else if (unlikely(tlbstate != TLBSTATE_OK)) + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu); +#endif +#endif + + } else { + +#ifdef CONFIG_PAX_PER_CPU_PGD + pax_open_kernel(); + __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS); + __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS); + pax_close_kernel(); + load_cr3(get_cpu_pgd(cpu)); +#endif + +#ifdef CONFIG_SMP percpu_write(cpu_tlbstate.state, TLBSTATE_OK); BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next); @@ -64,11 +122,28 @@ * tlb flush IPI delivery. We must reload CR3 * to make sure to use no freed page tables. */ + +#ifndef CONFIG_PAX_PER_CPU_PGD load_cr3(next->pgd); +#endif + load_LDT_nolock(&next->context); + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) + if (!(__supported_pte_mask & _PAGE_NX)) + cpu_set(cpu, next->context.cpu_user_cs_mask); +#endif + +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)) +#ifdef CONFIG_PAX_PAGEEXEC + if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX))) +#endif + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu); +#endif + } - } #endif + } } #define activate_mm(prev, next) \ diff -uriN linux-2.6.38.4/arch/x86/include/asm/mmu.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/mmu.h --- linux-2.6.38.4/arch/x86/include/asm/mmu.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/mmu.h 2011-05-01 17:02:10.000000000 -0500 @@ -9,10 +9,23 @@ * we put the segment information here. */ typedef struct { - void *ldt; + struct desc_struct *ldt; int size; struct mutex lock; - void *vdso; + unsigned long vdso; + +#ifdef CONFIG_X86_32 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) + unsigned long user_cs_base; + unsigned long user_cs_limit; + +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP) + cpumask_t cpu_user_cs_mask; +#endif + +#endif +#endif + } mm_context_t; #ifdef CONFIG_SMP diff -uriN linux-2.6.38.4/arch/x86/include/asm/module.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/module.h --- linux-2.6.38.4/arch/x86/include/asm/module.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/module.h 2011-05-01 17:02:10.000000000 -0500 @@ -5,6 +5,7 @@ #ifdef CONFIG_X86_64 /* X86_64 does not define MODULE_PROC_FAMILY */ +#define MODULE_PROC_FAMILY "" #elif defined CONFIG_M386 #define MODULE_PROC_FAMILY "386 " #elif defined CONFIG_M486 @@ -59,8 +60,30 @@ #error unknown processor family #endif -#ifdef CONFIG_X86_32 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY +#ifdef CONFIG_PAX_MEMORY_UDEREF +#define MODULE_PAX_UDEREF "UDEREF " +#else +#define MODULE_PAX_UDEREF "" +#endif + +#ifdef CONFIG_PAX_KERNEXEC +#define MODULE_PAX_KERNEXEC "KERNEXEC " +#else +#define MODULE_PAX_KERNEXEC "" #endif +#ifdef CONFIG_PAX_REFCOUNT +#define MODULE_PAX_REFCOUNT "REFCOUNT " +#else +#define MODULE_PAX_REFCOUNT "" +#endif + +#ifdef CONFIG_GRKERNSEC +#define MODULE_GRSEC "GRSECURITY " +#else +#define MODULE_GRSEC "" +#endif + +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT + #endif /* _ASM_X86_MODULE_H */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/page_64_types.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/page_64_types.h --- linux-2.6.38.4/arch/x86/include/asm/page_64_types.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/page_64_types.h 2011-05-01 17:02:10.000000000 -0500 @@ -56,7 +56,7 @@ /* duplicated to the one in bootmem.h */ extern unsigned long max_pfn; -extern unsigned long phys_base; +extern const unsigned long phys_base; extern unsigned long __phys_addr(unsigned long); #define __phys_reloc_hide(x) (x) diff -uriN linux-2.6.38.4/arch/x86/include/asm/paravirt.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/paravirt.h --- linux-2.6.38.4/arch/x86/include/asm/paravirt.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/paravirt.h 2011-05-01 17:02:10.000000000 -0500 @@ -739,6 +739,21 @@ pv_mmu_ops.set_fixmap(idx, phys, flags); } +#ifdef CONFIG_PAX_KERNEXEC +static inline unsigned long pax_open_kernel(void) +{ + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel); +} + +static inline unsigned long pax_close_kernel(void) +{ + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel); +} +#else +static inline unsigned long pax_open_kernel(void) { return 0; } +static inline unsigned long pax_close_kernel(void) { return 0; } +#endif + #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS) static inline int arch_spin_is_locked(struct arch_spinlock *lock) @@ -955,7 +970,7 @@ #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4) #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4) -#define PARA_INDIRECT(addr) *%cs:addr +#define PARA_INDIRECT(addr) *%ss:addr #endif #define INTERRUPT_RETURN \ @@ -1032,6 +1047,21 @@ PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \ CLBR_NONE, \ jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit)) + +#define GET_CR0_INTO_RDI \ + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \ + mov %rax,%rdi + +#define SET_RDI_INTO_CR0 \ + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0) + +#define GET_CR3_INTO_RDI \ + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \ + mov %rax,%rdi + +#define SET_RDI_INTO_CR3 \ + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3) + #endif /* CONFIG_X86_32 */ #endif /* __ASSEMBLY__ */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/paravirt_types.h --- linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/paravirt_types.h 2011-05-01 17:02:10.000000000 -0500 @@ -317,6 +317,12 @@ an mfn. We can tell which is which from the index. */ void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, phys_addr_t phys, pgprot_t flags); + +#ifdef CONFIG_PAX_KERNEXEC + unsigned long (*pax_open_kernel)(void); + unsigned long (*pax_close_kernel)(void); +#endif + }; struct arch_spinlock; diff -uriN linux-2.6.38.4/arch/x86/include/asm/pci_x86.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pci_x86.h --- linux-2.6.38.4/arch/x86/include/asm/pci_x86.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pci_x86.h 2011-05-01 17:02:10.000000000 -0500 @@ -93,16 +93,16 @@ extern void (*pcibios_disable_irq)(struct pci_dev *dev); struct pci_raw_ops { - int (*read)(unsigned int domain, unsigned int bus, unsigned int devfn, + int (* const read)(unsigned int domain, unsigned int bus, unsigned int devfn, int reg, int len, u32 *val); - int (*write)(unsigned int domain, unsigned int bus, unsigned int devfn, + int (* const write)(unsigned int domain, unsigned int bus, unsigned int devfn, int reg, int len, u32 val); }; -extern struct pci_raw_ops *raw_pci_ops; -extern struct pci_raw_ops *raw_pci_ext_ops; +extern const struct pci_raw_ops *raw_pci_ops; +extern const struct pci_raw_ops *raw_pci_ext_ops; -extern struct pci_raw_ops pci_direct_conf1; +extern const struct pci_raw_ops pci_direct_conf1; extern bool port_cf9_safe; /* arch_initcall level */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/pgalloc.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgalloc.h --- linux-2.6.38.4/arch/x86/include/asm/pgalloc.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgalloc.h 2011-05-01 17:02:10.000000000 -0500 @@ -63,6 +63,13 @@ pmd_t *pmd, pte_t *pte) { paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT); + set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE)); +} + +static inline void pmd_populate_user(struct mm_struct *mm, + pmd_t *pmd, pte_t *pte) +{ + paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT); set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } diff -uriN linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable-2level.h --- linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable-2level.h 2011-05-01 17:02:10.000000000 -0500 @@ -18,7 +18,9 @@ static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) { + pax_open_kernel(); *pmdp = pmd; + pax_close_kernel(); } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) diff -uriN linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable_32.h --- linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable_32.h 2011-05-01 17:02:10.000000000 -0500 @@ -25,9 +25,6 @@ struct mm_struct; struct vm_area_struct; -extern pgd_t swapper_pg_dir[1024]; -extern pgd_t initial_page_table[1024]; - static inline void pgtable_cache_init(void) { } static inline void check_pgt_cache(void) { } void paging_init(void); @@ -48,6 +45,12 @@ # include #endif +extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; +extern pgd_t initial_page_table[PTRS_PER_PGD]; +#ifdef CONFIG_X86_PAE +extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD]; +#endif + #if defined(CONFIG_HIGHPTE) #define pte_offset_map(dir, address) \ ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \ @@ -62,7 +65,9 @@ /* Clear a kernel PTE and flush it from the TLB */ #define kpte_clear_flush(ptep, vaddr) \ do { \ + pax_open_kernel(); \ pte_clear(&init_mm, (vaddr), (ptep)); \ + pax_close_kernel(); \ __flush_tlb_one((vaddr)); \ } while (0) @@ -74,6 +79,9 @@ #endif /* !__ASSEMBLY__ */ +#define HAVE_ARCH_UNMAPPED_AREA +#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN + /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM diff -uriN linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable_32_types.h --- linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable_32_types.h 2011-05-01 17:02:10.000000000 -0500 @@ -8,7 +8,7 @@ */ #ifdef CONFIG_X86_PAE # include -# define PMD_SIZE (1UL << PMD_SHIFT) +# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT) # define PMD_MASK (~(PMD_SIZE - 1)) #else # include @@ -46,6 +46,19 @@ # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE) #endif +#ifdef CONFIG_PAX_KERNEXEC +#ifndef __ASSEMBLY__ +extern unsigned char MODULES_EXEC_VADDR[]; +extern unsigned char MODULES_EXEC_END[]; +#endif +#include +#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET) +#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET) +#else +#define ktla_ktva(addr) (addr) +#define ktva_ktla(addr) (addr) +#endif + #define MODULES_VADDR VMALLOC_START #define MODULES_END VMALLOC_END #define MODULES_LEN (MODULES_VADDR - MODULES_END) diff -uriN linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable-3level.h --- linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable-3level.h 2011-05-01 17:02:10.000000000 -0500 @@ -38,12 +38,16 @@ static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) { + pax_open_kernel(); set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd)); + pax_close_kernel(); } static inline void native_set_pud(pud_t *pudp, pud_t pud) { + pax_open_kernel(); set_64bit((unsigned long long *)(pudp), native_pud_val(pud)); + pax_close_kernel(); } /* diff -uriN linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable_64.h --- linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable_64.h 2011-05-01 17:02:10.000000000 -0500 @@ -16,10 +16,13 @@ extern pud_t level3_kernel_pgt[512]; extern pud_t level3_ident_pgt[512]; +extern pud_t level3_vmalloc_pgt[512]; +extern pud_t level3_vmemmap_pgt[512]; +extern pud_t level2_vmemmap_pgt[512]; extern pmd_t level2_kernel_pgt[512]; extern pmd_t level2_fixmap_pgt[512]; -extern pmd_t level2_ident_pgt[512]; -extern pgd_t init_level4_pgt[]; +extern pmd_t level2_ident_pgt[512*2]; +extern pgd_t init_level4_pgt[512]; #define swapper_pg_dir init_level4_pgt @@ -61,7 +64,9 @@ static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) { + pax_open_kernel(); *pmdp = pmd; + pax_close_kernel(); } static inline void native_pmd_clear(pmd_t *pmd) @@ -107,7 +112,9 @@ static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd) { + pax_open_kernel(); *pgdp = pgd; + pax_close_kernel(); } static inline void native_pgd_clear(pgd_t *pgd) diff -uriN linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable_64_types.h --- linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable_64_types.h 2011-05-01 17:02:10.000000000 -0500 @@ -59,5 +59,10 @@ #define MODULES_VADDR _AC(0xffffffffa0000000, UL) #define MODULES_END _AC(0xffffffffff000000, UL) #define MODULES_LEN (MODULES_END - MODULES_VADDR) +#define MODULES_EXEC_VADDR MODULES_VADDR +#define MODULES_EXEC_END MODULES_END + +#define ktla_ktva(addr) (addr) +#define ktva_ktla(addr) (addr) #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/pgtable.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable.h --- linux-2.6.38.4/arch/x86/include/asm/pgtable.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable.h 2011-05-01 17:02:10.000000000 -0500 @@ -81,12 +81,51 @@ #define arch_end_context_switch(prev) do {} while(0) +#define pax_open_kernel() native_pax_open_kernel() +#define pax_close_kernel() native_pax_close_kernel() #endif /* CONFIG_PARAVIRT */ +#define __HAVE_ARCH_PAX_OPEN_KERNEL +#define __HAVE_ARCH_PAX_CLOSE_KERNEL + +#ifdef CONFIG_PAX_KERNEXEC +static inline unsigned long native_pax_open_kernel(void) +{ + unsigned long cr0; + + preempt_disable(); + barrier(); + cr0 = read_cr0() ^ X86_CR0_WP; + BUG_ON(unlikely(cr0 & X86_CR0_WP)); + write_cr0(cr0); + return cr0 ^ X86_CR0_WP; +} + +static inline unsigned long native_pax_close_kernel(void) +{ + unsigned long cr0; + + cr0 = read_cr0() ^ X86_CR0_WP; + BUG_ON(unlikely(!(cr0 & X86_CR0_WP))); + write_cr0(cr0); + barrier(); + preempt_enable_no_resched(); + return cr0 ^ X86_CR0_WP; +} +#else +static inline unsigned long native_pax_open_kernel(void) { return 0; } +static inline unsigned long native_pax_close_kernel(void) { return 0; } +#endif + /* * The following only work if pte_present() is true. * Undefined behaviour if not.. */ +static inline int pte_user(pte_t pte) +{ + return pte_val(pte) & _PAGE_USER; +} + static inline int pte_dirty(pte_t pte) { return pte_flags(pte) & _PAGE_DIRTY; @@ -196,9 +235,29 @@ return pte_clear_flags(pte, _PAGE_RW); } +static inline pte_t pte_mkread(pte_t pte) +{ + return __pte(pte_val(pte) | _PAGE_USER); +} + static inline pte_t pte_mkexec(pte_t pte) { - return pte_clear_flags(pte, _PAGE_NX); +#ifdef CONFIG_X86_PAE + if (__supported_pte_mask & _PAGE_NX) + return pte_clear_flags(pte, _PAGE_NX); + else +#endif + return pte_set_flags(pte, _PAGE_USER); +} + +static inline pte_t pte_exprotect(pte_t pte) +{ +#ifdef CONFIG_X86_PAE + if (__supported_pte_mask & _PAGE_NX) + return pte_set_flags(pte, _PAGE_NX); + else +#endif + return pte_clear_flags(pte, _PAGE_USER); } static inline pte_t pte_mkdirty(pte_t pte) @@ -390,6 +449,15 @@ #endif #ifndef __ASSEMBLY__ + +#ifdef CONFIG_PAX_PER_CPU_PGD +extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD]; +static inline pgd_t *get_cpu_pgd(unsigned int cpu) +{ + return cpu_pgd[cpu]; +} +#endif + #include static inline int pte_none(pte_t pte) @@ -560,7 +628,7 @@ static inline int pgd_bad(pgd_t pgd) { - return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE; + return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE; } static inline int pgd_none(pgd_t pgd) @@ -583,7 +651,12 @@ * pgd_offset() returns a (pgd_t *) * pgd_index() is used get the offset into the pgd page's array of pgd_t's; */ -#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address))) +#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address)) + +#ifdef CONFIG_PAX_PER_CPU_PGD +#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address)) +#endif + /* * a shortcut which implies the use of the kernel's pgd, instead * of a process's @@ -594,6 +667,20 @@ #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET) #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY) +#ifdef CONFIG_X86_32 +#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY +#else +#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT +#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT)) + +#ifdef CONFIG_PAX_MEMORY_UDEREF +#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT) +#else +#define PAX_USER_SHADOW_BASE (_AC(0,UL)) +#endif + +#endif + #ifndef __ASSEMBLY__ extern int direct_gbpages; @@ -758,11 +845,23 @@ * dst and src can be on the same page, but the range must not overlap, * and must not cross a page boundary. */ -static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) +static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count) { - memcpy(dst, src, count * sizeof(pgd_t)); + pax_open_kernel(); + while (count--) + *dst++ = *src++; + pax_close_kernel(); } +#ifdef CONFIG_PAX_PER_CPU_PGD +extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count); +#endif + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) +extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count); +#else +static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) {} +#endif #include #endif /* __ASSEMBLY__ */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable_types.h --- linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/pgtable_types.h 2011-05-01 17:02:10.000000000 -0500 @@ -16,13 +16,12 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */ -#define _PAGE_BIT_UNUSED1 9 /* available for programmer */ +#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */ #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */ #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */ #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */ -#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1 -#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1 -#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */ +#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL +#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */ #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */ /* If _PAGE_BIT_PRESENT is clear, we use these: */ @@ -40,7 +39,6 @@ #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY) #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE) #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL) -#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1) #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP) #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT) #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE) @@ -57,8 +55,10 @@ #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX) -#else +#elif defined(CONFIG_KMEMCHECK) #define _PAGE_NX (_AT(pteval_t, 0)) +#else +#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN) #endif #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE) @@ -96,6 +96,9 @@ #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \ _PAGE_ACCESSED) +#define PAGE_READONLY_NOEXEC PAGE_READONLY +#define PAGE_SHARED_NOEXEC PAGE_SHARED + #define __PAGE_KERNEL_EXEC \ (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL) #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX) @@ -106,8 +109,8 @@ #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC) #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT) #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD) -#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER) -#define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_VSYSCALL | _PAGE_PCD | _PAGE_PWT) +#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER) +#define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_RO | _PAGE_PCD | _PAGE_PWT | _PAGE_USER) #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE) #define __PAGE_KERNEL_LARGE_NOCACHE (__PAGE_KERNEL | _PAGE_CACHE_UC | _PAGE_PSE) #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE) @@ -166,8 +169,8 @@ * bits are combined, this will alow user to access the high address mapped * VDSO in the presence of CONFIG_COMPAT_VDSO */ -#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */ -#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */ +#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */ +#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */ #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */ #endif @@ -205,7 +208,17 @@ { return native_pgd_val(pgd) & PTE_FLAGS_MASK; } +#endif +#if PAGETABLE_LEVELS == 3 +#include +#endif + +#if PAGETABLE_LEVELS == 2 +#include +#endif + +#ifndef __ASSEMBLY__ #if PAGETABLE_LEVELS > 3 typedef struct { pudval_t pud; } pud_t; @@ -219,8 +232,6 @@ return pud.pud; } #else -#include - static inline pudval_t native_pud_val(pud_t pud) { return native_pgd_val(pud.pgd); @@ -240,8 +251,6 @@ return pmd.pmd; } #else -#include - static inline pmdval_t native_pmd_val(pmd_t pmd) { return native_pgd_val(pmd.pud.pgd); @@ -281,7 +290,6 @@ extern pteval_t __supported_pte_mask; extern void set_nx(void); -extern int nx_enabled; #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); diff -uriN linux-2.6.38.4/arch/x86/include/asm/processor.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/processor.h --- linux-2.6.38.4/arch/x86/include/asm/processor.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/processor.h 2011-05-01 17:02:10.000000000 -0500 @@ -270,7 +270,7 @@ } ____cacheline_aligned; -DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss); +extern struct tss_struct init_tss[NR_CPUS]; /* * Save the original ist values for checking stack pointers during debugging @@ -864,8 +864,15 @@ */ #define TASK_SIZE PAGE_OFFSET #define TASK_SIZE_MAX TASK_SIZE + +#ifdef CONFIG_PAX_SEGMEXEC +#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2) +#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE) +#else #define STACK_TOP TASK_SIZE -#define STACK_TOP_MAX STACK_TOP +#endif + +#define STACK_TOP_MAX TASK_SIZE #define INIT_THREAD { \ .sp0 = sizeof(init_stack) + (long)&init_stack, \ @@ -882,7 +889,7 @@ */ #define INIT_TSS { \ .x86_tss = { \ - .sp0 = sizeof(init_stack) + (long)&init_stack, \ + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \ .ss0 = __KERNEL_DS, \ .ss1 = __KERNEL_CS, \ .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \ @@ -893,11 +900,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long)) -#define KSTK_TOP(info) \ -({ \ - unsigned long *__ptr = (unsigned long *)(info); \ - (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \ -}) +#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0) /* * The below -8 is to reserve 8 bytes on top of the ring0 stack. @@ -912,7 +915,7 @@ #define task_pt_regs(task) \ ({ \ struct pt_regs *__regs__; \ - __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \ + __regs__ = (struct pt_regs *)((task)->thread.sp0); \ __regs__ - 1; \ }) @@ -922,13 +925,13 @@ /* * User space process size. 47bits minus one guard page. */ -#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE) +#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE) /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \ - 0xc0000000 : 0xFFFFe000) + 0xc0000000 : 0xFFFFf000) #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \ IA32_PAGE_OFFSET : TASK_SIZE_MAX) @@ -965,6 +968,10 @@ */ #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) +#ifdef CONFIG_PAX_SEGMEXEC +#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3)) +#endif + #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/ptrace.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/ptrace.h --- linux-2.6.38.4/arch/x86/include/asm/ptrace.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/ptrace.h 2011-05-01 17:02:10.000000000 -0500 @@ -152,28 +152,29 @@ } /* - * user_mode_vm(regs) determines whether a register set came from user mode. + * user_mode(regs) determines whether a register set came from user mode. * This is true if V8086 mode was enabled OR if the register set was from * protected mode with RPL-3 CS value. This tricky test checks that with * one comparison. Many places in the kernel can bypass this full check - * if they have already ruled out V8086 mode, so user_mode(regs) can be used. + * if they have already ruled out V8086 mode, so user_mode_novm(regs) can + * be used. */ -static inline int user_mode(struct pt_regs *regs) +static inline int user_mode_novm(struct pt_regs *regs) { #ifdef CONFIG_X86_32 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL; #else - return !!(regs->cs & 3); + return !!(regs->cs & SEGMENT_RPL_MASK); #endif } -static inline int user_mode_vm(struct pt_regs *regs) +static inline int user_mode(struct pt_regs *regs) { #ifdef CONFIG_X86_32 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >= USER_RPL; #else - return user_mode(regs); + return user_mode_novm(regs); #endif } diff -uriN linux-2.6.38.4/arch/x86/include/asm/reboot.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/reboot.h --- linux-2.6.38.4/arch/x86/include/asm/reboot.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/reboot.h 2011-05-01 17:02:10.000000000 -0500 @@ -18,7 +18,7 @@ void native_machine_crash_shutdown(struct pt_regs *regs); void native_machine_shutdown(void); -void machine_real_restart(const unsigned char *code, int length); +void machine_real_restart(const unsigned char *code, unsigned int length); typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); diff -uriN linux-2.6.38.4/arch/x86/include/asm/rwsem.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/rwsem.h --- linux-2.6.38.4/arch/x86/include/asm/rwsem.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/rwsem.h 2011-05-01 17:02:10.000000000 -0500 @@ -118,6 +118,14 @@ { asm volatile("# beginning down_read\n\t" LOCK_PREFIX _ASM_INC "(%1)\n\t" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX _ASM_DEC "(%1)\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + /* adds 0x00000001 */ " jns 1f\n" " call call_rwsem_down_read_failed\n" @@ -139,6 +147,14 @@ "1:\n\t" " mov %1,%2\n\t" " add %3,%2\n\t" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + "sub %3,%2\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + " jle 2f\n\t" LOCK_PREFIX " cmpxchg %2,%0\n\t" " jnz 1b\n\t" @@ -158,6 +174,14 @@ rwsem_count_t tmp; asm volatile("# beginning down_write\n\t" LOCK_PREFIX " xadd %1,(%2)\n\t" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + "mov %1,(%2)\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + /* adds 0xffff0001, returns the old value */ " test %1,%1\n\t" /* was the count 0 before? */ @@ -196,6 +220,14 @@ rwsem_count_t tmp; asm volatile("# beginning __up_read\n\t" LOCK_PREFIX " xadd %1,(%2)\n\t" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + "mov %1,(%2)\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + /* subtracts 1, returns the old value */ " jns 1f\n\t" " call call_rwsem_wake\n" /* expects old value in %edx */ @@ -214,6 +246,14 @@ rwsem_count_t tmp; asm volatile("# beginning __up_write\n\t" LOCK_PREFIX " xadd %1,(%2)\n\t" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + "mov %1,(%2)\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + /* subtracts 0xffff0001, returns the old value */ " jns 1f\n\t" " call call_rwsem_wake\n" /* expects old value in %edx */ @@ -231,6 +271,14 @@ { asm volatile("# beginning __downgrade_write\n\t" LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX _ASM_SUB "%2,(%1)\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + /* * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386) * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64) @@ -250,7 +298,15 @@ static inline void rwsem_atomic_add(rwsem_count_t delta, struct rw_semaphore *sem) { - asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0" + asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX _ASM_SUB "%1,%0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + : "+m" (sem->count) : "er" (delta)); } @@ -263,7 +319,15 @@ { rwsem_count_t tmp = delta; - asm volatile(LOCK_PREFIX "xadd %0,%1" + asm volatile(LOCK_PREFIX "xadd %0,%1\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + "mov %0,%1\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + : "+r" (tmp), "+m" (sem->count) : : "memory"); diff -uriN linux-2.6.38.4/arch/x86/include/asm/segment.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/segment.h --- linux-2.6.38.4/arch/x86/include/asm/segment.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/segment.h 2011-05-01 17:02:10.000000000 -0500 @@ -62,8 +62,8 @@ * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] * 28 - stack_canary-20 [ for stack protector ] - * 29 - unused - * 30 - unused + * 29 - PCI BIOS CS + * 30 - PCI BIOS DS * 31 - TSS for double fault handler */ #define GDT_ENTRY_TLS_MIN 6 @@ -77,6 +77,8 @@ #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0) +#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4) + #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1) #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4) @@ -102,6 +104,12 @@ #define __KERNEL_STACK_CANARY 0 #endif +#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17) +#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8) + +#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18) +#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8) + #define GDT_ENTRY_DOUBLEFAULT_TSS 31 /* @@ -139,7 +147,7 @@ */ /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */ -#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8) +#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16) #else @@ -163,6 +171,8 @@ #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS * 8 + 3) #define __USER32_DS __USER_DS +#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7 + #define GDT_ENTRY_TSS 8 /* needs two entries */ #define GDT_ENTRY_LDT 10 /* needs two entries */ #define GDT_ENTRY_TLS_MIN 12 @@ -183,6 +193,7 @@ #endif #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8) +#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8) #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8) #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3) #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3) diff -uriN linux-2.6.38.4/arch/x86/include/asm/smp.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/smp.h --- linux-2.6.38.4/arch/x86/include/asm/smp.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/smp.h 2011-05-01 17:02:10.000000000 -0500 @@ -24,7 +24,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map); DECLARE_PER_CPU(cpumask_var_t, cpu_core_map); DECLARE_PER_CPU(u16, cpu_llc_id); -DECLARE_PER_CPU(int, cpu_number); +DECLARE_PER_CPU(unsigned int, cpu_number); static inline struct cpumask *cpu_sibling_mask(int cpu) { @@ -172,14 +172,8 @@ extern int safe_smp_processor_id(void); #elif defined(CONFIG_X86_64_SMP) -#define raw_smp_processor_id() (percpu_read(cpu_number)) - -#define stack_smp_processor_id() \ -({ \ - struct thread_info *ti; \ - __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \ - ti->cpu; \ -}) +#define raw_smp_processor_id() (percpu_read(cpu_number)) +#define stack_smp_processor_id() raw_smp_processor_id() #define safe_smp_processor_id() smp_processor_id() #endif diff -uriN linux-2.6.38.4/arch/x86/include/asm/spinlock.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/spinlock.h --- linux-2.6.38.4/arch/x86/include/asm/spinlock.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/spinlock.h 2011-05-01 17:02:10.000000000 -0500 @@ -249,6 +249,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw) { asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX " addl $1,(%0)\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + "jns 1f\n" "call __read_lock_failed\n\t" "1:\n" @@ -258,6 +266,14 @@ static inline void arch_write_lock(arch_rwlock_t *rw) { asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX " addl %1,(%0)\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + "jz 1f\n" "call __write_lock_failed\n\t" "1:\n" @@ -286,12 +302,29 @@ static inline void arch_read_unlock(arch_rwlock_t *rw) { - asm volatile(LOCK_PREFIX "incl %0" :"+m" (rw->lock) : : "memory"); + asm volatile(LOCK_PREFIX "incl %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "decl %0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + + :"+m" (rw->lock) : : "memory"); } static inline void arch_write_unlock(arch_rwlock_t *rw) { - asm volatile(LOCK_PREFIX "addl %1, %0" + asm volatile(LOCK_PREFIX "addl %1, %0\n" + +#ifdef CONFIG_PAX_REFCOUNT + "jno 0f\n" + LOCK_PREFIX "subl %1, %0\n" + "int $4\n0:\n" + _ASM_EXTABLE(0b, 0b) +#endif + : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } diff -uriN linux-2.6.38.4/arch/x86/include/asm/stackprotector.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/stackprotector.h --- linux-2.6.38.4/arch/x86/include/asm/stackprotector.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/stackprotector.h 2011-05-01 17:02:10.000000000 -0500 @@ -113,7 +113,7 @@ static inline void load_stack_canary_segment(void) { -#ifdef CONFIG_X86_32 +#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF) asm volatile ("mov %0, %%gs" : : "r" (0)); #endif } diff -uriN linux-2.6.38.4/arch/x86/include/asm/stacktrace.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/stacktrace.h --- linux-2.6.38.4/arch/x86/include/asm/stacktrace.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/stacktrace.h 2011-05-01 17:02:10.000000000 -0500 @@ -11,28 +11,20 @@ extern int kstack_depth_to_print; -struct thread_info; +struct task_struct; struct stacktrace_ops; -typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo, - unsigned long *stack, - unsigned long bp, - const struct stacktrace_ops *ops, - void *data, - unsigned long *end, - int *graph); - -extern unsigned long -print_context_stack(struct thread_info *tinfo, - unsigned long *stack, unsigned long bp, - const struct stacktrace_ops *ops, void *data, - unsigned long *end, int *graph); - -extern unsigned long -print_context_stack_bp(struct thread_info *tinfo, - unsigned long *stack, unsigned long bp, - const struct stacktrace_ops *ops, void *data, - unsigned long *end, int *graph); +typedef unsigned long walk_stack_t(struct task_struct *task, + void *stack_start, + unsigned long *stack, + unsigned long bp, + const struct stacktrace_ops *ops, + void *data, + unsigned long *end, + int *graph); + +extern walk_stack_t print_context_stack; +extern walk_stack_t print_context_stack_bp; /* Generic stack tracer with callbacks */ @@ -43,7 +35,7 @@ void (*address)(void *data, unsigned long address, int reliable); /* On negative return stop dumping */ int (*stack)(void *data, char *name); - walk_stack_t walk_stack; + walk_stack_t *walk_stack; }; void dump_trace(struct task_struct *tsk, struct pt_regs *regs, diff -uriN linux-2.6.38.4/arch/x86/include/asm/system.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/system.h --- linux-2.6.38.4/arch/x86/include/asm/system.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/system.h 2011-05-01 17:02:10.000000000 -0500 @@ -131,7 +131,7 @@ "call __switch_to\n\t" \ "movq "__percpu_arg([current_task])",%%rsi\n\t" \ __switch_canary \ - "movq %P[thread_info](%%rsi),%%r8\n\t" \ + "movq "__percpu_arg([thread_info])",%%r8\n\t" \ "movq %%rax,%%rdi\n\t" \ "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \ "jnz ret_from_fork\n\t" \ @@ -142,7 +142,7 @@ [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \ [ti_flags] "i" (offsetof(struct thread_info, flags)), \ [_tif_fork] "i" (_TIF_FORK), \ - [thread_info] "i" (offsetof(struct task_struct, stack)), \ + [thread_info] "m" (current_tinfo), \ [current_task] "m" (current_task) \ __switch_canary_iparam \ : "memory", "cc" __EXTRA_CLOBBER) @@ -202,7 +202,7 @@ { unsigned long __limit; asm("lsll %1,%0" : "=r" (__limit) : "r" (segment)); - return __limit + 1; + return __limit; } static inline void native_clts(void) @@ -342,7 +342,7 @@ void cpu_idle_wait(void); -extern unsigned long arch_align_stack(unsigned long sp); +#define arch_align_stack(x) ((x) & ~0xfUL) extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); diff -uriN linux-2.6.38.4/arch/x86/include/asm/thread_info.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/thread_info.h --- linux-2.6.38.4/arch/x86/include/asm/thread_info.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/thread_info.h 2011-05-01 17:02:10.000000000 -0500 @@ -10,6 +10,7 @@ #include #include #include +#include /* * low level task data that entry.S needs immediate access to @@ -24,7 +25,6 @@ #include struct thread_info { - struct task_struct *task; /* main task structure */ struct exec_domain *exec_domain; /* execution domain */ __u32 flags; /* low level flags */ __u32 status; /* thread synchronous flags */ @@ -34,18 +34,11 @@ mm_segment_t addr_limit; struct restart_block restart_block; void __user *sysenter_return; -#ifdef CONFIG_X86_32 - unsigned long previous_esp; /* ESP of the previous stack in - case of nested (IRQ) stacks - */ - __u8 supervisor_stack[0]; -#endif int uaccess_err; }; -#define INIT_THREAD_INFO(tsk) \ +#define INIT_THREAD_INFO \ { \ - .task = &tsk, \ .exec_domain = &default_exec_domain, \ .flags = 0, \ .cpu = 0, \ @@ -56,7 +49,7 @@ }, \ } -#define init_thread_info (init_thread_union.thread_info) +#define init_thread_info (init_task.tinfo) #define init_stack (init_thread_union.stack) #else /* !__ASSEMBLY__ */ @@ -164,6 +157,23 @@ #define alloc_thread_info(tsk) \ ((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER)) +#ifdef __ASSEMBLY__ +/* how to get the thread information struct from ASM */ +#define GET_THREAD_INFO(reg) \ + mov PER_CPU_VAR(current_tinfo), reg + +/* use this one if reg already contains %esp */ +#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg) +#else +/* how to get the thread information struct from C */ +DECLARE_PER_CPU(struct thread_info *, current_tinfo); + +static __always_inline struct thread_info *current_thread_info(void) +{ + return percpu_read_stable(current_tinfo); +} +#endif + #ifdef CONFIG_X86_32 #define STACK_WARN (THREAD_SIZE/8) @@ -174,35 +184,13 @@ */ #ifndef __ASSEMBLY__ - /* how to get the current stack pointer from C */ register unsigned long current_stack_pointer asm("esp") __used; -/* how to get the thread information struct from C */ -static inline struct thread_info *current_thread_info(void) -{ - return (struct thread_info *) - (current_stack_pointer & ~(THREAD_SIZE - 1)); -} - -#else /* !__ASSEMBLY__ */ - -/* how to get the thread information struct from ASM */ -#define GET_THREAD_INFO(reg) \ - movl $-THREAD_SIZE, reg; \ - andl %esp, reg - -/* use this one if reg already contains %esp */ -#define GET_THREAD_INFO_WITH_ESP(reg) \ - andl $-THREAD_SIZE, reg - #endif #else /* X86_32 */ -#include -#define KERNEL_STACK_OFFSET (5*8) - /* * macros/functions for gaining access to the thread information structure * preempt_count needs to be 1 initially, until the scheduler is functional. @@ -210,21 +198,6 @@ #ifndef __ASSEMBLY__ DECLARE_PER_CPU(unsigned long, kernel_stack); -static inline struct thread_info *current_thread_info(void) -{ - struct thread_info *ti; - ti = (void *)(percpu_read_stable(kernel_stack) + - KERNEL_STACK_OFFSET - THREAD_SIZE); - return ti; -} - -#else /* !__ASSEMBLY__ */ - -/* how to get the thread information struct from ASM */ -#define GET_THREAD_INFO(reg) \ - movq PER_CPU_VAR(kernel_stack),reg ; \ - subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg - #endif #endif /* !X86_32 */ @@ -260,5 +233,16 @@ extern void free_thread_info(struct thread_info *ti); extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src); #define arch_task_cache_init arch_task_cache_init + +#define __HAVE_THREAD_FUNCTIONS +#define task_thread_info(task) (&(task)->tinfo) +#define task_stack_page(task) ((task)->stack) +#define setup_thread_stack(p, org) do {} while (0) +#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1) + +#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR +extern struct task_struct *alloc_task_struct(void); +extern void free_task_struct(struct task_struct *); + #endif #endif /* _ASM_X86_THREAD_INFO_H */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/uaccess_32.h --- linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/uaccess_32.h 2011-05-01 17:02:10.000000000 -0500 @@ -44,6 +44,9 @@ static __always_inline unsigned long __must_check __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) { + if ((long)n < 0) + return n; + if (__builtin_constant_p(n)) { unsigned long ret; @@ -62,6 +65,8 @@ return ret; } } + if (!__builtin_constant_p(n)) + check_object_size(from, n, true); return __copy_to_user_ll(to, from, n); } @@ -89,6 +94,9 @@ static __always_inline unsigned long __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) { + if ((long)n < 0) + return n; + /* Avoid zeroing the tail if the copy fails.. * If 'n' is constant and 1, 2, or 4, we do still zero on a failure, * but as the zeroing behaviour is only significant when n is not @@ -138,6 +146,10 @@ __copy_from_user(void *to, const void __user *from, unsigned long n) { might_fault(); + + if ((long)n < 0) + return n; + if (__builtin_constant_p(n)) { unsigned long ret; @@ -153,6 +165,8 @@ return ret; } } + if (!__builtin_constant_p(n)) + check_object_size(to, n, false); return __copy_from_user_ll(to, from, n); } @@ -160,6 +174,10 @@ const void __user *from, unsigned long n) { might_fault(); + + if ((long)n < 0) + return n; + if (__builtin_constant_p(n)) { unsigned long ret; @@ -182,15 +200,19 @@ __copy_from_user_inatomic_nocache(void *to, const void __user *from, unsigned long n) { - return __copy_from_user_ll_nocache_nozero(to, from, n); -} + if ((long)n < 0) + return n; -unsigned long __must_check copy_to_user(void __user *to, - const void *from, unsigned long n); -unsigned long __must_check _copy_from_user(void *to, - const void __user *from, - unsigned long n); + return __copy_from_user_ll_nocache_nozero(to, from, n); +} +extern void copy_to_user_overflow(void) +#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS + __compiletime_error("copy_to_user() buffer size is not provably correct") +#else + __compiletime_warning("copy_to_user() buffer size is not provably correct") +#endif +; extern void copy_from_user_overflow(void) #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS @@ -200,17 +222,61 @@ #endif ; -static inline unsigned long __must_check copy_from_user(void *to, - const void __user *from, - unsigned long n) +/** + * copy_to_user: - Copy a block of data into user space. + * @to: Destination address, in user space. + * @from: Source address, in kernel space. + * @n: Number of bytes to copy. + * + * Context: User context only. This function may sleep. + * + * Copy data from kernel space to user space. + * + * Returns number of bytes that could not be copied. + * On success, this will be zero. + */ +static inline unsigned long __must_check +copy_to_user(void __user *to, const void *from, unsigned long n) +{ + int sz = __compiletime_object_size(from); + + if (unlikely(sz != -1 && sz < n)) + copy_to_user_overflow(); + else if (access_ok(VERIFY_WRITE, to, n)) + n = __copy_to_user(to, from, n); + return n; +} + +/** + * copy_from_user: - Copy a block of data from user space. + * @to: Destination address, in kernel space. + * @from: Source address, in user space. + * @n: Number of bytes to copy. + * + * Context: User context only. This function may sleep. + * + * Copy data from user space to kernel space. + * + * Returns number of bytes that could not be copied. + * On success, this will be zero. + * + * If some data could not be copied, this function will pad the copied + * data to the requested size using zero bytes. + */ +static inline unsigned long __must_check +copy_from_user(void *to, const void __user *from, unsigned long n) { int sz = __compiletime_object_size(to); - if (likely(sz == -1 || sz >= n)) - n = _copy_from_user(to, from, n); - else + if (unlikely(sz != -1 && sz < n)) copy_from_user_overflow(); - + else if (access_ok(VERIFY_READ, from, n)) + n = __copy_from_user(to, from, n); + else if ((long)n > 0) { + if (!__builtin_constant_p(n)) + check_object_size(to, n, false); + memset(to, 0, n); + } return n; } diff -uriN linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/uaccess_64.h --- linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/uaccess_64.h 2011-05-01 17:02:10.000000000 -0500 @@ -11,6 +11,9 @@ #include #include #include +#include + +#define set_fs(x) (current_thread_info()->addr_limit = (x)) /* * Copy To/From Userspace @@ -37,26 +40,26 @@ return ret; } -__must_check unsigned long -_copy_to_user(void __user *to, const void *from, unsigned len); -__must_check unsigned long -_copy_from_user(void *to, const void __user *from, unsigned len); +static __always_inline __must_check unsigned long +__copy_to_user(void __user *to, const void *from, unsigned len); +static __always_inline __must_check unsigned long +__copy_from_user(void *to, const void __user *from, unsigned len); __must_check unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len); static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, - unsigned long n) + unsigned n) { - int sz = __compiletime_object_size(to); - might_fault(); - if (likely(sz == -1 || sz >= n)) - n = _copy_from_user(to, from, n); -#ifdef CONFIG_DEBUG_VM - else - WARN(1, "Buffer overflow detected!\n"); -#endif + + if (access_ok(VERIFY_READ, from, n)) + n = __copy_from_user(to, from, n); + else if ((int)n > 0) { + if (!__builtin_constant_p(n)) + check_object_size(to, n, false); + memset(to, 0, n); + } return n; } @@ -65,110 +68,174 @@ { might_fault(); - return _copy_to_user(dst, src, size); + if (access_ok(VERIFY_WRITE, dst, size)) + size = __copy_to_user(dst, src, size); + return size; } static __always_inline __must_check -int __copy_from_user(void *dst, const void __user *src, unsigned size) +unsigned long __copy_from_user(void *dst, const void __user *src, unsigned size) { - int ret = 0; + int sz = __compiletime_object_size(dst); + unsigned ret = 0; might_fault(); - if (!__builtin_constant_p(size)) - return copy_user_generic(dst, (__force void *)src, size); + + if ((int)size < 0) + return size; + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if (!__access_ok(VERIFY_READ, src, size)) + return size; +#endif + + if (unlikely(sz != -1 && sz < size)) { +#ifdef CONFIG_DEBUG_VM + WARN(1, "Buffer overflow detected!\n"); +#endif + return size; + } + + if (!__builtin_constant_p(size)) { + check_object_size(dst, size, false); + if ((unsigned long)src < PAX_USER_SHADOW_BASE) + src += PAX_USER_SHADOW_BASE; + return copy_user_generic(dst, (__force const void *)src, size); + } switch (size) { - case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src, + case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src, ret, "b", "b", "=q", 1); return ret; - case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src, + case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src, ret, "w", "w", "=r", 2); return ret; - case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src, + case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src, ret, "l", "k", "=r", 4); return ret; - case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src, + case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src, ret, "q", "", "=r", 8); return ret; case 10: - __get_user_asm(*(u64 *)dst, (u64 __user *)src, + __get_user_asm(*(u64 *)dst, (const u64 __user *)src, ret, "q", "", "=r", 10); if (unlikely(ret)) return ret; __get_user_asm(*(u16 *)(8 + (char *)dst), - (u16 __user *)(8 + (char __user *)src), + (const u16 __user *)(8 + (const char __user *)src), ret, "w", "w", "=r", 2); return ret; case 16: - __get_user_asm(*(u64 *)dst, (u64 __user *)src, + __get_user_asm(*(u64 *)dst, (const u64 __user *)src, ret, "q", "", "=r", 16); if (unlikely(ret)) return ret; __get_user_asm(*(u64 *)(8 + (char *)dst), - (u64 __user *)(8 + (char __user *)src), + (const u64 __user *)(8 + (const char __user *)src), ret, "q", "", "=r", 8); return ret; default: - return copy_user_generic(dst, (__force void *)src, size); + if ((unsigned long)src < PAX_USER_SHADOW_BASE) + src += PAX_USER_SHADOW_BASE; + return copy_user_generic(dst, (__force const void *)src, size); } } static __always_inline __must_check -int __copy_to_user(void __user *dst, const void *src, unsigned size) +unsigned long __copy_to_user(void __user *dst, const void *src, unsigned size) { - int ret = 0; + int sz = __compiletime_object_size(src); + unsigned ret = 0; might_fault(); - if (!__builtin_constant_p(size)) + + if ((int)size < 0) + return size; + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if (!__access_ok(VERIFY_WRITE, dst, size)) + return size; +#endif + + if (unlikely(sz != -1 && sz < size)) { +#ifdef CONFIG_DEBUG_VM + WARN(1, "Buffer overflow detected!\n"); +#endif + return size; + } + + if (!__builtin_constant_p(size)) { + check_object_size(src, size, true); + if ((unsigned long)dst < PAX_USER_SHADOW_BASE) + dst += PAX_USER_SHADOW_BASE; return copy_user_generic((__force void *)dst, src, size); + } switch (size) { - case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst, + case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst, ret, "b", "b", "iq", 1); return ret; - case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst, + case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst, ret, "w", "w", "ir", 2); return ret; - case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst, + case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst, ret, "l", "k", "ir", 4); return ret; - case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst, + case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst, ret, "q", "", "er", 8); return ret; case 10: - __put_user_asm(*(u64 *)src, (u64 __user *)dst, + __put_user_asm(*(const u64 *)src, (u64 __user *)dst, ret, "q", "", "er", 10); if (unlikely(ret)) return ret; asm("":::"memory"); - __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst, + __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst, ret, "w", "w", "ir", 2); return ret; case 16: - __put_user_asm(*(u64 *)src, (u64 __user *)dst, + __put_user_asm(*(const u64 *)src, (u64 __user *)dst, ret, "q", "", "er", 16); if (unlikely(ret)) return ret; asm("":::"memory"); - __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst, + __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst, ret, "q", "", "er", 8); return ret; default: + if ((unsigned long)dst < PAX_USER_SHADOW_BASE) + dst += PAX_USER_SHADOW_BASE; return copy_user_generic((__force void *)dst, src, size); } } static __always_inline __must_check -int __copy_in_user(void __user *dst, const void __user *src, unsigned size) +unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size) { - int ret = 0; + unsigned ret = 0; might_fault(); - if (!__builtin_constant_p(size)) + + if ((int)size < 0) + return size; + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if (!__access_ok(VERIFY_READ, src, size)) + return size; + if (!__access_ok(VERIFY_WRITE, dst, size)) + return size; +#endif + + if (!__builtin_constant_p(size)) { + if ((unsigned long)src < PAX_USER_SHADOW_BASE) + src += PAX_USER_SHADOW_BASE; + if ((unsigned long)dst < PAX_USER_SHADOW_BASE) + dst += PAX_USER_SHADOW_BASE; return copy_user_generic((__force void *)dst, - (__force void *)src, size); + (__force const void *)src, size); + } switch (size) { case 1: { u8 tmp; - __get_user_asm(tmp, (u8 __user *)src, + __get_user_asm(tmp, (const u8 __user *)src, ret, "b", "b", "=q", 1); if (likely(!ret)) __put_user_asm(tmp, (u8 __user *)dst, @@ -177,7 +244,7 @@ } case 2: { u16 tmp; - __get_user_asm(tmp, (u16 __user *)src, + __get_user_asm(tmp, (const u16 __user *)src, ret, "w", "w", "=r", 2); if (likely(!ret)) __put_user_asm(tmp, (u16 __user *)dst, @@ -187,7 +254,7 @@ case 4: { u32 tmp; - __get_user_asm(tmp, (u32 __user *)src, + __get_user_asm(tmp, (const u32 __user *)src, ret, "l", "k", "=r", 4); if (likely(!ret)) __put_user_asm(tmp, (u32 __user *)dst, @@ -196,7 +263,7 @@ } case 8: { u64 tmp; - __get_user_asm(tmp, (u64 __user *)src, + __get_user_asm(tmp, (const u64 __user *)src, ret, "q", "", "=r", 8); if (likely(!ret)) __put_user_asm(tmp, (u64 __user *)dst, @@ -204,8 +271,12 @@ return ret; } default: + if ((unsigned long)src < PAX_USER_SHADOW_BASE) + src += PAX_USER_SHADOW_BASE; + if ((unsigned long)dst < PAX_USER_SHADOW_BASE) + dst += PAX_USER_SHADOW_BASE; return copy_user_generic((__force void *)dst, - (__force void *)src, size); + (__force const void *)src, size); } } @@ -222,33 +293,68 @@ static __must_check __always_inline int __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size) { + if ((int)size < 0) + return size; + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if (!__access_ok(VERIFY_READ, src, size)) + return size; +#endif + + if ((unsigned long)src < PAX_USER_SHADOW_BASE) + src += PAX_USER_SHADOW_BASE; return copy_user_generic(dst, (__force const void *)src, size); } -static __must_check __always_inline int +static __must_check __always_inline unsigned long __copy_to_user_inatomic(void __user *dst, const void *src, unsigned size) { + if ((int)size < 0) + return size; + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if (!__access_ok(VERIFY_WRITE, dst, size)) + return size; +#endif + + if ((unsigned long)dst < PAX_USER_SHADOW_BASE) + dst += PAX_USER_SHADOW_BASE; return copy_user_generic((__force void *)dst, src, size); } -extern long __copy_user_nocache(void *dst, const void __user *src, +extern unsigned long __copy_user_nocache(void *dst, const void __user *src, unsigned size, int zerorest); -static inline int -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size) +static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned size) { might_sleep(); + + if ((int)size < 0) + return size; + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if (!__access_ok(VERIFY_READ, src, size)) + return size; +#endif + return __copy_user_nocache(dst, src, size, 1); } -static inline int -__copy_from_user_inatomic_nocache(void *dst, const void __user *src, +static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src, unsigned size) { + if ((int)size < 0) + return size; + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if (!__access_ok(VERIFY_READ, src, size)) + return size; +#endif + return __copy_user_nocache(dst, src, size, 0); } -unsigned long +extern unsigned long copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/uaccess.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/uaccess.h --- linux-2.6.38.4/arch/x86/include/asm/uaccess.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/uaccess.h 2011-05-01 17:02:10.000000000 -0500 @@ -8,12 +8,15 @@ #include #include #include +#include #include #include #define VERIFY_READ 0 #define VERIFY_WRITE 1 +extern void check_object_size(const void *ptr, unsigned long n, bool to); + /* * The fs value determines whether argument validity checking should be * performed or not. If get_fs() == USER_DS, checking is performed, with @@ -29,7 +32,12 @@ #define get_ds() (KERNEL_DS) #define get_fs() (current_thread_info()->addr_limit) +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) +void __set_fs(mm_segment_t x); +void set_fs(mm_segment_t x); +#else #define set_fs(x) (current_thread_info()->addr_limit = (x)) +#endif #define segment_eq(a, b) ((a).seg == (b).seg) @@ -77,7 +85,33 @@ * checks that the pointer is in the user space range - after calling * this function, memory access functions may still return -EFAULT. */ -#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0)) +#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0)) +#define access_ok(type, addr, size) \ +({ \ + long __size = size; \ + unsigned long __addr = (unsigned long)addr; \ + unsigned long __addr_ao = __addr & PAGE_MASK; \ + unsigned long __end_ao = __addr + __size - 1; \ + bool __ret_ao = __range_not_ok(__addr, __size) == 0; \ + if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \ + while(__addr_ao <= __end_ao) { \ + char __c_ao; \ + __addr_ao += PAGE_SIZE; \ + if (__size > PAGE_SIZE) \ + cond_resched(); \ + if (__get_user(__c_ao, (char __user *)__addr)) \ + break; \ + if (type != VERIFY_WRITE) { \ + __addr = __addr_ao; \ + continue; \ + } \ + if (__put_user(__c_ao, (char __user *)__addr)) \ + break; \ + __addr = __addr_ao; \ + } \ + } \ + __ret_ao; \ +}) /* * The exception table consists of pairs of addresses: the first is the @@ -183,12 +217,20 @@ asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") - +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) +#define __copyuser_seg "gs;" +#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n" +#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n" +#else +#define __copyuser_seg +#define __COPYUSER_SET_ES +#define __COPYUSER_RESTORE_ES +#endif #ifdef CONFIG_X86_32 #define __put_user_asm_u64(x, addr, err, errret) \ - asm volatile("1: movl %%eax,0(%2)\n" \ - "2: movl %%edx,4(%2)\n" \ + asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \ + "2: "__copyuser_seg"movl %%edx,4(%2)\n" \ "3:\n" \ ".section .fixup,\"ax\"\n" \ "4: movl %3,%0\n" \ @@ -200,8 +242,8 @@ : "A" (x), "r" (addr), "i" (errret), "0" (err)) #define __put_user_asm_ex_u64(x, addr) \ - asm volatile("1: movl %%eax,0(%1)\n" \ - "2: movl %%edx,4(%1)\n" \ + asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \ + "2: "__copyuser_seg"movl %%edx,4(%1)\n" \ "3:\n" \ _ASM_EXTABLE(1b, 2b - 1b) \ _ASM_EXTABLE(2b, 3b - 2b) \ @@ -374,7 +416,7 @@ } while (0) #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ - asm volatile("1: mov"itype" %2,%"rtype"1\n" \ + asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\ "2:\n" \ ".section .fixup,\"ax\"\n" \ "3: mov %3,%0\n" \ @@ -382,7 +424,7 @@ " jmp 2b\n" \ ".previous\n" \ _ASM_EXTABLE(1b, 3b) \ - : "=r" (err), ltype(x) \ + : "=r" (err), ltype (x) \ : "m" (__m(addr)), "i" (errret), "0" (err)) #define __get_user_size_ex(x, ptr, size) \ @@ -407,7 +449,7 @@ } while (0) #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ - asm volatile("1: mov"itype" %1,%"rtype"0\n" \ + asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\ "2:\n" \ _ASM_EXTABLE(1b, 2b - 1b) \ : ltype(x) : "m" (__m(addr))) @@ -424,13 +466,24 @@ int __gu_err; \ unsigned long __gu_val; \ __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ - (x) = (__force __typeof__(*(ptr)))__gu_val; \ + (x) = (__typeof__(*(ptr)))__gu_val; \ __gu_err; \ }) /* FIXME: this hack is definitely wrong -AK */ struct __large_struct { unsigned long buf[100]; }; -#define __m(x) (*(struct __large_struct __user *)(x)) +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) +#define ____m(x) \ +({ \ + unsigned long ____x = (unsigned long)(x); \ + if (____x < PAX_USER_SHADOW_BASE) \ + ____x += PAX_USER_SHADOW_BASE; \ + (void __user *)____x; \ +}) +#else +#define ____m(x) (x) +#endif +#define __m(x) (*(struct __large_struct __user *)____m(x)) /* * Tell gcc we read from memory instead of writing: this is because @@ -438,7 +491,7 @@ * aliasing issues. */ #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ - asm volatile("1: mov"itype" %"rtype"1,%2\n" \ + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\ "2:\n" \ ".section .fixup,\"ax\"\n" \ "3: mov %3,%0\n" \ @@ -446,10 +499,10 @@ ".previous\n" \ _ASM_EXTABLE(1b, 3b) \ : "=r"(err) \ - : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err)) + : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err)) #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \ - asm volatile("1: mov"itype" %"rtype"0,%1\n" \ + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\ "2:\n" \ _ASM_EXTABLE(1b, 2b - 1b) \ : : ltype(x), "m" (__m(addr))) @@ -488,8 +541,12 @@ * On error, the variable @x is set to zero. */ +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) +#define __get_user(x, ptr) get_user((x), (ptr)) +#else #define __get_user(x, ptr) \ __get_user_nocheck((x), (ptr), sizeof(*(ptr))) +#endif /** * __put_user: - Write a simple value into user space, with less checking. @@ -511,8 +568,12 @@ * Returns zero on success, or -EFAULT on error. */ +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) +#define __put_user(x, ptr) put_user((x), (ptr)) +#else #define __put_user(x, ptr) \ __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) +#endif #define __get_user_unaligned __get_user #define __put_user_unaligned __put_user @@ -530,7 +591,7 @@ #define get_user_ex(x, ptr) do { \ unsigned long __gue_val; \ __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \ - (x) = (__force __typeof__(*(ptr)))__gue_val; \ + (x) = (__typeof__(*(ptr)))__gue_val; \ } while (0) #ifdef CONFIG_X86_WP_WORKS_OK @@ -567,6 +628,7 @@ #define ARCH_HAS_NOCACHE_UACCESS 1 +#define ARCH_HAS_SORT_EXTABLE #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else diff -uriN linux-2.6.38.4/arch/x86/include/asm/unistd_64.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/unistd_64.h --- linux-2.6.38.4/arch/x86/include/asm/unistd_64.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/unistd_64.h 2011-05-01 17:01:51.000000000 -0500 @@ -535,7 +535,7 @@ #define __NR_utimes 235 __SYSCALL(__NR_utimes, sys_utimes) #define __NR_vserver 236 -__SYSCALL(__NR_vserver, sys_ni_syscall) +__SYSCALL(__NR_vserver, sys_vserver) #define __NR_mbind 237 __SYSCALL(__NR_mbind, sys_mbind) #define __NR_set_mempolicy 238 diff -uriN linux-2.6.38.4/arch/x86/include/asm/vgtod.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/vgtod.h --- linux-2.6.38.4/arch/x86/include/asm/vgtod.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/vgtod.h 2011-05-01 17:02:10.000000000 -0500 @@ -14,6 +14,7 @@ int sysctl_enabled; struct timezone sys_tz; struct { /* extract of a clocksource struct */ + char name[8]; cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; diff -uriN linux-2.6.38.4/arch/x86/include/asm/vsyscall.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/vsyscall.h --- linux-2.6.38.4/arch/x86/include/asm/vsyscall.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/vsyscall.h 2011-05-01 17:02:10.000000000 -0500 @@ -15,9 +15,10 @@ #ifdef __KERNEL__ #include +#include +#include #define __section_vgetcpu_mode __attribute__ ((unused, __section__ (".vgetcpu_mode"), aligned(16))) -#define __section_jiffies __attribute__ ((unused, __section__ (".jiffies"), aligned(16))) /* Definitions for CONFIG_GENERIC_TIME definitions */ #define __section_vsyscall_gtod_data __attribute__ \ @@ -31,7 +32,6 @@ #define VGETCPU_LSL 2 extern int __vgetcpu_mode; -extern volatile unsigned long __jiffies; /* kernel space (writeable) */ extern int vgetcpu_mode; @@ -39,6 +39,9 @@ extern void map_vsyscall(void); +extern int vgettimeofday(struct timeval * tv, struct timezone * tz); +extern time_t vtime(time_t *t); +extern long vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache); #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ diff -uriN linux-2.6.38.4/arch/x86/include/asm/xsave.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/xsave.h --- linux-2.6.38.4/arch/x86/include/asm/xsave.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/include/asm/xsave.h 2011-05-01 17:02:10.000000000 -0500 @@ -65,6 +65,11 @@ { int err; +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + if ((unsigned long)buf < PAX_USER_SHADOW_BASE) + buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE); +#endif + /* * Clear the xsave header first, so that reserved fields are * initialized to zero. @@ -100,6 +105,11 @@ u32 lmask = mask; u32 hmask = mask >> 32; +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + if ((unsigned long)xstate < PAX_USER_SHADOW_BASE) + xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE); +#endif + __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" "2:\n" ".section .fixup,\"ax\"\n" diff -uriN linux-2.6.38.4/arch/x86/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/Kconfig --- linux-2.6.38.4/arch/x86/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/Kconfig 2011-05-01 17:02:10.000000000 -0500 @@ -223,7 +223,7 @@ config X86_32_LAZY_GS def_bool y - depends on X86_32 && !CC_STACKPROTECTOR + depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF config ARCH_HWEIGHT_CFLAGS string @@ -1019,7 +1019,7 @@ config NOHIGHMEM bool "off" - depends on !X86_NUMAQ + depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE) ---help--- Linux can use up to 64 Gigabytes of physical memory on x86 systems. However, the address space of 32-bit x86 processors is only 4 @@ -1056,7 +1056,7 @@ config HIGHMEM4G bool "4GB" - depends on !X86_NUMAQ + depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE) ---help--- Select this if you have a 32-bit processor and between 1 and 4 gigabytes of physical RAM. @@ -1110,7 +1110,7 @@ hex default 0xB0000000 if VMSPLIT_3G_OPT default 0x80000000 if VMSPLIT_2G - default 0x78000000 if VMSPLIT_2G_OPT + default 0x70000000 if VMSPLIT_2G_OPT default 0x40000000 if VMSPLIT_1G default 0xC0000000 depends on X86_32 @@ -1454,7 +1454,7 @@ config EFI bool "EFI runtime service support" - depends on ACPI + depends on ACPI && !PAX_KERNEXEC ---help--- This enables the kernel to use EFI runtime services that are available (such as the EFI variable services). @@ -1484,6 +1484,7 @@ config CC_STACKPROTECTOR bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" + depends on X86_64 || !PAX_MEMORY_UDEREF ---help--- This option turns on the -fstack-protector GCC feature. This feature puts, at the beginning of functions, a canary value on @@ -1541,6 +1542,7 @@ config PHYSICAL_START hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP) default "0x1000000" + range 0x400000 0x40000000 ---help--- This gives the physical address where the kernel is loaded. @@ -1604,6 +1606,7 @@ config PHYSICAL_ALIGN hex "Alignment value to which kernel should be aligned" if X86_32 default "0x1000000" + range 0x400000 0x1000000 if PAX_KERNEXEC range 0x2000 0x1000000 ---help--- This value puts the alignment restrictions on physical address @@ -1635,9 +1638,10 @@ Say N if you want to disable CPU hotplug. config COMPAT_VDSO - def_bool y + def_bool n prompt "Compat VDSO support" depends on X86_32 || IA32_EMULATION + depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF ---help--- Map the 32-bit VDSO to the predictable old-style address too. @@ -2159,6 +2163,8 @@ source "arch/x86/Kconfig.debug" +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" diff -uriN linux-2.6.38.4/arch/x86/Kconfig.cpu linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/Kconfig.cpu --- linux-2.6.38.4/arch/x86/Kconfig.cpu 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/Kconfig.cpu 2011-05-01 17:02:10.000000000 -0500 @@ -339,7 +339,7 @@ config X86_F00F_BUG def_bool y - depends on M586MMX || M586TSC || M586 || M486 || M386 + depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC config X86_INVD_BUG def_bool y @@ -363,7 +363,7 @@ config X86_ALIGNMENT_16 def_bool y - depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1 config X86_INTEL_USERCOPY def_bool y @@ -409,7 +409,7 @@ # generates cmov. config X86_CMOV def_bool y - depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX) + depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX) config X86_MINIMUM_CPU_FAMILY int diff -uriN linux-2.6.38.4/arch/x86/Kconfig.debug linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/Kconfig.debug --- linux-2.6.38.4/arch/x86/Kconfig.debug 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/Kconfig.debug 2011-05-01 17:02:10.000000000 -0500 @@ -101,7 +101,7 @@ config DEBUG_RODATA bool "Write protect kernel read-only data structures" default y - depends on DEBUG_KERNEL + depends on DEBUG_KERNEL && BROKEN ---help--- Mark the kernel read-only data as write-protected in the pagetables, in order to catch accidental (and incorrect) writes to such const @@ -119,7 +119,7 @@ config DEBUG_SET_MODULE_RONX bool "Set loadable kernel module data as NX and text as RO" - depends on MODULES + depends on MODULES && BROKEN ---help--- This option helps catch unintended modifications to loadable kernel module's text and read-only data. It also prevents execution diff -uriN linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/acpi/sleep.c --- linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/acpi/sleep.c 2011-05-01 17:02:10.000000000 -0500 @@ -18,7 +18,7 @@ #include "realmode/wakeup.h" #include "sleep.h" -unsigned long acpi_wakeup_address; +unsigned long acpi_wakeup_address = 0x2000; unsigned long acpi_realmode_flags; /* address in low memory of the wakeup routine. */ @@ -99,8 +99,12 @@ header->trampoline_segment = setup_trampoline() >> 4; #ifdef CONFIG_SMP stack_start = (unsigned long)temp_stack + sizeof(temp_stack); + + pax_open_kernel(); early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(smp_processor_id()); + pax_close_kernel(); + initial_gs = per_cpu_offset(smp_processor_id()); #endif initial_code = (unsigned long)wakeup_long64; diff -uriN linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/acpi/wakeup_32.S --- linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/acpi/wakeup_32.S 2011-05-01 17:02:10.000000000 -0500 @@ -30,13 +30,11 @@ # and restore the stack ... but you need gdt for this to work movl saved_context_esp, %esp - movl %cs:saved_magic, %eax - cmpl $0x12345678, %eax + cmpl $0x12345678, saved_magic jne bogus_magic # jump to place where we left off - movl saved_eip, %eax - jmp *%eax + jmp *(saved_eip) bogus_magic: jmp bogus_magic diff -uriN linux-2.6.38.4/arch/x86/kernel/alternative.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/alternative.c --- linux-2.6.38.4/arch/x86/kernel/alternative.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/alternative.c 2011-05-01 17:02:10.000000000 -0500 @@ -248,7 +248,7 @@ if (!*poff || ptr < text || ptr >= text_end) continue; /* turn DS segment override prefix into lock prefix */ - if (*ptr == 0x3e) + if (*ktla_ktva(ptr) == 0x3e) text_poke(ptr, ((unsigned char []){0xf0}), 1); }; mutex_unlock(&text_mutex); @@ -269,7 +269,7 @@ if (!*poff || ptr < text || ptr >= text_end) continue; /* turn lock prefix into DS segment override prefix */ - if (*ptr == 0xf0) + if (*ktla_ktva(ptr) == 0xf0) text_poke(ptr, ((unsigned char []){0x3E}), 1); }; mutex_unlock(&text_mutex); @@ -438,7 +438,7 @@ BUG_ON(p->len > MAX_PATCH_LEN); /* prep the buffer with the original instructions */ - memcpy(insnbuf, p->instr, p->len); + memcpy(insnbuf, ktla_ktva(p->instr), p->len); used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf, (unsigned long)p->instr, p->len); @@ -506,7 +506,7 @@ if (smp_alt_once) free_init_pages("SMP alternatives", (unsigned long)__smp_locks, - (unsigned long)__smp_locks_end); + PAGE_ALIGN((unsigned long)__smp_locks_end)); restart_nmi(); } @@ -523,13 +523,17 @@ * instructions. And on the local CPU you need to be protected again NMI or MCE * handlers seeing an inconsistent instruction while you patch. */ -void *__init_or_module text_poke_early(void *addr, const void *opcode, +void *__kprobes text_poke_early(void *addr, const void *opcode, size_t len) { unsigned long flags; local_irq_save(flags); - memcpy(addr, opcode, len); + + pax_open_kernel(); + memcpy(ktla_ktva(addr), opcode, len); sync_core(); + pax_close_kernel(); + local_irq_restore(flags); /* Could also do a CLFLUSH here to speed up CPU recovery; but that causes hangs on some VIA CPUs. */ @@ -551,36 +555,22 @@ */ void *__kprobes text_poke(void *addr, const void *opcode, size_t len) { - unsigned long flags; - char *vaddr; + unsigned char *vaddr = ktla_ktva(addr); struct page *pages[2]; - int i; + size_t i; if (!core_kernel_text((unsigned long)addr)) { - pages[0] = vmalloc_to_page(addr); - pages[1] = vmalloc_to_page(addr + PAGE_SIZE); + pages[0] = vmalloc_to_page(vaddr); + pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE); } else { - pages[0] = virt_to_page(addr); + pages[0] = virt_to_page(vaddr); WARN_ON(!PageReserved(pages[0])); - pages[1] = virt_to_page(addr + PAGE_SIZE); + pages[1] = virt_to_page(vaddr + PAGE_SIZE); } BUG_ON(!pages[0]); - local_irq_save(flags); - set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0])); - if (pages[1]) - set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1])); - vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0); - memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len); - clear_fixmap(FIX_TEXT_POKE0); - if (pages[1]) - clear_fixmap(FIX_TEXT_POKE1); - local_flush_tlb(); - sync_core(); - /* Could also do a CLFLUSH here to speed up CPU recovery; but - that causes hangs on some VIA CPUs. */ + text_poke_early(addr, opcode, len); for (i = 0; i < len; i++) - BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]); - local_irq_restore(flags); + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]); return addr; } @@ -682,9 +672,9 @@ #if defined(CONFIG_DYNAMIC_FTRACE) || defined(HAVE_JUMP_LABEL) #ifdef CONFIG_X86_64 -unsigned char ideal_nop5[5] = { 0x66, 0x66, 0x66, 0x66, 0x90 }; +unsigned char ideal_nop5[5] __read_only = { 0x66, 0x66, 0x66, 0x66, 0x90 }; #else -unsigned char ideal_nop5[5] = { 0x3e, 0x8d, 0x74, 0x26, 0x00 }; +unsigned char ideal_nop5[5] __read_only = { 0x3e, 0x8d, 0x74, 0x26, 0x00 }; #endif void __init arch_init_ideal_nop5(void) diff -uriN linux-2.6.38.4/arch/x86/kernel/amd_iommu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/amd_iommu.c --- linux-2.6.38.4/arch/x86/kernel/amd_iommu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/amd_iommu.c 2011-05-01 17:02:10.000000000 -0500 @@ -2286,7 +2286,7 @@ } } -static struct dma_map_ops amd_iommu_dma_ops = { +static const struct dma_map_ops amd_iommu_dma_ops = { .alloc_coherent = alloc_coherent, .free_coherent = free_coherent, .map_page = map_page, diff -uriN linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/apic/io_apic.c --- linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/apic/io_apic.c 2011-05-01 17:02:10.000000000 -0500 @@ -617,7 +617,7 @@ ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, GFP_KERNEL); if (!ioapic_entries) - return 0; + return NULL; for (apic = 0; apic < nr_ioapics; apic++) { ioapic_entries[apic] = @@ -634,7 +634,7 @@ kfree(ioapic_entries[apic]); kfree(ioapic_entries); - return 0; + return NULL; } /* @@ -1044,7 +1044,7 @@ } EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); -void lock_vector_lock(void) +void lock_vector_lock(void) __acquires(vector_lock) { /* Used to the online set of cpus does not change * during assign_irq_vector. @@ -1052,7 +1052,7 @@ raw_spin_lock(&vector_lock); } -void unlock_vector_lock(void) +void unlock_vector_lock(void) __releases(vector_lock) { raw_spin_unlock(&vector_lock); } diff -uriN linux-2.6.38.4/arch/x86/kernel/apm_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/apm_32.c --- linux-2.6.38.4/arch/x86/kernel/apm_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/apm_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -410,7 +410,7 @@ * This is for buggy BIOS's that refer to (real mode) segment 0x40 * even though they are called in protected mode. */ -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092, +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093, (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1); static const char driver_version[] = "1.16ac"; /* no spaces */ @@ -588,7 +588,10 @@ BUG_ON(cpu != 0); gdt = get_cpu_gdt_table(cpu); save_desc_40 = gdt[0x40 / 8]; + + pax_open_kernel(); gdt[0x40 / 8] = bad_bios_desc; + pax_close_kernel(); apm_irq_save(flags); APM_DO_SAVE_SEGS; @@ -597,7 +600,11 @@ &call->esi); APM_DO_RESTORE_SEGS; apm_irq_restore(flags); + + pax_open_kernel(); gdt[0x40 / 8] = save_desc_40; + pax_close_kernel(); + put_cpu(); return call->eax & 0xff; @@ -664,7 +671,10 @@ BUG_ON(cpu != 0); gdt = get_cpu_gdt_table(cpu); save_desc_40 = gdt[0x40 / 8]; + + pax_open_kernel(); gdt[0x40 / 8] = bad_bios_desc; + pax_close_kernel(); apm_irq_save(flags); APM_DO_SAVE_SEGS; @@ -672,7 +682,11 @@ &call->eax); APM_DO_RESTORE_SEGS; apm_irq_restore(flags); + + pax_open_kernel(); gdt[0x40 / 8] = save_desc_40; + pax_close_kernel(); + put_cpu(); return error; } @@ -975,7 +989,7 @@ static void apm_power_off(void) { - unsigned char po_bios_call[] = { + const unsigned char po_bios_call[] = { 0xb8, 0x00, 0x10, /* movw $0x1000,ax */ 0x8e, 0xd0, /* movw ax,ss */ 0xbc, 0x00, 0xf0, /* movw $0xf000,sp */ @@ -2356,12 +2370,15 @@ * code to that CPU. */ gdt = get_cpu_gdt_table(0); + + pax_open_kernel(); set_desc_base(&gdt[APM_CS >> 3], (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4)); set_desc_base(&gdt[APM_CS_16 >> 3], (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4)); set_desc_base(&gdt[APM_DS >> 3], (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4)); + pax_close_kernel(); proc_create("apm", 0, NULL, &apm_file_ops); diff -uriN linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/asm-offsets_32.c --- linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/asm-offsets_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -51,7 +51,6 @@ OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id); BLANK(); - OFFSET(TI_task, thread_info, task); OFFSET(TI_exec_domain, thread_info, exec_domain); OFFSET(TI_flags, thread_info, flags); OFFSET(TI_status, thread_info, status); @@ -113,6 +112,11 @@ OFFSET(PV_CPU_iret, pv_cpu_ops, iret); OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0); + +#ifdef CONFIG_PAX_KERNEXEC + OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0); +#endif + #endif #ifdef CONFIG_XEN diff -uriN linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/asm-offsets_64.c --- linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/asm-offsets_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -63,6 +63,18 @@ OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2); + +#ifdef CONFIG_PAX_KERNEXEC + OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0); + OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0); +#endif + +#ifdef CONFIG_PAX_MEMORY_UDEREF + OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3); + OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3); + OFFSET(PV_MMU_set_pgd, pv_mmu_ops, set_pgd); +#endif + #endif @@ -115,6 +127,7 @@ ENTRY(cr8); BLANK(); #undef ENTRY + DEFINE(TSS_size, sizeof(struct tss_struct)); DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); BLANK(); DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); diff -uriN linux-2.6.38.4/arch/x86/kernel/cpu/amd.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/amd.c --- linux-2.6.38.4/arch/x86/kernel/cpu/amd.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/amd.c 2011-05-01 17:02:10.000000000 -0500 @@ -624,7 +624,7 @@ unsigned int size) { /* AMD errata T13 (order #21922) */ - if ((c->x86 == 6)) { + if (c->x86 == 6) { /* Duron Rev A0 */ if (c->x86_model == 3 && c->x86_mask == 0) size = 64; diff -uriN linux-2.6.38.4/arch/x86/kernel/cpu/common.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/common.c --- linux-2.6.38.4/arch/x86/kernel/cpu/common.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/common.c 2011-05-01 17:02:10.000000000 -0500 @@ -83,60 +83,6 @@ static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; -DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { -#ifdef CONFIG_X86_64 - /* - * We need valid kernel segments for data and code in long mode too - * IRET will check the segment types kkeil 2000/10/28 - * Also sysret mandates a special GDT layout - * - * TLS descriptors are currently at a different place compared to i386. - * Hopefully nobody expects them at a fixed place (Wine?) - */ - [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff), - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff), - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff), - [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff), - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff), - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff), -#else - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff), - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff), - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff), - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff), - /* - * Segments used for calling PnP BIOS have byte granularity. - * They code segments and data segments have fixed 64k limits, - * the transfer segment sizes are set at run time. - */ - /* 32-bit code */ - [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff), - /* 16-bit code */ - [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff), - /* 16-bit data */ - [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff), - /* 16-bit data */ - [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0), - /* 16-bit data */ - [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0), - /* - * The APM segments have byte granularity and their bases - * are set at run time. All have 64k limits. - */ - /* 32-bit code */ - [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff), - /* 16-bit code */ - [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff), - /* data */ - [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff), - - [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff), - [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff), - GDT_STACK_CANARY_INIT -#endif -} }; -EXPORT_PER_CPU_SYMBOL_GPL(gdt_page); - static int __init x86_xsave_setup(char *s) { setup_clear_cpu_cap(X86_FEATURE_XSAVE); @@ -352,7 +298,7 @@ { struct desc_ptr gdt_descr; - gdt_descr.address = (long)get_cpu_gdt_table(cpu); + gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu); gdt_descr.size = GDT_SIZE - 1; load_gdt(&gdt_descr); /* Reload the per-cpu base */ @@ -825,6 +771,10 @@ /* Filter out anything that depends on CPUID levels we don't have */ filter_cpuid_features(c, true); +#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || (defined(CONFIG_PAX_MEMORY_UDEREF) && defined(CONFIG_X86_32)) + setup_clear_cpu_cap(X86_FEATURE_SEP); +#endif + /* If the model name is still unset, do table lookup. */ if (!c->x86_model_id[0]) { const char *p; @@ -1004,6 +954,9 @@ } __setup("clearcpuid=", setup_disablecpuid); +DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo; +EXPORT_PER_CPU_SYMBOL(current_tinfo); + #ifdef CONFIG_X86_64 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table }; @@ -1019,7 +972,7 @@ EXPORT_PER_CPU_SYMBOL(current_task); DEFINE_PER_CPU(unsigned long, kernel_stack) = - (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE; + (unsigned long)&init_thread_union - 8 + THREAD_SIZE; EXPORT_PER_CPU_SYMBOL(kernel_stack); DEFINE_PER_CPU(char *, irq_stack_ptr) = @@ -1084,7 +1037,7 @@ { memset(regs, 0, sizeof(struct pt_regs)); regs->fs = __KERNEL_PERCPU; - regs->gs = __KERNEL_STACK_CANARY; + savesegment(gs, regs->gs); return regs; } @@ -1139,7 +1092,7 @@ int i; cpu = stack_smp_processor_id(); - t = &per_cpu(init_tss, cpu); + t = init_tss + cpu; oist = &per_cpu(orig_ist, cpu); #ifdef CONFIG_NUMA @@ -1165,7 +1118,7 @@ switch_to_new_gdt(cpu); loadsegment(fs, 0); - load_idt((const struct desc_ptr *)&idt_descr); + load_idt(&idt_descr); memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8); syscall_init(); @@ -1174,7 +1127,6 @@ wrmsrl(MSR_KERNEL_GS_BASE, 0); barrier(); - x86_configure_nx(); if (cpu != 0) enable_x2apic(); @@ -1228,7 +1180,7 @@ { int cpu = smp_processor_id(); struct task_struct *curr = current; - struct tss_struct *t = &per_cpu(init_tss, cpu); + struct tss_struct *t = init_tss + cpu; struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { diff -uriN linux-2.6.38.4/arch/x86/kernel/cpu/intel.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/intel.c --- linux-2.6.38.4/arch/x86/kernel/cpu/intel.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/intel.c 2011-05-01 17:02:10.000000000 -0500 @@ -161,7 +161,7 @@ * Update the IDT descriptor and reload the IDT so that * it uses the read-only mapped virtual address. */ - idt_descr.address = fix_to_virt(FIX_F00F_IDT); + idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT); load_idt(&idt_descr); } #endif diff -uriN linux-2.6.38.4/arch/x86/kernel/cpu/Makefile linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/Makefile --- linux-2.6.38.4/arch/x86/kernel/cpu/Makefile 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/Makefile 2011-05-01 17:02:10.000000000 -0500 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_perf_event.o = -pg endif -# Make sure load_percpu_segment has no stackprotector -nostackp := $(call cc-option, -fno-stack-protector) -CFLAGS_common.o := $(nostackp) - obj-y := intel_cacheinfo.o scattered.o topology.o obj-y += proc.o capflags.o powerflags.o common.o obj-y += vmware.o hypervisor.o sched.o mshyperv.o diff -uriN linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/mcheck/mce.c --- linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/mcheck/mce.c 2011-05-01 17:02:10.000000000 -0500 @@ -45,6 +45,7 @@ #include #include #include +#include #include "mce-internal.h" @@ -219,7 +220,7 @@ !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", m->cs, m->ip); - if (m->cs == __KERNEL_CS) + if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS) print_symbol("{%s}", m->ip); pr_cont("\n"); } @@ -1460,14 +1461,14 @@ */ static DEFINE_SPINLOCK(mce_state_lock); -static int open_count; /* #times opened */ +static local_t open_count; /* #times opened */ static int open_exclu; /* already open exclusive? */ static int mce_open(struct inode *inode, struct file *file) { spin_lock(&mce_state_lock); - if (open_exclu || (open_count && (file->f_flags & O_EXCL))) { + if (open_exclu || (local_read(&open_count) && (file->f_flags & O_EXCL))) { spin_unlock(&mce_state_lock); return -EBUSY; @@ -1475,7 +1476,7 @@ if (file->f_flags & O_EXCL) open_exclu = 1; - open_count++; + local_inc(&open_count); spin_unlock(&mce_state_lock); @@ -1486,7 +1487,7 @@ { spin_lock(&mce_state_lock); - open_count--; + local_dec(&open_count); open_exclu = 0; spin_unlock(&mce_state_lock); @@ -1658,8 +1659,7 @@ } } -/* Modified in mce-inject.c, so not static or const */ -struct file_operations mce_chrdev_ops = { +struct file_operations mce_chrdev_ops = { /* Modified in mce-inject.c, so not static or const */ .open = mce_open, .release = mce_release, .read = mce_read, diff -uriN linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/mtrr/main.c --- linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/mtrr/main.c 2011-05-01 17:02:10.000000000 -0500 @@ -61,7 +61,7 @@ u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; -static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM]; +static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only; const struct mtrr_ops *mtrr_if; diff -uriN linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/mtrr/mtrr.h --- linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-05-01 17:02:10.000000000 -0500 @@ -12,19 +12,19 @@ extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; struct mtrr_ops { - u32 vendor; - u32 use_intel_if; - void (*set)(unsigned int reg, unsigned long base, + const u32 vendor; + const u32 use_intel_if; + void (* const set)(unsigned int reg, unsigned long base, unsigned long size, mtrr_type type); - void (*set_all)(void); + void (* const set_all)(void); - void (*get)(unsigned int reg, unsigned long *base, + void (* const get)(unsigned int reg, unsigned long *base, unsigned long *size, mtrr_type *type); - int (*get_free_region)(unsigned long base, unsigned long size, + int (* const get_free_region)(unsigned long base, unsigned long size, int replace_reg); - int (*validate_add_page)(unsigned long base, unsigned long size, + int (* const validate_add_page)(unsigned long base, unsigned long size, unsigned int type); - int (*have_wrcomb)(void); + int (* const have_wrcomb)(void); }; extern int generic_get_free_region(unsigned long base, unsigned long size, diff -uriN linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/perf_event.c --- linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/cpu/perf_event.c 2011-05-01 17:02:10.000000000 -0500 @@ -1781,7 +1781,7 @@ break; perf_callchain_store(entry, frame.return_address); - fp = frame.next_frame; + fp = (__force const void __user *)frame.next_frame; } } diff -uriN linux-2.6.38.4/arch/x86/kernel/crash.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/crash.c --- linux-2.6.38.4/arch/x86/kernel/crash.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/crash.c 2011-05-01 17:02:10.000000000 -0500 @@ -42,7 +42,7 @@ regs = args->regs; #ifdef CONFIG_X86_32 - if (!user_mode_vm(regs)) { + if (!user_mode(regs)) { crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } diff -uriN linux-2.6.38.4/arch/x86/kernel/doublefault_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/doublefault_32.c --- linux-2.6.38.4/arch/x86/kernel/doublefault_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/doublefault_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE]; -#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE) +#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2) #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM) @@ -21,7 +21,7 @@ unsigned long gdt, tss; store_gdt(&gdt_desc); - gdt = gdt_desc.address; + gdt = (unsigned long)gdt_desc.address; printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size); @@ -58,10 +58,10 @@ /* 0x2 bit is always set */ .flags = X86_EFLAGS_SF | 0x2, .sp = STACK_START, - .es = __USER_DS, + .es = __KERNEL_DS, .cs = __KERNEL_CS, .ss = __KERNEL_DS, - .ds = __USER_DS, + .ds = __KERNEL_DS, .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), diff -uriN linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/dumpstack_32.c --- linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/dumpstack_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -37,15 +37,12 @@ bp = stack_frame(task, regs); for (;;) { - struct thread_info *context; + void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1)); + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph); - context = (struct thread_info *) - ((unsigned long)stack & (~(THREAD_SIZE - 1))); - bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph); - - stack = (unsigned long *)context->previous_esp; - if (!stack) + if (stack_start == task_stack_page(task)) break; + stack = *(unsigned long **)stack_start; if (ops->stack(data, "IRQ") < 0) break; touch_nmi_watchdog(); @@ -95,21 +92,22 @@ * When in-kernel, we also print out the stack and code at the * time of the fault.. */ - if (!user_mode_vm(regs)) { + if (!user_mode(regs)) { unsigned int code_prologue = code_bytes * 43 / 64; unsigned int code_len = code_bytes; unsigned char c; u8 *ip; + unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]); printk(KERN_EMERG "Stack:\n"); show_stack_log_lvl(NULL, regs, ®s->sp, KERN_EMERG); printk(KERN_EMERG "Code: "); - ip = (u8 *)regs->ip - code_prologue; + ip = (u8 *)regs->ip - code_prologue + cs_base; if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) { /* try starting at IP */ - ip = (u8 *)regs->ip; + ip = (u8 *)regs->ip + cs_base; code_len = code_len - code_prologue + 1; } for (i = 0; i < code_len; i++, ip++) { @@ -118,7 +116,7 @@ printk(" Bad EIP value."); break; } - if (ip == (u8 *)regs->ip) + if (ip == (u8 *)regs->ip + cs_base) printk("<%02x> ", c); else printk("%02x ", c); @@ -131,6 +129,7 @@ { unsigned short ud2; + ip = ktla_ktva(ip); if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) diff -uriN linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/dumpstack_64.c --- linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/dumpstack_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -147,10 +147,10 @@ unsigned long *irq_stack_end = (unsigned long *)per_cpu(irq_stack_ptr, cpu); unsigned used = 0; - struct thread_info *tinfo; int graph = 0; unsigned long dummy; unsigned long bp; + void *stack_start; if (!task) task = current; @@ -167,10 +167,10 @@ * current stack address. If the stacks consist of nested * exceptions */ - tinfo = task_thread_info(task); for (;;) { char *id; unsigned long *estack_end; + estack_end = in_exception_stack(cpu, (unsigned long)stack, &used, &id); @@ -178,7 +178,7 @@ if (ops->stack(data, id) < 0) break; - bp = ops->walk_stack(tinfo, stack, bp, ops, + bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops, data, estack_end, &graph); ops->stack(data, ""); /* @@ -197,7 +197,7 @@ if (in_irq_stack(stack, irq_stack, irq_stack_end)) { if (ops->stack(data, "IRQ") < 0) break; - bp = ops->walk_stack(tinfo, stack, bp, + bp = ops->walk_stack(task, irq_stack, stack, bp, ops, data, irq_stack_end, &graph); /* * We link to the next stack (which would be @@ -218,7 +218,8 @@ /* * This handles the process stack: */ - bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph); + stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1)); + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph); put_cpu(); } EXPORT_SYMBOL(dump_trace); diff -uriN linux-2.6.38.4/arch/x86/kernel/dumpstack.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/dumpstack.c --- linux-2.6.38.4/arch/x86/kernel/dumpstack.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/dumpstack.c 2011-05-01 17:02:10.000000000 -0500 @@ -2,6 +2,9 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs */ +#ifdef CONFIG_GRKERNSEC_HIDESYM +#define __INCLUDED_BY_HIDESYM 1 +#endif #include #include #include @@ -27,7 +30,7 @@ void printk_address(unsigned long address, int reliable) { - printk(" [<%p>] %s%pS\n", (void *) address, + printk(" [<%p>] %s%pA\n", (void *) address, reliable ? "" : "? ", (void *) address); } @@ -35,9 +38,8 @@ static void print_ftrace_graph_addr(unsigned long addr, void *data, const struct stacktrace_ops *ops, - struct thread_info *tinfo, int *graph) + struct task_struct *task, int *graph) { - struct task_struct *task = tinfo->task; unsigned long ret_addr; int index = task->curr_ret_stack; @@ -58,7 +60,7 @@ static inline void print_ftrace_graph_addr(unsigned long addr, void *data, const struct stacktrace_ops *ops, - struct thread_info *tinfo, int *graph) + struct task_struct *task, int *graph) { } #endif @@ -69,10 +71,8 @@ * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack */ -static inline int valid_stack_ptr(struct thread_info *tinfo, - void *p, unsigned int size, void *end) +static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end) { - void *t = tinfo; if (end) { if (p < end && p >= (end-THREAD_SIZE)) return 1; @@ -83,14 +83,14 @@ } unsigned long -print_context_stack(struct thread_info *tinfo, +print_context_stack(struct task_struct *task, void *stack_start, unsigned long *stack, unsigned long bp, const struct stacktrace_ops *ops, void *data, unsigned long *end, int *graph) { struct stack_frame *frame = (struct stack_frame *)bp; - while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) { + while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) { unsigned long addr; addr = *stack; @@ -102,7 +102,7 @@ } else { ops->address(data, addr, 0); } - print_ftrace_graph_addr(addr, data, ops, tinfo, graph); + print_ftrace_graph_addr(addr, data, ops, task, graph); } stack++; } @@ -111,7 +111,7 @@ EXPORT_SYMBOL_GPL(print_context_stack); unsigned long -print_context_stack_bp(struct thread_info *tinfo, +print_context_stack_bp(struct task_struct *task, void *stack_start, unsigned long *stack, unsigned long bp, const struct stacktrace_ops *ops, void *data, unsigned long *end, int *graph) @@ -119,7 +119,7 @@ struct stack_frame *frame = (struct stack_frame *)bp; unsigned long *ret_addr = &frame->return_address; - while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) { + while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) { unsigned long addr = *ret_addr; if (!__kernel_text_address(addr)) @@ -128,7 +128,7 @@ ops->address(data, addr, 1); frame = frame->next_frame; ret_addr = &frame->return_address; - print_ftrace_graph_addr(addr, data, ops, tinfo, graph); + print_ftrace_graph_addr(addr, data, ops, task, graph); } return (unsigned long)frame; @@ -200,7 +200,7 @@ unsigned long stack; printk("Pid: %d, comm: %.20s %s %s %.*s\n", - current->pid, current->comm, print_tainted(), + task_pid_nr(current), current->comm, print_tainted(), init_utsname()->release, (int)strcspn(init_utsname()->version, " "), init_utsname()->version); @@ -236,6 +236,8 @@ } EXPORT_SYMBOL_GPL(oops_begin); +extern void gr_handle_kernel_exploit(void); + void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) { if (regs && kexec_should_crash(current)) @@ -257,7 +259,10 @@ panic("Fatal exception in interrupt"); if (panic_on_oops) panic("Fatal exception"); - do_exit(signr); + + gr_handle_kernel_exploit(); + + do_group_exit(signr); } int __kprobes __die(const char *str, struct pt_regs *regs, long err) @@ -284,7 +289,7 @@ show_registers(regs); #ifdef CONFIG_X86_32 - if (user_mode_vm(regs)) { + if (user_mode(regs)) { sp = regs->sp; ss = regs->ss & 0xffff; } else { @@ -312,7 +317,7 @@ unsigned long flags = oops_begin(); int sig = SIGSEGV; - if (!user_mode_vm(regs)) + if (!user_mode(regs)) report_bug(regs->ip, regs); if (__die(str, regs, err)) diff -uriN linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/entry_32.S --- linux-2.6.38.4/arch/x86/kernel/entry_32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/entry_32.S 2011-05-01 17:02:10.000000000 -0500 @@ -183,13 +183,81 @@ /*CFI_REL_OFFSET gs, PT_GS*/ .endm .macro SET_KERNEL_GS reg + +#ifdef CONFIG_CC_STACKPROTECTOR movl $(__KERNEL_STACK_CANARY), \reg +#elif defined(CONFIG_PAX_MEMORY_UDEREF) + movl $(__USER_DS), \reg +#else + xorl \reg, \reg +#endif + movl \reg, %gs .endm #endif /* CONFIG_X86_32_LAZY_GS */ -.macro SAVE_ALL +.macro PAX_EXIT_KERNEL +#ifdef CONFIG_PAX_KERNEXEC +#ifdef CONFIG_PARAVIRT + push %eax; push %ecx +#endif + mov %cs, %esi + cmp $__KERNEXEC_KERNEL_CS, %esi + jnz 2f +#ifdef CONFIG_PARAVIRT + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); + mov %eax, %esi +#else + mov %cr0, %esi +#endif + btr $16, %esi + ljmp $__KERNEL_CS, $1f +1: +#ifdef CONFIG_PARAVIRT + mov %esi, %eax + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0); +#else + mov %esi, %cr0 +#endif +2: +#ifdef CONFIG_PARAVIRT + pop %ecx; pop %eax +#endif +#endif +.endm + +.macro PAX_ENTER_KERNEL +#ifdef CONFIG_PAX_KERNEXEC +#ifdef CONFIG_PARAVIRT + push %eax; push %ecx + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0) + mov %eax, %esi +#else + mov %cr0, %esi +#endif + bts $16, %esi + jnc 1f + mov %cs, %esi + cmp $__KERNEL_CS, %esi + jz 3f + ljmp $__KERNEL_CS, $3f +1: ljmp $__KERNEXEC_KERNEL_CS, $2f +2: +#ifdef CONFIG_PARAVIRT + mov %esi, %eax + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0) +#else + mov %esi, %cr0 +#endif +3: +#ifdef CONFIG_PARAVIRT + pop %ecx; pop %eax +#endif +#endif +.endm + +.macro __SAVE_ALL _DS cld PUSH_GS pushl_cfi %fs @@ -212,7 +280,7 @@ CFI_REL_OFFSET ecx, 0 pushl_cfi %ebx CFI_REL_OFFSET ebx, 0 - movl $(__USER_DS), %edx + movl $\_DS, %edx movl %edx, %ds movl %edx, %es movl $(__KERNEL_PERCPU), %edx @@ -220,6 +288,15 @@ SET_KERNEL_GS %edx .endm +.macro SAVE_ALL +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF) + __SAVE_ALL __KERNEL_DS + PAX_ENTER_KERNEL +#else + __SAVE_ALL __USER_DS +#endif +.endm + .macro RESTORE_INT_REGS popl_cfi %ebx CFI_RESTORE ebx @@ -330,7 +407,15 @@ movb PT_CS(%esp), %al andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax cmpl $USER_RPL, %eax + +#ifdef CONFIG_PAX_KERNEXEC + jae resume_userspace + + PAX_EXIT_KERNEL + jmp resume_kernel +#else jb resume_kernel # not returning to v8086 or userspace +#endif ENTRY(resume_userspace) LOCKDEP_SYS_EXIT @@ -392,23 +477,34 @@ /*CFI_REL_OFFSET cs, 0*/ /* * Push current_thread_info()->sysenter_return to the stack. - * A tiny bit of offset fixup is necessary - 4*4 means the 4 words - * pushed above; +8 corresponds to copy_thread's esp0 setting. */ - pushl_cfi ((TI_sysenter_return)-THREAD_SIZE_asm+8+4*4)(%esp) + pushl_cfi $0 CFI_REL_OFFSET eip, 0 pushl_cfi %eax SAVE_ALL + GET_THREAD_INFO(%ebp) + movl TI_sysenter_return(%ebp),%ebp + movl %ebp,PT_EIP(%esp) ENABLE_INTERRUPTS(CLBR_NONE) /* * Load the potential sixth argument from user stack. * Careful about security. */ + movl PT_OLDESP(%esp),%ebp + +#ifdef CONFIG_PAX_MEMORY_UDEREF + mov PT_OLDSS(%esp),%ds +1: movl %ds:(%ebp),%ebp + push %ss + pop %ds +#else cmpl $__PAGE_OFFSET-3,%ebp jae syscall_fault 1: movl (%ebp),%ebp +#endif + movl %ebp,PT_EBP(%esp) .section __ex_table,"a" .align 4 @@ -431,12 +527,23 @@ testl $_TIF_ALLWORK_MASK, %ecx jne sysexit_audit sysenter_exit: + +#ifdef CONFIG_PAX_RANDKSTACK + pushl %eax + CFI_ADJUST_CFA_OFFSET 4 + call pax_randomize_kstack + popl %eax + CFI_ADJUST_CFA_OFFSET -4 +#endif + /* if something modifies registers it must also disable sysexit */ movl PT_EIP(%esp), %edx movl PT_OLDESP(%esp), %ecx xorl %ebp,%ebp TRACE_IRQS_ON 1: mov PT_FS(%esp), %fs +2: mov PT_DS(%esp), %ds +3: mov PT_ES(%esp), %es PTGS_TO_GS ENABLE_INTERRUPTS_SYSEXIT @@ -479,11 +586,17 @@ CFI_ENDPROC .pushsection .fixup,"ax" -2: movl $0,PT_FS(%esp) +4: movl $0,PT_FS(%esp) + jmp 1b +5: movl $0,PT_DS(%esp) + jmp 1b +6: movl $0,PT_ES(%esp) jmp 1b .section __ex_table,"a" .align 4 - .long 1b,2b + .long 1b,4b + .long 2b,5b + .long 3b,6b .popsection PTGS_TO_GS_EX ENDPROC(ia32_sysenter_target) @@ -516,6 +629,10 @@ testl $_TIF_ALLWORK_MASK, %ecx # current->work jne syscall_exit_work +#ifdef CONFIG_PAX_RANDKSTACK + call pax_randomize_kstack +#endif + restore_all: TRACE_IRQS_IRET restore_all_notrace: @@ -575,14 +692,21 @@ * compensating for the offset by changing to the ESPFIX segment with * a base address that matches for the difference. */ -#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8) +#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx) mov %esp, %edx /* load kernel esp */ mov PT_OLDESP(%esp), %eax /* load userspace esp */ mov %dx, %ax /* eax: new kernel esp */ sub %eax, %edx /* offset (low word is 0) */ +#ifdef CONFIG_SMP + movl PER_CPU_VAR(cpu_number), %ebx + shll $PAGE_SHIFT_asm, %ebx + addl $cpu_gdt_table, %ebx +#else + movl $cpu_gdt_table, %ebx +#endif shr $16, %edx - mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */ - mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */ + mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */ + mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */ pushl_cfi $__ESPFIX_SS pushl_cfi %eax /* new kernel esp */ /* Disable interrupts, but do not irqtrace this section: we @@ -617,23 +741,17 @@ work_notifysig: # deal with pending signals and # notify-resume requests + movl %esp, %eax #ifdef CONFIG_VM86 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp) - movl %esp, %eax - jne work_notifysig_v86 # returning to kernel-space or + jz 1f # returning to kernel-space or # vm86-space - xorl %edx, %edx - call do_notify_resume - jmp resume_userspace_sig - ALIGN -work_notifysig_v86: pushl_cfi %ecx # save ti_flags for do_notify_resume call save_v86_state # %eax contains pt_regs pointer popl_cfi %ecx movl %eax, %esp -#else - movl %esp, %eax +1: #endif xorl %edx, %edx call do_notify_resume @@ -668,6 +786,10 @@ RING0_INT_FRAME # can't unwind into user space anyway syscall_fault: +#ifdef CONFIG_PAX_MEMORY_UDEREF + push %ss + pop %ds +#endif GET_THREAD_INFO(%ebp) movl $-EFAULT,PT_EAX(%esp) jmp resume_userspace @@ -750,6 +872,36 @@ CFI_ENDPROC ENDPROC(ptregs_clone) + ALIGN; +ENTRY(kernel_execve) + CFI_STARTPROC + pushl_cfi %ebp + sub $PT_OLDSS+4,%esp + pushl_cfi %edi + pushl_cfi %ecx + pushl_cfi %eax + lea 3*4(%esp),%edi + mov $PT_OLDSS/4+1,%ecx + xorl %eax,%eax + rep stosl + popl_cfi %eax + popl_cfi %ecx + popl_cfi %edi + movl $X86_EFLAGS_IF,PT_EFLAGS(%esp) + pushl_cfi %esp + call sys_execve + add $4,%esp + CFI_ADJUST_CFA_OFFSET -4 + GET_THREAD_INFO(%ebp) + test %eax,%eax + jz syscall_exit + add $PT_OLDSS+4,%esp + CFI_ADJUST_CFA_OFFSET -PT_OLDSS-4 + popl_cfi %ebp + ret + CFI_ENDPROC +ENDPROC(kernel_execve) + .macro FIXUP_ESPFIX_STACK /* * Switch back for ESPFIX stack to the normal zerobased stack @@ -759,8 +911,15 @@ * normal stack and adjusts ESP with the matching offset. */ /* fixup the stack */ - mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */ - mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */ +#ifdef CONFIG_SMP + movl PER_CPU_VAR(cpu_number), %ebx + shll $PAGE_SHIFT_asm, %ebx + addl $cpu_gdt_table, %ebx +#else + movl $cpu_gdt_table, %ebx +#endif + mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */ + mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */ shl $16, %eax addl %esp, %eax /* the adjusted stack pointer */ pushl_cfi $__KERNEL_DS @@ -1211,7 +1370,6 @@ jmp *%ecx #endif -.section .rodata,"a" #include "syscall_table_32.S" syscall_table_size=(.-sys_call_table) @@ -1257,9 +1415,12 @@ movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart REG_TO_PTGS %ecx SET_KERNEL_GS %ecx - movl $(__USER_DS), %ecx + movl $(__KERNEL_DS), %ecx movl %ecx, %ds movl %ecx, %es + + PAX_ENTER_KERNEL + TRACE_IRQS_OFF movl %esp,%eax # pt_regs pointer call *%edi @@ -1344,6 +1505,9 @@ xorl %edx,%edx # zero error code movl %esp,%eax # pt_regs pointer call do_nmi + + PAX_EXIT_KERNEL + jmp restore_all_notrace CFI_ENDPROC @@ -1380,6 +1544,9 @@ FIXUP_ESPFIX_STACK # %eax == %esp xorl %edx,%edx # zero error code call do_nmi + + PAX_EXIT_KERNEL + RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 diff -uriN linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/entry_64.S --- linux-2.6.38.4/arch/x86/kernel/entry_64.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/entry_64.S 2011-05-01 17:02:10.000000000 -0500 @@ -53,6 +53,7 @@ #include #include #include +#include /* Avoid __ASSEMBLER__'ifying just for this. */ #include @@ -174,6 +175,206 @@ ENDPROC(native_usergs_sysret64) #endif /* CONFIG_PARAVIRT */ + .macro ljmpq sel, off +#if defined(CONFIG_MCORE2) || defined (CONFIG_MATOM) + .byte 0x48; ljmp *1234f(%rip) + .pushsection .rodata + .align 16 + 1234: .quad \off; .word \sel + .popsection +#else + push $\sel + push $\off + lretq +#endif + .endm + + .macro pax_enter_kernel +#ifdef CONFIG_PAX_KERNEXEC + call pax_enter_kernel +#endif + .endm + + .macro pax_exit_kernel +#ifdef CONFIG_PAX_KERNEXEC + call pax_exit_kernel +#endif + .endm + +#ifdef CONFIG_PAX_KERNEXEC +ENTRY(pax_enter_kernel) + push %rdi + +#ifdef CONFIG_PARAVIRT + PV_SAVE_REGS(CLBR_RDI) +#endif + + GET_CR0_INTO_RDI + bts $16,%rdi + jnc 1f + mov %cs,%edi + cmp $__KERNEL_CS,%edi + jz 3f + ljmpq __KERNEL_CS,3f +1: ljmpq __KERNEXEC_KERNEL_CS,2f +2: SET_RDI_INTO_CR0 +3: + +#ifdef CONFIG_PARAVIRT + PV_RESTORE_REGS(CLBR_RDI) +#endif + + pop %rdi + retq +ENDPROC(pax_enter_kernel) + +ENTRY(pax_exit_kernel) + push %rdi + +#ifdef CONFIG_PARAVIRT + PV_SAVE_REGS(CLBR_RDI) +#endif + + mov %cs,%rdi + cmp $__KERNEXEC_KERNEL_CS,%edi + jnz 2f + GET_CR0_INTO_RDI + btr $16,%rdi + ljmpq __KERNEL_CS,1f +1: SET_RDI_INTO_CR0 +2: + +#ifdef CONFIG_PARAVIRT + PV_RESTORE_REGS(CLBR_RDI); +#endif + + pop %rdi + retq +ENDPROC(pax_exit_kernel) +#endif + + .macro pax_enter_kernel_user +#ifdef CONFIG_PAX_MEMORY_UDEREF + call pax_enter_kernel_user +#endif + .endm + + .macro pax_exit_kernel_user +#ifdef CONFIG_PAX_MEMORY_UDEREF + call pax_exit_kernel_user +#endif +#ifdef CONFIG_PAX_RANDKSTACK + push %rax + call pax_randomize_kstack + pop %rax +#endif + .endm + +#ifdef CONFIG_PAX_MEMORY_UDEREF +ENTRY(pax_enter_kernel_user) + push %rdi + push %rbx + +#ifdef CONFIG_PARAVIRT + PV_SAVE_REGS(CLBR_RDI) +#endif + + GET_CR3_INTO_RDI + mov %rdi,%rbx + add $__START_KERNEL_map,%rbx + sub phys_base(%rip),%rbx + +#ifdef CONFIG_PARAVIRT + push %rdi + cmpl $0, pv_info+PARAVIRT_enabled + jz 1f + i = 0 + .rept USER_PGD_PTRS + mov i*8(%rbx),%rsi + mov $0,%sil + lea i*8(%rbx),%rdi + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd) + i = i + 1 + .endr + jmp 2f +1: +#endif + + i = 0 + .rept USER_PGD_PTRS + movb $0,i*8(%rbx) + i = i + 1 + .endr + +#ifdef CONFIG_PARAVIRT +2: pop %rdi +#endif + SET_RDI_INTO_CR3 + +#ifdef CONFIG_PAX_KERNEXEC + GET_CR0_INTO_RDI + bts $16,%rdi + SET_RDI_INTO_CR0 +#endif + +#ifdef CONFIG_PARAVIRT + PV_RESTORE_REGS(CLBR_RDI) +#endif + + pop %rbx + pop %rdi + retq +ENDPROC(pax_enter_kernel_user) + +ENTRY(pax_exit_kernel_user) + push %rdi + +#ifdef CONFIG_PARAVIRT + push %rbx + PV_SAVE_REGS(CLBR_RDI) +#endif + +#ifdef CONFIG_PAX_KERNEXEC + GET_CR0_INTO_RDI + btr $16,%rdi + SET_RDI_INTO_CR0 +#endif + + GET_CR3_INTO_RDI + add $__START_KERNEL_map,%rdi + sub phys_base(%rip),%rdi + +#ifdef CONFIG_PARAVIRT + cmpl $0, pv_info+PARAVIRT_enabled + jz 1f + mov %rdi,%rbx + i = 0 + .rept USER_PGD_PTRS + mov i*8(%rbx),%rsi + mov $0x67,%sil + lea i*8(%rbx),%rdi + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd) + i = i + 1 + .endr + jmp 2f +1: +#endif + + i = 0 + .rept USER_PGD_PTRS + movb $0x67,i*8(%rdi) + i = i + 1 + .endr + +#ifdef CONFIG_PARAVIRT +2: PV_RESTORE_REGS(CLBR_RDI) + pop %rbx +#endif + + pop %rdi + retq +ENDPROC(pax_exit_kernel_user) +#endif .macro TRACE_IRQS_IRETQ offset=ARGOFFSET #ifdef CONFIG_TRACE_IRQFLAGS @@ -316,7 +517,7 @@ leaq -RBP+8(%rsp),%rdi /* arg1 for handler */ movq_cfi rbp, 8 /* push %rbp */ leaq 8(%rsp), %rbp /* mov %rsp, %ebp */ - testl $3, CS(%rdi) + testb $3, CS(%rdi) je 1f SWAPGS /* @@ -407,7 +608,7 @@ RESTORE_REST - testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread? + testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread? je int_ret_from_sys_call testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET @@ -453,7 +654,7 @@ ENTRY(system_call) CFI_STARTPROC simple CFI_SIGNAL_FRAME - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET + CFI_DEF_CFA rsp,0 CFI_REGISTER rip,rcx /*CFI_REGISTER rflags,r11*/ SWAPGS_UNSAFE_STACK @@ -466,12 +667,13 @@ movq %rsp,PER_CPU_VAR(old_rsp) movq PER_CPU_VAR(kernel_stack),%rsp + pax_enter_kernel_user /* * No need to follow this irqs off/on section - it's straight * and short: */ ENABLE_INTERRUPTS(CLBR_NONE) - SAVE_ARGS 8,1 + SAVE_ARGS 8*6,1 movq %rax,ORIG_RAX-ARGOFFSET(%rsp) movq %rcx,RIP-ARGOFFSET(%rsp) CFI_REL_OFFSET rip,RIP-ARGOFFSET @@ -500,6 +702,7 @@ andl %edi,%edx jnz sysret_careful CFI_REMEMBER_STATE + pax_exit_kernel_user /* * sysretq will re-enable interrupts: */ @@ -609,7 +812,7 @@ GLOBAL(int_ret_from_sys_call) DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF - testl $3,CS-ARGOFFSET(%rsp) + testb $3,CS-ARGOFFSET(%rsp) je retint_restore_args movl $_TIF_ALLWORK_MASK,%edi /* edi: mask to check */ @@ -791,6 +994,16 @@ CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP call save_args PARTIAL_FRAME 0 +#ifdef CONFIG_PAX_MEMORY_UDEREF + testb $3, CS(%rdi) + jnz 1f + pax_enter_kernel + jmp 2f +1: pax_enter_kernel_user +2: +#else + pax_enter_kernel +#endif call \func .endm @@ -823,7 +1036,7 @@ CFI_ADJUST_CFA_OFFSET -8 exit_intr: GET_THREAD_INFO(%rcx) - testl $3,CS-ARGOFFSET(%rsp) + testb $3,CS-ARGOFFSET(%rsp) je retint_kernel /* Interrupt came from user space */ @@ -845,12 +1058,14 @@ * The iretq could re-enable interrupts: */ DISABLE_INTERRUPTS(CLBR_ANY) + pax_exit_kernel_user TRACE_IRQS_IRETQ SWAPGS jmp restore_args retint_restore_args: /* return to kernel space */ DISABLE_INTERRUPTS(CLBR_ANY) + pax_exit_kernel /* * The iretq could re-enable interrupts: */ @@ -1022,6 +1237,16 @@ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call error_entry DEFAULT_FRAME 0 +#ifdef CONFIG_PAX_MEMORY_UDEREF + testb $3, CS(%rsp) + jnz 1f + pax_enter_kernel + jmp 2f +1: pax_enter_kernel_user +2: +#else + pax_enter_kernel +#endif movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym @@ -1039,6 +1264,16 @@ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid TRACE_IRQS_OFF +#ifdef CONFIG_PAX_MEMORY_UDEREF + testb $3, CS(%rsp) + jnz 1f + pax_enter_kernel + jmp 2f +1: pax_enter_kernel_user +2: +#else + pax_enter_kernel +#endif movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym @@ -1047,7 +1282,7 @@ END(\sym) .endm -#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8) +#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r12) .macro paranoidzeroentry_ist sym do_sym ist ENTRY(\sym) INTR_FRAME @@ -1057,8 +1292,24 @@ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid TRACE_IRQS_OFF +#ifdef CONFIG_PAX_MEMORY_UDEREF + testb $3, CS(%rsp) + jnz 1f + pax_enter_kernel + jmp 2f +1: pax_enter_kernel_user +2: +#else + pax_enter_kernel +#endif movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ +#ifdef CONFIG_SMP + imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d + lea init_tss(%r12), %r12 +#else + lea init_tss(%rip), %r12 +#endif subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist) call \do_sym addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist) @@ -1075,6 +1326,16 @@ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call error_entry DEFAULT_FRAME 0 +#ifdef CONFIG_PAX_MEMORY_UDEREF + testb $3, CS(%rsp) + jnz 1f + pax_enter_kernel + jmp 2f +1: pax_enter_kernel_user +2: +#else + pax_enter_kernel +#endif movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ @@ -1094,6 +1355,16 @@ call save_paranoid DEFAULT_FRAME 0 TRACE_IRQS_OFF +#ifdef CONFIG_PAX_MEMORY_UDEREF + testb $3, CS(%rsp) + jnz 1f + pax_enter_kernel + jmp 2f +1: pax_enter_kernel_user +2: +#else + pax_enter_kernel +#endif movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ @@ -1356,14 +1627,27 @@ TRACE_IRQS_OFF testl %ebx,%ebx /* swapgs needed? */ jnz paranoid_restore - testl $3,CS(%rsp) + testb $3,CS(%rsp) jnz paranoid_userspace +#ifdef CONFIG_PAX_MEMORY_UDEREF + pax_exit_kernel + TRACE_IRQS_IRETQ 0 + SWAPGS_UNSAFE_STACK + RESTORE_ALL 8 + jmp irq_return +#endif paranoid_swapgs: +#ifdef CONFIG_PAX_MEMORY_UDEREF + pax_exit_kernel_user +#else + pax_exit_kernel +#endif TRACE_IRQS_IRETQ 0 SWAPGS_UNSAFE_STACK RESTORE_ALL 8 jmp irq_return paranoid_restore: + pax_exit_kernel TRACE_IRQS_IRETQ 0 RESTORE_ALL 8 jmp irq_return @@ -1421,7 +1705,7 @@ movq_cfi r14, R14+8 movq_cfi r15, R15+8 xorl %ebx,%ebx - testl $3,CS+8(%rsp) + testb $3,CS+8(%rsp) je error_kernelspace error_swapgs: SWAPGS @@ -1485,6 +1769,16 @@ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid DEFAULT_FRAME 0 +#ifdef CONFIG_PAX_MEMORY_UDEREF + testb $3, CS(%rsp) + jnz 1f + pax_enter_kernel + jmp 2f +1: pax_enter_kernel_user +2: +#else + pax_enter_kernel +#endif /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */ movq %rsp,%rdi movq $-1,%rsi @@ -1495,11 +1789,25 @@ DISABLE_INTERRUPTS(CLBR_NONE) testl %ebx,%ebx /* swapgs needed? */ jnz nmi_restore - testl $3,CS(%rsp) + testb $3,CS(%rsp) jnz nmi_userspace +#ifdef CONFIG_PAX_MEMORY_UDEREF + pax_exit_kernel + SWAPGS_UNSAFE_STACK + RESTORE_ALL 8 + jmp irq_return +#endif nmi_swapgs: +#ifdef CONFIG_PAX_MEMORY_UDEREF + pax_exit_kernel_user +#else + pax_exit_kernel +#endif SWAPGS_UNSAFE_STACK + RESTORE_ALL 8 + jmp irq_return nmi_restore: + pax_exit_kernel RESTORE_ALL 8 jmp irq_return nmi_userspace: diff -uriN linux-2.6.38.4/arch/x86/kernel/ftrace.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/ftrace.c --- linux-2.6.38.4/arch/x86/kernel/ftrace.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/ftrace.c 2011-05-01 17:02:10.000000000 -0500 @@ -177,7 +177,9 @@ if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { smp_rmb(); + pax_open_kernel(); ftrace_mod_code(); + pax_close_kernel(); atomic_inc(&nmi_update_count); } /* Must have previous changes seen before executions */ @@ -271,6 +273,8 @@ { unsigned char replaced[MCOUNT_INSN_SIZE]; + ip = ktla_ktva(ip); + /* * Note: Due to modules and __init, code can * disappear and change, we need to protect against faulting @@ -327,7 +331,7 @@ unsigned char old[MCOUNT_INSN_SIZE], *new; int ret; - memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE); + memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE); new = ftrace_call_replace(ip, (unsigned long)func); ret = ftrace_modify_code(ip, old, new); @@ -353,6 +357,8 @@ { unsigned char code[MCOUNT_INSN_SIZE]; + ip = ktla_ktva(ip); + if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; diff -uriN linux-2.6.38.4/arch/x86/kernel/head32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/head32.c --- linux-2.6.38.4/arch/x86/kernel/head32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/head32.c 2011-05-01 17:02:10.000000000 -0500 @@ -19,6 +19,7 @@ #include #include #include +#include static void __init i386_default_early_setup(void) { @@ -43,7 +44,7 @@ memblock_x86_reserve_range(PAGE_SIZE, PAGE_SIZE + PAGE_SIZE, "EX TRAMPOLINE"); #endif - memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS"); + memblock_x86_reserve_range(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS"); #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ diff -uriN linux-2.6.38.4/arch/x86/kernel/head_32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/head_32.S --- linux-2.6.38.4/arch/x86/kernel/head_32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/head_32.S 2011-05-01 17:02:10.000000000 -0500 @@ -25,6 +25,12 @@ /* Physical address */ #define pa(X) ((X) - __PAGE_OFFSET) +#ifdef CONFIG_PAX_KERNEXEC +#define ta(X) (X) +#else +#define ta(X) ((X) - __PAGE_OFFSET) +#endif + /* * References to members of the new_cpu_data structure. */ @@ -54,11 +60,7 @@ * and small than max_low_pfn, otherwise will waste some page table entries */ -#if PTRS_PER_PMD > 1 -#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD) -#else -#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD) -#endif +#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE) /* Number of possible pages in the lowmem region */ LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT) @@ -77,6 +79,12 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE) /* + * Real beginning of normal "text" segment + */ +ENTRY(stext) +ENTRY(_stext) + +/* * 32-bit kernel entrypoint; only used by the boot CPU. On entry, * %esi points to the real-mode code as a 32-bit pointer. * CS and DS must be 4 GB flat segments, but we don't depend on @@ -84,6 +92,13 @@ * can. */ __HEAD + +#ifdef CONFIG_PAX_KERNEXEC + jmp startup_32 +/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */ +.fill PAGE_SIZE-5,1,0xcc +#endif + ENTRY(startup_32) movl pa(stack_start),%ecx @@ -105,6 +120,57 @@ 2: leal -__PAGE_OFFSET(%ecx),%esp +#ifdef CONFIG_SMP + movl $pa(cpu_gdt_table),%edi + movl $__per_cpu_load,%eax + movw %ax,__KERNEL_PERCPU + 2(%edi) + rorl $16,%eax + movb %al,__KERNEL_PERCPU + 4(%edi) + movb %ah,__KERNEL_PERCPU + 7(%edi) + movl $__per_cpu_end - 1,%eax + subl $__per_cpu_start,%eax + movw %ax,__KERNEL_PERCPU + 0(%edi) +#endif + +#ifdef CONFIG_PAX_MEMORY_UDEREF + movl $NR_CPUS,%ecx + movl $pa(cpu_gdt_table),%edi +1: + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi) + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi) + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi) + addl $PAGE_SIZE_asm,%edi + loop 1b +#endif + +#ifdef CONFIG_PAX_KERNEXEC + movl $pa(boot_gdt),%edi + movl $__LOAD_PHYSICAL_ADDR,%eax + movw %ax,__BOOT_CS + 2(%edi) + rorl $16,%eax + movb %al,__BOOT_CS + 4(%edi) + movb %ah,__BOOT_CS + 7(%edi) + rorl $16,%eax + + ljmp $(__BOOT_CS),$1f +1: + + movl $NR_CPUS,%ecx + movl $pa(cpu_gdt_table),%edi + addl $__PAGE_OFFSET,%eax +1: + movw %ax,__KERNEL_CS + 2(%edi) + movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi) + rorl $16,%eax + movb %al,__KERNEL_CS + 4(%edi) + movb %al,__KERNEXEC_KERNEL_CS + 4(%edi) + movb %ah,__KERNEL_CS + 7(%edi) + movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi) + rorl $16,%eax + addl $PAGE_SIZE_asm,%edi + loop 1b +#endif + /* * Clear BSS first so that there are no surprises... */ @@ -195,8 +261,11 @@ movl %eax, pa(max_pfn_mapped) /* Do early initialization of the fixmap area */ - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax - movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8) +#ifdef CONFIG_COMPAT_VDSO + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8) +#else + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8) +#endif #else /* Not PAE */ page_pde_offset = (__PAGE_OFFSET >> 20); @@ -226,8 +295,11 @@ movl %eax, pa(max_pfn_mapped) /* Do early initialization of the fixmap area */ - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax - movl %eax,pa(initial_page_table+0xffc) +#ifdef CONFIG_COMPAT_VDSO + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc) +#else + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc) +#endif #endif #ifdef CONFIG_PARAVIRT @@ -241,9 +313,7 @@ cmpl $num_subarch_entries, %eax jae bad_subarch - movl pa(subarch_entries)(,%eax,4), %eax - subl $__PAGE_OFFSET, %eax - jmp *%eax + jmp *pa(subarch_entries)(,%eax,4) bad_subarch: WEAK(lguest_entry) @@ -255,10 +325,10 @@ __INITDATA subarch_entries: - .long default_entry /* normal x86/PC */ - .long lguest_entry /* lguest hypervisor */ - .long xen_entry /* Xen hypervisor */ - .long default_entry /* Moorestown MID */ + .long pa(default_entry) /* normal x86/PC */ + .long pa(lguest_entry) /* lguest hypervisor */ + .long pa(xen_entry) /* Xen hypervisor */ + .long pa(default_entry) /* Moorestown MID */ num_subarch_entries = (. - subarch_entries) / 4 .previous #else @@ -312,6 +382,7 @@ orl %edx,%eax movl %eax,%cr4 +#ifdef CONFIG_X86_PAE testb $X86_CR4_PAE, %al # check if PAE is enabled jz 6f @@ -340,6 +411,9 @@ /* Make changes effective */ wrmsr + btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4) +#endif + 6: /* @@ -443,7 +517,7 @@ 1: movl $(__KERNEL_DS),%eax # reload all the segment registers movl %eax,%ss # after changing gdt. - movl $(__USER_DS),%eax # DS/ES contains default USER segment +# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment movl %eax,%ds movl %eax,%es @@ -457,15 +531,22 @@ */ cmpb $0,ready jne 1f - movl $gdt_page,%eax + movl $cpu_gdt_table,%eax movl $stack_canary,%ecx +#ifdef CONFIG_SMP + addl $__per_cpu_load,%ecx +#endif movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax) shrl $16, %ecx movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax) movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax) 1: -#endif movl $(__KERNEL_STACK_CANARY),%eax +#elif defined(CONFIG_PAX_MEMORY_UDEREF) + movl $(__USER_DS),%eax +#else + xorl %eax,%eax +#endif movl %eax,%gs xorl %eax,%eax # Clear LDT @@ -558,22 +639,22 @@ jmp early_fault early_fault: - cld #ifdef CONFIG_PRINTK + cmpl $1,%ss:early_recursion_flag + je hlt_loop + incl %ss:early_recursion_flag + cld pusha movl $(__KERNEL_DS),%eax movl %eax,%ds movl %eax,%es - cmpl $2,early_recursion_flag - je hlt_loop - incl early_recursion_flag movl %cr2,%eax pushl %eax pushl %edx /* trapno */ pushl $fault_msg call printk +; call dump_stack #endif - call dump_stack hlt_loop: hlt jmp hlt_loop @@ -581,8 +662,11 @@ /* This is the default interrupt "handler" :-) */ ALIGN ignore_int: - cld #ifdef CONFIG_PRINTK + cmpl $2,%ss:early_recursion_flag + je hlt_loop + incl %ss:early_recursion_flag + cld pushl %eax pushl %ecx pushl %edx @@ -591,9 +675,6 @@ movl $(__KERNEL_DS),%eax movl %eax,%ds movl %eax,%es - cmpl $2,early_recursion_flag - je hlt_loop - incl early_recursion_flag pushl 16(%esp) pushl 24(%esp) pushl 32(%esp) @@ -622,29 +703,43 @@ /* * BSS section */ -__PAGE_ALIGNED_BSS - .align PAGE_SIZE_asm #ifdef CONFIG_X86_PAE +.section .initial_pg_pmd,"a",@progbits initial_pg_pmd: .fill 1024*KPMDS,4,0 #else +.section .initial_page_table,"a",@progbits ENTRY(initial_page_table) .fill 1024,4,0 #endif +.section .initial_pg_fixmap,"a",@progbits initial_pg_fixmap: .fill 1024,4,0 +.section .empty_zero_page,"a",@progbits ENTRY(empty_zero_page) .fill 4096,1,0 +.section .swapper_pg_dir,"a",@progbits ENTRY(swapper_pg_dir) +#ifdef CONFIG_X86_PAE + .fill 4,8,0 +#else .fill 1024,4,0 +#endif + +/* + * The IDT has to be page-aligned to simplify the Pentium + * F0 0F bug workaround.. We have a special link segment + * for this. + */ +.section .idt,"a",@progbits +ENTRY(idt_table) + .fill 256,8,0 /* * This starts the data section. */ #ifdef CONFIG_X86_PAE -__PAGE_ALIGNED_DATA - /* Page-aligned for the benefit of paravirt? */ - .align PAGE_SIZE_asm +.section .initial_page_table,"a",@progbits ENTRY(initial_page_table) .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */ # if KPMDS == 3 @@ -663,18 +758,27 @@ # error "Kernel PMDs should be 1, 2 or 3" # endif .align PAGE_SIZE_asm /* needs to be page-sized too */ + +#ifdef CONFIG_PAX_PER_CPU_PGD +ENTRY(cpu_pgd) + .rept NR_CPUS + .fill 4,8,0 + .endr +#endif + #endif .data .balign 4 ENTRY(stack_start) - .long init_thread_union+THREAD_SIZE + .long init_thread_union+THREAD_SIZE-8 + +ready: .byte 0 +.section .rodata,"a",@progbits early_recursion_flag: .long 0 -ready: .byte 0 - int_msg: .asciz "Unknown interrupt or fault at: %p %p %p\n" @@ -707,7 +811,7 @@ .word 0 # 32 bit align gdt_desc.address boot_gdt_descr: .word __BOOT_DS+7 - .long boot_gdt - __PAGE_OFFSET + .long pa(boot_gdt) .word 0 # 32-bit align idt_desc.address idt_descr: @@ -718,7 +822,7 @@ .word 0 # 32 bit align gdt_desc.address ENTRY(early_gdt_descr) .word GDT_ENTRIES*8-1 - .long gdt_page /* Overwritten for secondary CPUs */ + .long cpu_gdt_table /* Overwritten for secondary CPUs */ /* * The boot_gdt must mirror the equivalent in setup.S and is @@ -727,5 +831,65 @@ .align L1_CACHE_BYTES ENTRY(boot_gdt) .fill GDT_ENTRY_BOOT_CS,8,0 - .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */ - .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */ + .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */ + .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */ + + .align PAGE_SIZE_asm +ENTRY(cpu_gdt_table) + .rept NR_CPUS + .quad 0x0000000000000000 /* NULL descriptor */ + .quad 0x0000000000000000 /* 0x0b reserved */ + .quad 0x0000000000000000 /* 0x13 reserved */ + .quad 0x0000000000000000 /* 0x1b reserved */ + +#ifdef CONFIG_PAX_KERNEXEC + .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */ +#else + .quad 0x0000000000000000 /* 0x20 unused */ +#endif + + .quad 0x0000000000000000 /* 0x28 unused */ + .quad 0x0000000000000000 /* 0x33 TLS entry 1 */ + .quad 0x0000000000000000 /* 0x3b TLS entry 2 */ + .quad 0x0000000000000000 /* 0x43 TLS entry 3 */ + .quad 0x0000000000000000 /* 0x4b reserved */ + .quad 0x0000000000000000 /* 0x53 reserved */ + .quad 0x0000000000000000 /* 0x5b reserved */ + + .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */ + .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */ + .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */ + .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */ + + .quad 0x0000000000000000 /* 0x80 TSS descriptor */ + .quad 0x0000000000000000 /* 0x88 LDT descriptor */ + + /* + * Segments used for calling PnP BIOS have byte granularity. + * The code segments and data segments have fixed 64k limits, + * the transfer segment sizes are set at run time. + */ + .quad 0x00409b000000ffff /* 0x90 32-bit code */ + .quad 0x00009b000000ffff /* 0x98 16-bit code */ + .quad 0x000093000000ffff /* 0xa0 16-bit data */ + .quad 0x0000930000000000 /* 0xa8 16-bit data */ + .quad 0x0000930000000000 /* 0xb0 16-bit data */ + + /* + * The APM segments have byte granularity and their bases + * are set at run time. All have 64k limits. + */ + .quad 0x00409b000000ffff /* 0xb8 APM CS code */ + .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */ + .quad 0x004093000000ffff /* 0xc8 APM DS data */ + + .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */ + .quad 0x0040930000000000 /* 0xd8 - PERCPU */ + .quad 0x0040910000000018 /* 0xe0 - STACK_CANARY */ + .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */ + .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */ + .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */ + + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr diff -uriN linux-2.6.38.4/arch/x86/kernel/head_64.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/head_64.S --- linux-2.6.38.4/arch/x86/kernel/head_64.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/head_64.S 2011-05-01 17:02:10.000000000 -0500 @@ -19,6 +19,7 @@ #include #include #include +#include #ifdef CONFIG_PARAVIRT #include @@ -38,6 +39,10 @@ L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET) L4_START_KERNEL = pgd_index(__START_KERNEL_map) L3_START_KERNEL = pud_index(__START_KERNEL_map) +L4_VMALLOC_START = pgd_index(VMALLOC_START) +L3_VMALLOC_START = pud_index(VMALLOC_START) +L4_VMEMMAP_START = pgd_index(VMEMMAP_START) +L3_VMEMMAP_START = pud_index(VMEMMAP_START) .text __HEAD @@ -85,35 +90,22 @@ */ addq %rbp, init_level4_pgt + 0(%rip) addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip) + addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip) + addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip) addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip) addq %rbp, level3_ident_pgt + 0(%rip) +#ifndef CONFIG_XEN + addq %rbp, level3_ident_pgt + 8(%rip) +#endif - addq %rbp, level3_kernel_pgt + (510*8)(%rip) - addq %rbp, level3_kernel_pgt + (511*8)(%rip) + addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip) - addq %rbp, level2_fixmap_pgt + (506*8)(%rip) + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip) + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip) - /* Add an Identity mapping if I am above 1G */ - leaq _text(%rip), %rdi - andq $PMD_PAGE_MASK, %rdi - - movq %rdi, %rax - shrq $PUD_SHIFT, %rax - andq $(PTRS_PER_PUD - 1), %rax - jz ident_complete - - leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx - leaq level3_ident_pgt(%rip), %rbx - movq %rdx, 0(%rbx, %rax, 8) - - movq %rdi, %rax - shrq $PMD_SHIFT, %rax - andq $(PTRS_PER_PMD - 1), %rax - leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx - leaq level2_spare_pgt(%rip), %rbx - movq %rdx, 0(%rbx, %rax, 8) -ident_complete: + addq %rbp, level2_fixmap_pgt + (506*8)(%rip) + addq %rbp, level2_fixmap_pgt + (507*8)(%rip) /* * Fixup the kernel text+data virtual addresses. Note that @@ -161,8 +153,8 @@ * after the boot processor executes this code. */ - /* Enable PAE mode and PGE */ - movl $(X86_CR4_PAE | X86_CR4_PGE), %eax + /* Enable PAE mode and PSE/PGE */ + movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax movq %rax, %cr4 /* Setup early boot stage 4 level pagetables. */ @@ -184,9 +176,14 @@ movl $MSR_EFER, %ecx rdmsr btsl $_EFER_SCE, %eax /* Enable System Call */ - btl $20,%edi /* No Execute supported? */ + btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */ jnc 1f btsl $_EFER_NX, %eax + leaq init_level4_pgt(%rip), %rdi + btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi) + btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi) + btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi) + btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip) 1: wrmsr /* Make changes effective */ /* Setup cr0 */ @@ -270,7 +267,7 @@ bad_address: jmp bad_address - .section ".init.text","ax" + __INIT #ifdef CONFIG_EARLY_PRINTK .globl early_idt_handlers early_idt_handlers: @@ -315,18 +312,23 @@ #endif /* EARLY_PRINTK */ 1: hlt jmp 1b + .previous #ifdef CONFIG_EARLY_PRINTK + __INITDATA early_recursion_flag: .long 0 + .previous + .section .rodata,"a",@progbits early_idt_msg: .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n" early_idt_ripmsg: .asciz "RIP %s\n" -#endif /* CONFIG_EARLY_PRINTK */ .previous +#endif /* CONFIG_EARLY_PRINTK */ + .section .rodata,"a",@progbits #define NEXT_PAGE(name) \ .balign PAGE_SIZE; \ ENTRY(name) @@ -339,7 +341,6 @@ i = i + 1 ; \ .endr - .data /* * This default setting generates an ident mapping at address 0x100000 * and a mapping for the kernel that precisely maps virtual address @@ -350,13 +351,36 @@ .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE .org init_level4_pgt + L4_PAGE_OFFSET*8, 0 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE + .org init_level4_pgt + L4_VMALLOC_START*8, 0 + .quad level3_vmalloc_pgt - __START_KERNEL_map + _KERNPG_TABLE + .org init_level4_pgt + L4_VMEMMAP_START*8, 0 + .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE .org init_level4_pgt + L4_START_KERNEL*8, 0 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */ .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE +#ifdef CONFIG_PAX_PER_CPU_PGD +NEXT_PAGE(cpu_pgd) + .rept NR_CPUS + .fill 512,8,0 + .endr +#endif + NEXT_PAGE(level3_ident_pgt) .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE +#ifdef CONFIG_XEN .fill 511,8,0 +#else + .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE + .fill 510,8,0 +#endif + +NEXT_PAGE(level3_vmalloc_pgt) + .fill 512,8,0 + +NEXT_PAGE(level3_vmemmap_pgt) + .fill L3_VMEMMAP_START,8,0 + .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE NEXT_PAGE(level3_kernel_pgt) .fill L3_START_KERNEL,8,0 @@ -364,20 +388,23 @@ .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE +NEXT_PAGE(level2_vmemmap_pgt) + .fill 512,8,0 + NEXT_PAGE(level2_fixmap_pgt) - .fill 506,8,0 - .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */ - .fill 5,8,0 + .fill 507,8,0 + .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE + /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */ + .fill 4,8,0 -NEXT_PAGE(level1_fixmap_pgt) +NEXT_PAGE(level1_vsyscall_pgt) .fill 512,8,0 -NEXT_PAGE(level2_ident_pgt) - /* Since I easily can, map the first 1G. + /* Since I easily can, map the first 2G. * Don't set NX because code runs from these pages. */ - PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD) +NEXT_PAGE(level2_ident_pgt) + PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD) NEXT_PAGE(level2_kernel_pgt) /* @@ -390,33 +417,55 @@ * If you want to increase this then increase MODULES_VADDR * too.) */ - PMDS(0, __PAGE_KERNEL_LARGE_EXEC, - KERNEL_IMAGE_SIZE/PMD_SIZE) - -NEXT_PAGE(level2_spare_pgt) - .fill 512, 8, 0 + PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE) #undef PMDS #undef NEXT_PAGE - .data + .align PAGE_SIZE +ENTRY(cpu_gdt_table) + .rept NR_CPUS + .quad 0x0000000000000000 /* NULL descriptor */ + .quad 0x00cf9b000000ffff /* __KERNEL32_CS */ + .quad 0x00af9b000000ffff /* __KERNEL_CS */ + .quad 0x00cf93000000ffff /* __KERNEL_DS */ + .quad 0x00cffb000000ffff /* __USER32_CS */ + .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */ + .quad 0x00affb000000ffff /* __USER_CS */ + +#ifdef CONFIG_PAX_KERNEXEC + .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */ +#else + .quad 0x0 /* unused */ +#endif + + .quad 0,0 /* TSS */ + .quad 0,0 /* LDT */ + .quad 0,0,0 /* three TLS descriptors */ + .quad 0x0000f40000000000 /* node/CPU stored in limit */ + /* asm/segment.h:GDT_ENTRIES must match this */ + + /* zero the remaining page */ + .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0 + .endr + .align 16 .globl early_gdt_descr early_gdt_descr: .word GDT_ENTRIES*8-1 early_gdt_descr_base: - .quad INIT_PER_CPU_VAR(gdt_page) + .quad cpu_gdt_table ENTRY(phys_base) /* This must match the first entry in level2_kernel_pgt */ .quad 0x0000000000000000 #include "../../x86/xen/xen-head.S" - - .section .bss, "aw", @nobits + + .section .rodata,"a",@progbits .align L1_CACHE_BYTES ENTRY(idt_table) - .skip IDT_ENTRIES * 16 + .fill 512,8,0 __PAGE_ALIGNED_BSS .align PAGE_SIZE diff -uriN linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/i386_ksyms_32.c --- linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/i386_ksyms_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -20,8 +20,12 @@ EXPORT_SYMBOL(cmpxchg8b_emu); #endif +EXPORT_SYMBOL_GPL(cpu_gdt_table); + /* Networking helper routines. */ EXPORT_SYMBOL(csum_partial_copy_generic); +EXPORT_SYMBOL(csum_partial_copy_generic_to_user); +EXPORT_SYMBOL(csum_partial_copy_generic_from_user); EXPORT_SYMBOL(__get_user_1); EXPORT_SYMBOL(__get_user_2); @@ -36,3 +40,7 @@ EXPORT_SYMBOL(csum_partial); EXPORT_SYMBOL(empty_zero_page); + +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif diff -uriN linux-2.6.38.4/arch/x86/kernel/init_task.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/init_task.c --- linux-2.6.38.4/arch/x86/kernel/init_task.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/init_task.c 2011-05-01 17:02:10.000000000 -0500 @@ -20,8 +20,7 @@ * way process stacks are handled. This is done by having a special * "init_task" linker map entry.. */ -union thread_union init_thread_union __init_task_data = - { INIT_THREAD_INFO(init_task) }; +union thread_union init_thread_union __init_task_data; /* * Initial task structure. @@ -38,5 +37,5 @@ * section. Since TSS's are completely CPU-local, we want them * on exact cacheline boundaries, to eliminate cacheline ping-pong. */ -DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS; - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); diff -uriN linux-2.6.38.4/arch/x86/kernel/ioport.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/ioport.c --- linux-2.6.38.4/arch/x86/kernel/ioport.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/ioport.c 2011-05-01 17:02:10.000000000 -0500 @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +42,12 @@ if ((from + num <= from) || (from + num > IO_BITMAP_BITS)) return -EINVAL; +#ifdef CONFIG_GRKERNSEC_IO + if (turn_on && grsec_disable_privio) { + gr_handle_ioperm(); + return -EPERM; + } +#endif if (turn_on && !capable(CAP_SYS_RAWIO)) return -EPERM; @@ -67,7 +74,7 @@ * because the ->io_bitmap_max value must match the bitmap * contents: */ - tss = &per_cpu(init_tss, get_cpu()); + tss = init_tss + get_cpu(); set_bitmap(t->io_bitmap_ptr, from, num, !turn_on); @@ -112,6 +119,12 @@ return -EINVAL; /* Trying to gain more privileges? */ if (level > old) { +#ifdef CONFIG_GRKERNSEC_IO + if (grsec_disable_privio) { + gr_handle_iopl(); + return -EPERM; + } +#endif if (!capable(CAP_SYS_RAWIO)) return -EPERM; } diff -uriN linux-2.6.38.4/arch/x86/kernel/irq_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/irq_32.c --- linux-2.6.38.4/arch/x86/kernel/irq_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/irq_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -36,7 +36,7 @@ __asm__ __volatile__("andl %%esp,%0" : "=r" (sp) : "0" (THREAD_SIZE - 1)); - return sp < (sizeof(struct thread_info) + STACK_WARN); + return sp < STACK_WARN; } static void print_stack_overflow(void) @@ -54,8 +54,8 @@ * per-CPU IRQ handling contexts (thread information and stack) */ union irq_ctx { - struct thread_info tinfo; - u32 stack[THREAD_SIZE/sizeof(u32)]; + unsigned long previous_esp; + u32 stack[THREAD_SIZE/sizeof(u32)]; } __attribute__((aligned(THREAD_SIZE))); static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx); @@ -75,10 +75,9 @@ static inline int execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq) { - union irq_ctx *curctx, *irqctx; + union irq_ctx *irqctx; u32 *isp, arg1, arg2; - curctx = (union irq_ctx *) current_thread_info(); irqctx = __this_cpu_read(hardirq_ctx); /* @@ -87,21 +86,17 @@ * handler) we can't do that and just have to keep using the * current stack (which is the irq stack already after all) */ - if (unlikely(curctx == irqctx)) + if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE)) return 0; /* build the stack frame on the IRQ stack */ - isp = (u32 *) ((char *)irqctx + sizeof(*irqctx)); - irqctx->tinfo.task = curctx->tinfo.task; - irqctx->tinfo.previous_esp = current_stack_pointer; + isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8); + irqctx->previous_esp = current_stack_pointer; + add_preempt_count(HARDIRQ_OFFSET); - /* - * Copy the softirq bits in preempt_count so that the - * softirq checks work in the hardirq context. - */ - irqctx->tinfo.preempt_count = - (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) | - (curctx->tinfo.preempt_count & SOFTIRQ_MASK); +#ifdef CONFIG_PAX_MEMORY_UDEREF + __set_fs(MAKE_MM_SEG(0)); +#endif if (unlikely(overflow)) call_on_stack(print_stack_overflow, isp); @@ -113,6 +108,12 @@ : "0" (irq), "1" (desc), "2" (isp), "D" (desc->handle_irq) : "memory", "cc", "ecx"); + +#ifdef CONFIG_PAX_MEMORY_UDEREF + __set_fs(current_thread_info()->addr_limit); +#endif + + sub_preempt_count(HARDIRQ_OFFSET); return 1; } @@ -121,29 +122,11 @@ */ void __cpuinit irq_ctx_init(int cpu) { - union irq_ctx *irqctx; - if (per_cpu(hardirq_ctx, cpu)) return; - irqctx = page_address(alloc_pages_node(cpu_to_node(cpu), - THREAD_FLAGS, - THREAD_ORDER)); - memset(&irqctx->tinfo, 0, sizeof(struct thread_info)); - irqctx->tinfo.cpu = cpu; - irqctx->tinfo.preempt_count = HARDIRQ_OFFSET; - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0); - - per_cpu(hardirq_ctx, cpu) = irqctx; - - irqctx = page_address(alloc_pages_node(cpu_to_node(cpu), - THREAD_FLAGS, - THREAD_ORDER)); - memset(&irqctx->tinfo, 0, sizeof(struct thread_info)); - irqctx->tinfo.cpu = cpu; - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0); - - per_cpu(softirq_ctx, cpu) = irqctx; + per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER)); + per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER)); printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n", cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu)); @@ -152,7 +135,6 @@ asmlinkage void do_softirq(void) { unsigned long flags; - struct thread_info *curctx; union irq_ctx *irqctx; u32 *isp; @@ -162,15 +144,22 @@ local_irq_save(flags); if (local_softirq_pending()) { - curctx = current_thread_info(); irqctx = __this_cpu_read(softirq_ctx); - irqctx->tinfo.task = curctx->task; - irqctx->tinfo.previous_esp = current_stack_pointer; + irqctx->previous_esp = current_stack_pointer; /* build the stack frame on the softirq stack */ - isp = (u32 *) ((char *)irqctx + sizeof(*irqctx)); + isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8); + +#ifdef CONFIG_PAX_MEMORY_UDEREF + __set_fs(MAKE_MM_SEG(0)); +#endif call_on_stack(__do_softirq, isp); + +#ifdef CONFIG_PAX_MEMORY_UDEREF + __set_fs(current_thread_info()->addr_limit); +#endif + /* * Shouldnt happen, we returned above if in_interrupt(): */ diff -uriN linux-2.6.38.4/arch/x86/kernel/kgdb.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/kgdb.c --- linux-2.6.38.4/arch/x86/kernel/kgdb.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/kgdb.c 2011-05-01 17:02:10.000000000 -0500 @@ -124,11 +124,11 @@ switch (regno) { #ifdef CONFIG_X86_32 case GDB_SS: - if (!user_mode_vm(regs)) + if (!user_mode(regs)) *(unsigned long *)mem = __KERNEL_DS; break; case GDB_SP: - if (!user_mode_vm(regs)) + if (!user_mode(regs)) *(unsigned long *)mem = kernel_stack_pointer(regs); break; case GDB_GS: @@ -719,7 +719,7 @@ regs->ip = ip; } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { /* Breakpoint instruction: */ .gdb_bpt_instr = { 0xcc }, .flags = KGDB_HW_BREAKPOINT, diff -uriN linux-2.6.38.4/arch/x86/kernel/kprobes.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/kprobes.c --- linux-2.6.38.4/arch/x86/kernel/kprobes.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/kprobes.c 2011-05-01 17:02:10.000000000 -0500 @@ -115,8 +115,11 @@ } __attribute__((packed)) *insn; insn = (struct __arch_relative_insn *)from; + + pax_open_kernel(); insn->raddr = (s32)((long)(to) - ((long)(from) + 5)); insn->op = op; + pax_close_kernel(); } /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/ @@ -153,7 +156,7 @@ kprobe_opcode_t opcode; kprobe_opcode_t *orig_opcodes = opcodes; - if (search_exception_tables((unsigned long)opcodes)) + if (search_exception_tables(ktva_ktla((unsigned long)opcodes))) return 0; /* Page fault may occur on this address. */ retry: @@ -314,7 +317,9 @@ } } insn_get_length(&insn); + pax_open_kernel(); memcpy(dest, insn.kaddr, insn.length); + pax_close_kernel(); #ifdef CONFIG_X86_64 if (insn_rip_relative(&insn)) { @@ -338,7 +343,9 @@ (u8 *) dest; BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */ disp = (u8 *) dest + insn_offset_displacement(&insn); + pax_open_kernel(); *(s32 *) disp = (s32) newdisp; + pax_close_kernel(); } #endif return insn.length; @@ -352,12 +359,12 @@ */ __copy_instruction(p->ainsn.insn, p->addr, 0); - if (can_boost(p->addr)) + if (can_boost(ktla_ktva(p->addr))) p->ainsn.boostable = 0; else p->ainsn.boostable = -1; - p->opcode = *p->addr; + p->opcode = *(ktla_ktva(p->addr)); } int __kprobes arch_prepare_kprobe(struct kprobe *p) @@ -474,7 +481,7 @@ * nor set current_kprobe, because it doesn't use single * stepping. */ - regs->ip = (unsigned long)p->ainsn.insn; + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn); preempt_enable_no_resched(); return; } @@ -493,7 +500,7 @@ if (p->opcode == BREAKPOINT_INSTRUCTION) regs->ip = (unsigned long)p->addr; else - regs->ip = (unsigned long)p->ainsn.insn; + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn); } /* @@ -572,7 +579,7 @@ setup_singlestep(p, regs, kcb, 0); return 1; } - } else if (*addr != BREAKPOINT_INSTRUCTION) { + } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) { /* * The breakpoint instruction was removed right * after we hit it. Another cpu has removed @@ -817,7 +824,7 @@ struct pt_regs *regs, struct kprobe_ctlblk *kcb) { unsigned long *tos = stack_addr(regs); - unsigned long copy_ip = (unsigned long)p->ainsn.insn; + unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn); unsigned long orig_ip = (unsigned long)p->addr; kprobe_opcode_t *insn = p->ainsn.insn; @@ -999,7 +1006,7 @@ struct die_args *args = data; int ret = NOTIFY_DONE; - if (args->regs && user_mode_vm(args->regs)) + if (args->regs && user_mode(args->regs)) return ret; switch (val) { @@ -1372,7 +1379,7 @@ * Verify if the address gap is in 2GB range, because this uses * a relative jump. */ - rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE; + rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE; if (abs(rel) > 0x7fffffff) return -ERANGE; @@ -1393,11 +1400,11 @@ synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op); /* Set probe function call */ - synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback); + synthesize_relcall(buf + TMPL_CALL_IDX, ktla_ktva(optimized_callback)); /* Set returning jmp instruction at the tail of out-of-line buffer */ synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size, - (u8 *)op->kp.addr + op->optinsn.size); + (u8 *)ktla_ktva(op->kp.addr) + op->optinsn.size); flush_icache_range((unsigned long) buf, (unsigned long) buf + TMPL_END_IDX + @@ -1419,7 +1426,7 @@ ((long)op->kp.addr + RELATIVEJUMP_SIZE)); /* Backup instructions which will be replaced by jump address */ - memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE, + memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE, RELATIVE_ADDR_SIZE); insn_buf[0] = RELATIVEJUMP_OPCODE; diff -uriN linux-2.6.38.4/arch/x86/kernel/ldt.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/ldt.c --- linux-2.6.38.4/arch/x86/kernel/ldt.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/ldt.c 2011-05-01 17:02:10.000000000 -0500 @@ -67,13 +67,13 @@ if (reload) { #ifdef CONFIG_SMP preempt_disable(); - load_LDT(pc); + load_LDT_nolock(pc); if (!cpumask_equal(mm_cpumask(current->mm), cpumask_of(smp_processor_id()))) smp_call_function(flush_ldt, current->mm, 1); preempt_enable(); #else - load_LDT(pc); + load_LDT_nolock(pc); #endif } if (oldsize) { @@ -95,7 +95,7 @@ return err; for (i = 0; i < old->size; i++) - write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE); + write_ldt_entry(new->ldt, i, old->ldt + i); return 0; } @@ -116,6 +116,24 @@ retval = copy_ldt(&mm->context, &old_mm->context); mutex_unlock(&old_mm->context.lock); } + + if (tsk == current) { + mm->context.vdso = 0; + +#ifdef CONFIG_X86_32 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) + mm->context.user_cs_base = 0UL; + mm->context.user_cs_limit = ~0UL; + +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP) + cpus_clear(mm->context.cpu_user_cs_mask); +#endif + +#endif +#endif + + } + return retval; } @@ -230,6 +248,13 @@ } } +#ifdef CONFIG_PAX_SEGMEXEC + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) { + error = -EINVAL; + goto out_unlock; + } +#endif + fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; diff -uriN linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/machine_kexec_32.c --- linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/machine_kexec_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -27,7 +27,7 @@ #include #include -static void set_idt(void *newidt, __u16 limit) +static void set_idt(struct desc_struct *newidt, __u16 limit) { struct desc_ptr curidt; @@ -39,7 +39,7 @@ } -static void set_gdt(void *newgdt, __u16 limit) +static void set_gdt(struct desc_struct *newgdt, __u16 limit) { struct desc_ptr curgdt; @@ -217,7 +217,7 @@ } control_page = page_address(image->control_code_page); - memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE); + memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE); relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); diff -uriN linux-2.6.38.4/arch/x86/kernel/microcode_amd.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/microcode_amd.c --- linux-2.6.38.4/arch/x86/kernel/microcode_amd.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/microcode_amd.c 2011-05-01 17:02:10.000000000 -0500 @@ -317,7 +317,7 @@ uci->mc = NULL; } -static struct microcode_ops microcode_amd_ops = { +static const struct microcode_ops microcode_amd_ops = { .request_microcode_user = request_microcode_user, .request_microcode_fw = request_microcode_fw, .collect_cpu_info = collect_cpu_info_amd, @@ -325,7 +325,7 @@ .microcode_fini_cpu = microcode_fini_cpu_amd, }; -struct microcode_ops * __init init_amd_microcode(void) +const struct microcode_ops * __init init_amd_microcode(void) { return µcode_amd_ops; } diff -uriN linux-2.6.38.4/arch/x86/kernel/microcode_core.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/microcode_core.c --- linux-2.6.38.4/arch/x86/kernel/microcode_core.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/microcode_core.c 2011-05-01 17:02:10.000000000 -0500 @@ -92,7 +92,7 @@ #define MICROCODE_VERSION "2.00" -static struct microcode_ops *microcode_ops; +static const struct microcode_ops *microcode_ops; /* * Synchronization. diff -uriN linux-2.6.38.4/arch/x86/kernel/microcode_intel.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/microcode_intel.c --- linux-2.6.38.4/arch/x86/kernel/microcode_intel.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/microcode_intel.c 2011-05-01 17:02:10.000000000 -0500 @@ -440,13 +440,13 @@ static int get_ucode_user(void *to, const void *from, size_t n) { - return copy_from_user(to, from, n); + return copy_from_user(to, (__force const void __user *)from, n); } static enum ucode_state request_microcode_user(int cpu, const void __user *buf, size_t size) { - return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user); + return generic_load_microcode(cpu, (__force void *)buf, size, &get_ucode_user); } static void microcode_fini_cpu(int cpu) @@ -457,7 +457,7 @@ uci->mc = NULL; } -static struct microcode_ops microcode_intel_ops = { +static const struct microcode_ops microcode_intel_ops = { .request_microcode_user = request_microcode_user, .request_microcode_fw = request_microcode_fw, .collect_cpu_info = collect_cpu_info, @@ -465,7 +465,7 @@ .microcode_fini_cpu = microcode_fini_cpu, }; -struct microcode_ops * __init init_intel_microcode(void) +const struct microcode_ops * __init init_intel_microcode(void) { return µcode_intel_ops; } diff -uriN linux-2.6.38.4/arch/x86/kernel/module.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/module.c --- linux-2.6.38.4/arch/x86/kernel/module.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/module.c 2011-05-01 17:02:10.000000000 -0500 @@ -35,21 +35,66 @@ #define DEBUGP(fmt...) #endif -void *module_alloc(unsigned long size) +static inline void *__module_alloc(unsigned long size, pgprot_t prot) { if (PAGE_ALIGN(size) > MODULES_LEN) return NULL; return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, - GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC, + GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot, -1, __builtin_return_address(0)); } +void *module_alloc(unsigned long size) +{ + +#ifdef CONFIG_PAX_KERNEXEC + return __module_alloc(size, PAGE_KERNEL); +#else + return __module_alloc(size, PAGE_KERNEL_EXEC); +#endif + +} + /* Free memory returned from module_alloc */ void module_free(struct module *mod, void *module_region) { vfree(module_region); } +#ifdef CONFIG_PAX_KERNEXEC +#ifdef CONFIG_X86_32 +void *module_alloc_exec(unsigned long size) +{ + struct vm_struct *area; + + if (size == 0) + return NULL; + + area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END); + return area ? area->addr : NULL; +} +EXPORT_SYMBOL(module_alloc_exec); + +void module_free_exec(struct module *mod, void *module_region) +{ + vunmap(module_region); +} +EXPORT_SYMBOL(module_free_exec); +#else +void module_free_exec(struct module *mod, void *module_region) +{ + module_free(mod, module_region); +} +EXPORT_SYMBOL(module_free_exec); + +void *module_alloc_exec(unsigned long size) +{ + return __module_alloc(size, PAGE_KERNEL_RX); +} +EXPORT_SYMBOL(module_alloc_exec); +#endif +#endif + /* We don't need anything special. */ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, @@ -69,14 +114,16 @@ unsigned int i; Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr; Elf32_Sym *sym; - uint32_t *location; + uint32_t *plocation, location; DEBUGP("Applying relocate section %u to %u\n", relsec, sechdrs[relsec].sh_info); for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) { /* This is where to make the change */ - location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr - + rel[i].r_offset; + plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset; + location = (uint32_t)plocation; + if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR) + plocation = ktla_ktva((void *)plocation); /* This is the symbol it is referring to. Note that all undefined symbols have been resolved. */ sym = (Elf32_Sym *)sechdrs[symindex].sh_addr @@ -85,11 +132,15 @@ switch (ELF32_R_TYPE(rel[i].r_info)) { case R_386_32: /* We add the value into the location given */ - *location += sym->st_value; + pax_open_kernel(); + *plocation += sym->st_value; + pax_close_kernel(); break; case R_386_PC32: /* Add the value, subtract its postition */ - *location += sym->st_value - (uint32_t)location; + pax_open_kernel(); + *plocation += sym->st_value - location; + pax_close_kernel(); break; default: printk(KERN_ERR "module %s: Unknown relocation: %u\n", @@ -145,21 +196,30 @@ case R_X86_64_NONE: break; case R_X86_64_64: + pax_open_kernel(); *(u64 *)loc = val; + pax_close_kernel(); break; case R_X86_64_32: + pax_open_kernel(); *(u32 *)loc = val; + pax_close_kernel(); if (val != *(u32 *)loc) goto overflow; break; case R_X86_64_32S: + pax_open_kernel(); *(s32 *)loc = val; + pax_close_kernel(); if ((s64)val != *(s32 *)loc) goto overflow; break; case R_X86_64_PC32: val -= (u64)loc; + pax_open_kernel(); *(u32 *)loc = val; + pax_close_kernel(); + #if 0 if ((s64)val != *(s32 *)loc) goto overflow; diff -uriN linux-2.6.38.4/arch/x86/kernel/paravirt.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/paravirt.c --- linux-2.6.38.4/arch/x86/kernel/paravirt.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/paravirt.c 2011-05-01 17:02:10.000000000 -0500 @@ -122,7 +122,7 @@ * corresponding structure. */ static void *get_call_destination(u8 type) { - struct paravirt_patch_template tmpl = { + const struct paravirt_patch_template tmpl = { .pv_init_ops = pv_init_ops, .pv_time_ops = pv_time_ops, .pv_cpu_ops = pv_cpu_ops, @@ -145,14 +145,14 @@ if (opfunc == NULL) /* If there's no function, patch it with a ud2a (BUG) */ ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a)); - else if (opfunc == _paravirt_nop) + else if (opfunc == (void *)_paravirt_nop) /* If the operation is a nop, then nop the callsite */ ret = paravirt_patch_nop(); /* identity functions just return their single argument */ - else if (opfunc == _paravirt_ident_32) + else if (opfunc == (void *)_paravirt_ident_32) ret = paravirt_patch_ident_32(insnbuf, len); - else if (opfunc == _paravirt_ident_64) + else if (opfunc == (void *)_paravirt_ident_64) ret = paravirt_patch_ident_64(insnbuf, len); else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) || @@ -178,7 +178,7 @@ if (insn_len > len || start == NULL) insn_len = len; else - memcpy(insnbuf, start, insn_len); + memcpy(insnbuf, ktla_ktva(start), insn_len); return insn_len; } @@ -294,22 +294,22 @@ preempt_enable(); } -struct pv_info pv_info = { +struct pv_info pv_info __read_only = { .name = "bare hardware", .paravirt_enabled = 0, .kernel_rpl = 0, .shared_kernel_pmd = 1, /* Only used when CONFIG_X86_PAE is set */ }; -struct pv_init_ops pv_init_ops = { +struct pv_init_ops pv_init_ops __read_only = { .patch = native_patch, }; -struct pv_time_ops pv_time_ops = { +struct pv_time_ops pv_time_ops __read_only = { .sched_clock = native_sched_clock, }; -struct pv_irq_ops pv_irq_ops = { +struct pv_irq_ops pv_irq_ops __read_only = { .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl), .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl), .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable), @@ -321,7 +321,7 @@ #endif }; -struct pv_cpu_ops pv_cpu_ops = { +struct pv_cpu_ops pv_cpu_ops __read_only = { .cpuid = native_cpuid, .get_debugreg = native_get_debugreg, .set_debugreg = native_set_debugreg, @@ -382,7 +382,7 @@ .end_context_switch = paravirt_nop, }; -struct pv_apic_ops pv_apic_ops = { +struct pv_apic_ops pv_apic_ops __read_only = { #ifdef CONFIG_X86_LOCAL_APIC .startup_ipi_hook = paravirt_nop, #endif @@ -396,7 +396,7 @@ #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64) #endif -struct pv_mmu_ops pv_mmu_ops = { +struct pv_mmu_ops pv_mmu_ops __read_only = { .read_cr2 = native_read_cr2, .write_cr2 = native_write_cr2, @@ -465,6 +465,12 @@ }, .set_fixmap = native_set_fixmap, + +#ifdef CONFIG_PAX_KERNEXEC + .pax_open_kernel = native_pax_open_kernel, + .pax_close_kernel = native_pax_close_kernel, +#endif + }; EXPORT_SYMBOL_GPL(pv_time_ops); diff -uriN linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/paravirt-spinlocks.c --- linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/paravirt-spinlocks.c 2011-05-01 17:02:10.000000000 -0500 @@ -13,7 +13,7 @@ arch_spin_lock(lock); } -struct pv_lock_ops pv_lock_ops = { +struct pv_lock_ops pv_lock_ops __read_only = { #ifdef CONFIG_SMP .spin_is_locked = __ticket_spin_is_locked, .spin_is_contended = __ticket_spin_is_contended, diff -uriN linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/pci-calgary_64.c --- linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/pci-calgary_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -476,7 +476,7 @@ free_pages((unsigned long)vaddr, get_order(size)); } -static struct dma_map_ops calgary_dma_ops = { +static const struct dma_map_ops calgary_dma_ops = { .alloc_coherent = calgary_alloc_coherent, .free_coherent = calgary_free_coherent, .map_sg = calgary_map_sg, diff -uriN linux-2.6.38.4/arch/x86/kernel/pci-dma.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/pci-dma.c --- linux-2.6.38.4/arch/x86/kernel/pci-dma.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/pci-dma.c 2011-05-01 17:02:10.000000000 -0500 @@ -16,7 +16,7 @@ static int forbid_dac __read_mostly; -struct dma_map_ops *dma_ops = &nommu_dma_ops; +const struct dma_map_ops *dma_ops = &nommu_dma_ops; EXPORT_SYMBOL(dma_ops); static int iommu_sac_force __read_mostly; @@ -250,7 +250,7 @@ int dma_supported(struct device *dev, u64 mask) { - struct dma_map_ops *ops = get_dma_ops(dev); + const struct dma_map_ops *ops = get_dma_ops(dev); #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { diff -uriN linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/pci-gart_64.c --- linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/pci-gart_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -706,7 +706,7 @@ return -1; } -static struct dma_map_ops gart_dma_ops = { +static const struct dma_map_ops gart_dma_ops = { .map_sg = gart_map_sg, .unmap_sg = gart_unmap_sg, .map_page = gart_map_page, diff -uriN linux-2.6.38.4/arch/x86/kernel/pci-nommu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/pci-nommu.c --- linux-2.6.38.4/arch/x86/kernel/pci-nommu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/pci-nommu.c 2011-05-01 17:02:10.000000000 -0500 @@ -95,7 +95,7 @@ flush_write_buffers(); } -struct dma_map_ops nommu_dma_ops = { +const struct dma_map_ops nommu_dma_ops = { .alloc_coherent = dma_generic_alloc_coherent, .free_coherent = nommu_free_coherent, .map_sg = nommu_map_sg, diff -uriN linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/pci-swiotlb.c --- linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/pci-swiotlb.c 2011-05-01 17:02:10.000000000 -0500 @@ -26,7 +26,7 @@ return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); } -static struct dma_map_ops swiotlb_dma_ops = { +static const struct dma_map_ops swiotlb_dma_ops = { .mapping_error = swiotlb_dma_mapping_error, .alloc_coherent = x86_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, diff -uriN linux-2.6.38.4/arch/x86/kernel/process_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/process_32.c --- linux-2.6.38.4/arch/x86/kernel/process_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/process_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -65,6 +65,7 @@ unsigned long thread_saved_pc(struct task_struct *tsk) { return ((unsigned long *)tsk->thread.sp)[3]; +//XXX return tsk->thread.eip; } #ifndef CONFIG_SMP @@ -126,15 +127,14 @@ unsigned long sp; unsigned short ss, gs; - if (user_mode_vm(regs)) { + if (user_mode(regs)) { sp = regs->sp; ss = regs->ss & 0xffff; - gs = get_user_gs(regs); } else { sp = kernel_stack_pointer(regs); savesegment(ss, ss); - savesegment(gs, gs); } + gs = get_user_gs(regs); show_regs_common(); @@ -196,7 +196,7 @@ struct task_struct *tsk; int err; - childregs = task_pt_regs(p); + childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8; *childregs = *regs; childregs->ax = 0; childregs->sp = sp; @@ -293,7 +293,7 @@ struct thread_struct *prev = &prev_p->thread, *next = &next_p->thread; int cpu = smp_processor_id(); - struct tss_struct *tss = &per_cpu(init_tss, cpu); + struct tss_struct *tss = init_tss + cpu; bool preload_fpu; /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ @@ -328,6 +328,10 @@ */ lazy_save_gs(prev->gs); +#ifdef CONFIG_PAX_MEMORY_UDEREF + __set_fs(task_thread_info(next_p)->addr_limit); +#endif + /* * Load the per-thread Thread-Local Storage descriptor. */ @@ -363,6 +367,9 @@ */ arch_end_context_switch(next_p); + percpu_write(current_task, next_p); + percpu_write(current_tinfo, &next_p->tinfo); + if (preload_fpu) __math_state_restore(); @@ -372,8 +379,6 @@ if (prev->gs | next->gs) lazy_load_gs(next->gs); - percpu_write(current_task, next_p); - return prev_p; } @@ -403,4 +408,3 @@ } while (count++ < 16); return 0; } - diff -uriN linux-2.6.38.4/arch/x86/kernel/process_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/process_64.c --- linux-2.6.38.4/arch/x86/kernel/process_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/process_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -87,7 +87,7 @@ void exit_idle(void) { /* idle loop has pid 0 */ - if (current->pid) + if (task_pid_nr(current)) return; __exit_idle(); } @@ -260,8 +260,7 @@ struct pt_regs *childregs; struct task_struct *me = current; - childregs = ((struct pt_regs *) - (THREAD_SIZE + task_stack_page(p))) - 1; + childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8; *childregs = *regs; childregs->ax = 0; @@ -376,7 +375,7 @@ struct thread_struct *prev = &prev_p->thread; struct thread_struct *next = &next_p->thread; int cpu = smp_processor_id(); - struct tss_struct *tss = &per_cpu(init_tss, cpu); + struct tss_struct *tss = init_tss + cpu; unsigned fsindex, gsindex; bool preload_fpu; @@ -472,10 +471,9 @@ prev->usersp = percpu_read(old_rsp); percpu_write(old_rsp, next->usersp); percpu_write(current_task, next_p); + percpu_write(current_tinfo, &next_p->tinfo); - percpu_write(kernel_stack, - (unsigned long)task_stack_page(next_p) + - THREAD_SIZE - KERNEL_STACK_OFFSET); + percpu_write(kernel_stack, next->sp0); /* * Now maybe reload the debug registers and handle I/O bitmaps @@ -529,12 +527,11 @@ if (!p || p == current || p->state == TASK_RUNNING) return 0; stack = (unsigned long)task_stack_page(p); - if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE) + if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-8-sizeof(u64)) return 0; fp = *(u64 *)(p->thread.sp); do { - if (fp < (unsigned long)stack || - fp >= (unsigned long)stack+THREAD_SIZE) + if (fp < stack || fp > stack+THREAD_SIZE-8-sizeof(u64)) return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) diff -uriN linux-2.6.38.4/arch/x86/kernel/process.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/process.c --- linux-2.6.38.4/arch/x86/kernel/process.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/process.c 2011-05-01 17:02:10.000000000 -0500 @@ -48,16 +48,33 @@ void free_thread_info(struct thread_info *ti) { - free_thread_xstate(ti->task); free_pages((unsigned long)ti, get_order(THREAD_SIZE)); } +static struct kmem_cache *task_struct_cachep; + void arch_task_cache_init(void) { - task_xstate_cachep = - kmem_cache_create("task_xstate", xstate_size, + /* create a slab on which task_structs can be allocated */ + task_struct_cachep = + kmem_cache_create("task_struct", sizeof(struct task_struct), + ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL); + + task_xstate_cachep = + kmem_cache_create("task_xstate", xstate_size, __alignof__(union thread_xstate), - SLAB_PANIC | SLAB_NOTRACK, NULL); + SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL); +} + +struct task_struct *alloc_task_struct(void) +{ + return kmem_cache_alloc(task_struct_cachep, GFP_KERNEL); +} + +void free_task_struct(struct task_struct *task) +{ + free_thread_xstate(task); + kmem_cache_free(task_struct_cachep, task); } /* @@ -70,7 +87,7 @@ unsigned long *bp = t->io_bitmap_ptr; if (bp) { - struct tss_struct *tss = &per_cpu(init_tss, get_cpu()); + struct tss_struct *tss = init_tss + get_cpu(); t->io_bitmap_ptr = NULL; clear_thread_flag(TIF_IO_BITMAP); @@ -106,7 +123,7 @@ printk(KERN_CONT "\n"); printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s", - current->pid, current->comm, print_tainted(), + task_pid_nr(current), current->comm, print_tainted(), init_utsname()->release, (int)strcspn(init_utsname()->version, " "), init_utsname()->version); @@ -123,6 +140,9 @@ { struct task_struct *tsk = current; +#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF) + loadsegment(gs, 0); +#endif flush_ptrace_hw_breakpoint(tsk); memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array)); /* @@ -285,10 +305,10 @@ regs.di = (unsigned long) arg; #ifdef CONFIG_X86_32 - regs.ds = __USER_DS; - regs.es = __USER_DS; + regs.ds = __KERNEL_DS; + regs.es = __KERNEL_DS; regs.fs = __KERNEL_PERCPU; - regs.gs = __KERNEL_STACK_CANARY; + savesegment(gs, regs.gs); #else regs.ss = __KERNEL_DS; #endif @@ -668,16 +688,31 @@ } early_param("idle", idle_setup); -unsigned long arch_align_stack(unsigned long sp) +#ifdef CONFIG_PAX_RANDKSTACK +asmlinkage void pax_randomize_kstack(void) { - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) - sp -= get_random_int() % 8192; - return sp & ~0xf; -} + struct thread_struct *thread = ¤t->thread; + unsigned long time; -unsigned long arch_randomize_brk(struct mm_struct *mm) -{ - unsigned long range_end = mm->brk + 0x02000000; - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; -} + if (!randomize_va_space) + return; + + rdtscl(time); + + /* P4 seems to return a 0 LSB, ignore it */ +#ifdef CONFIG_MPENTIUM4 + time &= 0x1EUL; + time <<= 2; +#else + time &= 0xFUL; + time <<= 3; +#endif + + thread->sp0 ^= time; + load_sp0(init_tss + smp_processor_id(), thread); +#ifdef CONFIG_X86_64 + percpu_write(kernel_stack, thread->sp0); +#endif +} +#endif diff -uriN linux-2.6.38.4/arch/x86/kernel/ptrace.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/ptrace.c --- linux-2.6.38.4/arch/x86/kernel/ptrace.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/ptrace.c 2011-05-01 17:02:10.000000000 -0500 @@ -805,7 +805,7 @@ unsigned long addr, unsigned long data) { int ret; - unsigned long __user *datap = (unsigned long __user *)data; + unsigned long __user *datap = (__force unsigned long __user *)data; switch (request) { /* read the word at location addr in the USER area. */ @@ -890,14 +890,14 @@ if ((int) addr < 0) return -EIO; ret = do_get_thread_area(child, addr, - (struct user_desc __user *)data); + (__force struct user_desc __user *) data); break; case PTRACE_SET_THREAD_AREA: if ((int) addr < 0) return -EIO; ret = do_set_thread_area(child, addr, - (struct user_desc __user *)data, 0); + (__force struct user_desc __user *) data, 0); break; #endif @@ -1314,7 +1314,7 @@ memset(info, 0, sizeof(*info)); info->si_signo = SIGTRAP; info->si_code = si_code; - info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL; + info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL; } void user_single_step_siginfo(struct task_struct *tsk, @@ -1347,7 +1347,7 @@ * We must return the syscall number to actually look up in the table. * This can be -1L to skip running any syscall at all. */ -asmregparm long syscall_trace_enter(struct pt_regs *regs) +long syscall_trace_enter(struct pt_regs *regs) { long ret = 0; @@ -1392,7 +1392,7 @@ return ret ?: regs->orig_ax; } -asmregparm void syscall_trace_leave(struct pt_regs *regs) +void syscall_trace_leave(struct pt_regs *regs) { bool step; diff -uriN linux-2.6.38.4/arch/x86/kernel/reboot.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/reboot.c --- linux-2.6.38.4/arch/x86/kernel/reboot.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/reboot.c 2011-05-01 17:02:10.000000000 -0500 @@ -34,7 +34,7 @@ EXPORT_SYMBOL(pm_power_off); static const struct desc_ptr no_idt = {}; -static int reboot_mode; +static unsigned short reboot_mode; enum reboot_type reboot_type = BOOT_KBD; int reboot_force; @@ -309,12 +309,12 @@ controller to pulse the CPU reset line, which is more thorough, but doesn't work with at least one type of 486 motherboard. It is easy to stop this code working; hence the copious comments. */ -static const unsigned long long -real_mode_gdt_entries [3] = +static struct desc_struct +real_mode_gdt_entries [3] __read_only = { - 0x0000000000000000ULL, /* Null descriptor */ - 0x00009b000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */ - 0x000093000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ + GDT_ENTRY_INIT(0, 0, 0), /* Null descriptor */ + GDT_ENTRY_INIT(0x9b, 0, 0xffff), /* 16-bit real-mode 64k code at 0x00000000 */ + GDT_ENTRY_INIT(0x93, 0x100, 0xffff) /* 16-bit real-mode 64k data at 0x00000100 */ }; static const struct desc_ptr @@ -363,7 +363,7 @@ * specified by the code and length parameters. * We assume that length will aways be less that 100! */ -void machine_real_restart(const unsigned char *code, int length) +void machine_real_restart(const unsigned char *code, unsigned int length) { local_irq_disable(); @@ -390,16 +390,15 @@ boot)". This seems like a fairly standard thing that gets set by REBOOT.COM programs, and the previous reset routine did this too. */ - *((unsigned short *)0x472) = reboot_mode; + *(unsigned short *)(__va(0x472)) = reboot_mode; /* For the switch to real mode, copy some code to low memory. It has to be in the first 64k because it is running in 16-bit mode, and it has to have the same physical and virtual address, because it turns off paging. Copy it near the end of the first page, out of the way of BIOS variables. */ - memcpy((void *)(0x1000 - sizeof(real_mode_switch) - 100), - real_mode_switch, sizeof (real_mode_switch)); - memcpy((void *)(0x1000 - 100), code, length); + memcpy(__va(0x1000 - sizeof (real_mode_switch) - 100), real_mode_switch, sizeof (real_mode_switch)); + memcpy(__va(0x1000 - 100), code, length); /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); diff -uriN linux-2.6.38.4/arch/x86/kernel/setup.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/setup.c --- linux-2.6.38.4/arch/x86/kernel/setup.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/setup.c 2011-05-01 17:02:10.000000000 -0500 @@ -654,7 +654,7 @@ * area (640->1Mb) as ram even though it is not. * take them out. */ - e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1); + e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1); sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); } @@ -790,14 +790,14 @@ if (!boot_params.hdr.root_flags) root_mountflags &= ~MS_RDONLY; - init_mm.start_code = (unsigned long) _text; - init_mm.end_code = (unsigned long) _etext; + init_mm.start_code = ktla_ktva((unsigned long) _text); + init_mm.end_code = ktla_ktva((unsigned long) _etext); init_mm.end_data = (unsigned long) _edata; init_mm.brk = _brk_end; - code_resource.start = virt_to_phys(_text); - code_resource.end = virt_to_phys(_etext)-1; - data_resource.start = virt_to_phys(_etext); + code_resource.start = virt_to_phys(ktla_ktva(_text)); + code_resource.end = virt_to_phys(ktla_ktva(_etext))-1; + data_resource.start = virt_to_phys(_sdata); data_resource.end = virt_to_phys(_edata)-1; bss_resource.start = virt_to_phys(&__bss_start); bss_resource.end = virt_to_phys(&__bss_stop)-1; diff -uriN linux-2.6.38.4/arch/x86/kernel/setup_percpu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/setup_percpu.c --- linux-2.6.38.4/arch/x86/kernel/setup_percpu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/setup_percpu.c 2011-05-01 17:02:10.000000000 -0500 @@ -21,19 +21,17 @@ #include #include -DEFINE_PER_CPU(int, cpu_number); +#ifdef CONFIG_SMP +DEFINE_PER_CPU(unsigned int, cpu_number); EXPORT_PER_CPU_SYMBOL(cpu_number); +#endif -#ifdef CONFIG_X86_64 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load) -#else -#define BOOT_PERCPU_OFFSET 0 -#endif DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET; EXPORT_PER_CPU_SYMBOL(this_cpu_off); -unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = { +unsigned long __per_cpu_offset[NR_CPUS] __read_only = { [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET, }; EXPORT_SYMBOL(__per_cpu_offset); @@ -155,10 +153,10 @@ { #ifdef CONFIG_X86_32 struct desc_struct gdt; + unsigned long base = per_cpu_offset(cpu); - pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF, - 0x2 | DESCTYPE_S, 0x8); - gdt.s = 1; + pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT, + 0x83 | DESCTYPE_S, 0xC); write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S); #endif @@ -207,6 +205,11 @@ /* alrighty, percpu areas up and running */ delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start; for_each_possible_cpu(cpu) { +#ifdef CONFIG_CC_STACKPROTECTOR +#ifdef CONFIG_x86_32 + unsigned long canary = per_cpu(stack_canary, cpu); +#endif +#endif per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu]; per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu); per_cpu(cpu_number, cpu) = cpu; @@ -243,6 +246,12 @@ set_cpu_numa_node(cpu, early_cpu_to_node(cpu)); #endif #endif +#ifdef CONFIG_CC_STACKPROTECTOR +#ifdef CONFIG_x86_32 + if (cpu == boot_cpu_id) + per_cpu(stack_canary, cpu) = canary; +#endif +#endif /* * Up to this point, the boot CPU has been using .init.data * area. Reload any changed state for the boot CPU. diff -uriN linux-2.6.38.4/arch/x86/kernel/signal.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/signal.c --- linux-2.6.38.4/arch/x86/kernel/signal.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/signal.c 2011-05-01 17:02:10.000000000 -0500 @@ -198,7 +198,7 @@ * Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) == 0. */ - sp = ((sp + 4) & -16ul) - 4; + sp = ((sp - 12) & -16ul) - 4; #else /* !CONFIG_X86_32 */ sp = round_down(sp, 16) - 8; #endif @@ -249,11 +249,11 @@ * Return an always-bogus address instead so we will die with SIGSEGV. */ if (onsigstack && !likely(on_sig_stack(sp))) - return (void __user *)-1L; + return (__force void __user *)-1L; /* save i387 state */ if (used_math() && save_i387_xstate(*fpstate) < 0) - return (void __user *)-1L; + return (__force void __user *)-1L; return (void __user *)sp; } @@ -308,9 +308,9 @@ } if (current->mm->context.vdso) - restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn); + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn); else - restorer = &frame->retcode; + restorer = (void __user *)&frame->retcode; if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; @@ -324,7 +324,7 @@ * reasons and because gdb uses it as a signature to notice * signal handler stack frames. */ - err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode); + err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode); if (err) return -EFAULT; @@ -378,7 +378,10 @@ err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); /* Set up to return from userspace. */ - restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); + if (current->mm->context.vdso) + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); + else + restorer = (void __user *)&frame->retcode; if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; put_user_ex(restorer, &frame->pretcode); @@ -390,7 +393,7 @@ * reasons and because gdb uses it as a signature to notice * signal handler stack frames. */ - put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode); + put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode); } put_user_catch(err); if (err) @@ -780,7 +783,7 @@ * X86_32: vm86 regs switched out by assembly code before reaching * here, so testing against kernel CS suffices. */ - if (!user_mode(regs)) + if (!user_mode_novm(regs)) return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) diff -uriN linux-2.6.38.4/arch/x86/kernel/smpboot.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/smpboot.c --- linux-2.6.38.4/arch/x86/kernel/smpboot.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/smpboot.c 2011-05-01 17:02:10.000000000 -0500 @@ -773,17 +773,20 @@ set_idle_for_cpu(cpu, c_idle.idle); do_rest: per_cpu(current_task, cpu) = c_idle.idle; + per_cpu(current_tinfo, cpu) = &c_idle.idle->tinfo; #ifdef CONFIG_X86_32 /* Stack for startup_32 can be just as for start_secondary onwards */ irq_ctx_init(cpu); #else clear_tsk_thread_flag(c_idle.idle, TIF_FORK); initial_gs = per_cpu_offset(cpu); - per_cpu(kernel_stack, cpu) = - (unsigned long)task_stack_page(c_idle.idle) - - KERNEL_STACK_OFFSET + THREAD_SIZE; + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 8 + THREAD_SIZE; #endif + + pax_open_kernel(); early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu); + pax_close_kernel(); + initial_code = (unsigned long)start_secondary; stack_start = c_idle.idle->thread.sp; @@ -923,6 +926,12 @@ per_cpu(cpu_state, cpu) = CPU_UP_PREPARE; +#ifdef CONFIG_PAX_PER_CPU_PGD + clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY, + swapper_pg_dir + KERNEL_PGD_BOUNDARY, + KERNEL_PGD_PTRS); +#endif + err = do_boot_cpu(apicid, cpu); if (err) { pr_debug("do_boot_cpu failed %d\n", err); diff -uriN linux-2.6.38.4/arch/x86/kernel/step.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/step.c --- linux-2.6.38.4/arch/x86/kernel/step.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/step.c 2011-05-01 17:02:10.000000000 -0500 @@ -27,10 +27,10 @@ struct desc_struct *desc; unsigned long base; - seg &= ~7UL; + seg >>= 3; mutex_lock(&child->mm->context.lock); - if (unlikely((seg >> 3) >= child->mm->context.size)) + if (unlikely(seg >= child->mm->context.size)) addr = -1L; /* bogus selector, access would fault */ else { desc = child->mm->context.ldt + seg; @@ -42,7 +42,8 @@ addr += base; } mutex_unlock(&child->mm->context.lock); - } + } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS) + addr = ktla_ktva(addr); return addr; } @@ -53,6 +54,9 @@ unsigned char opcode[15]; unsigned long addr = convert_ip_to_linear(child, regs); + if (addr == -EINVAL) + return 0; + copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0); for (i = 0; i < copied; i++) { switch (opcode[i]) { @@ -74,7 +78,7 @@ #ifdef CONFIG_X86_64 case 0x40 ... 0x4f: - if (regs->cs != __USER_CS) + if ((regs->cs & 0xffff) != __USER_CS) /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ diff -uriN linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/syscall_table_32.S --- linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/syscall_table_32.S 2011-05-01 17:02:10.000000000 -0500 @@ -1,3 +1,4 @@ +.section .rodata,"a",@progbits ENTRY(sys_call_table) .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ .long sys_exit @@ -272,7 +273,7 @@ .long sys_tgkill /* 270 */ .long sys_utimes .long sys_fadvise64_64 - .long sys_ni_syscall /* sys_vserver */ + .long sys_vserver .long sys_mbind .long sys_get_mempolicy .long sys_set_mempolicy diff -uriN linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/sys_i386_32.c --- linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/sys_i386_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -24,17 +24,224 @@ #include -/* - * Do a system call from kernel instead of calling sys_execve so we - * end up with proper pt_regs. - */ -int kernel_execve(const char *filename, - const char *const argv[], - const char *const envp[]) +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags) { - long __res; - asm volatile ("int $0x80" - : "=a" (__res) - : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory"); - return __res; + unsigned long pax_task_size = TASK_SIZE; + +#ifdef CONFIG_PAX_SEGMEXEC + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) + pax_task_size = SEGMEXEC_TASK_SIZE; +#endif + + if (len > pax_task_size || addr > pax_task_size - len) + return -EINVAL; + + return 0; +} + +unsigned long +arch_get_unmapped_area(struct file *filp, unsigned long addr, + unsigned long len, unsigned long pgoff, unsigned long flags) +{ + struct mm_struct *mm = current->mm; + struct vm_area_struct *vma; + unsigned long start_addr, pax_task_size = TASK_SIZE; + +#ifdef CONFIG_PAX_SEGMEXEC + if (mm->pax_flags & MF_PAX_SEGMEXEC) + pax_task_size = SEGMEXEC_TASK_SIZE; +#endif + + pax_task_size -= PAGE_SIZE; + + if (len > pax_task_size) + return -ENOMEM; + + if (flags & MAP_FIXED) + return addr; + +#ifdef CONFIG_PAX_RANDMMAP + if (!(mm->pax_flags & MF_PAX_RANDMMAP)) +#endif + + if (addr) { + addr = PAGE_ALIGN(addr); + if (pax_task_size - len >= addr) { + vma = find_vma(mm, addr); + if (check_heap_stack_gap(vma, addr, len)) + return addr; + } + } + if (len > mm->cached_hole_size) { + start_addr = addr = mm->free_area_cache; + } else { + start_addr = addr = mm->mmap_base; + mm->cached_hole_size = 0; + } + +#ifdef CONFIG_PAX_PAGEEXEC + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) { + start_addr = 0x00110000UL; + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + start_addr += mm->delta_mmap & 0x03FFF000UL; +#endif + + if (mm->start_brk <= start_addr && start_addr < mm->mmap_base) + start_addr = addr = mm->mmap_base; + else + addr = start_addr; + } +#endif + +full_search: + for (vma = find_vma(mm, addr); ; vma = vma->vm_next) { + /* At this point: (!vma || addr < vma->vm_end). */ + if (pax_task_size - len < addr) { + /* + * Start a new search - just in case we missed + * some holes. + */ + if (start_addr != mm->mmap_base) { + start_addr = addr = mm->mmap_base; + mm->cached_hole_size = 0; + goto full_search; + } + return -ENOMEM; + } + if (check_heap_stack_gap(vma, addr, len)) + break; + if (addr + mm->cached_hole_size < vma->vm_start) + mm->cached_hole_size = vma->vm_start - addr; + addr = vma->vm_end; + if (mm->start_brk <= addr && addr < mm->mmap_base) { + start_addr = addr = mm->mmap_base; + mm->cached_hole_size = 0; + goto full_search; + } + } + + /* + * Remember the place where we stopped the search: + */ + mm->free_area_cache = addr + len; + return addr; +} + +unsigned long +arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, + const unsigned long len, const unsigned long pgoff, + const unsigned long flags) +{ + struct vm_area_struct *vma; + struct mm_struct *mm = current->mm; + unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE; + +#ifdef CONFIG_PAX_SEGMEXEC + if (mm->pax_flags & MF_PAX_SEGMEXEC) + pax_task_size = SEGMEXEC_TASK_SIZE; +#endif + + pax_task_size -= PAGE_SIZE; + + /* requested length too big for entire address space */ + if (len > pax_task_size) + return -ENOMEM; + + if (flags & MAP_FIXED) + return addr; + +#ifdef CONFIG_PAX_PAGEEXEC + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) + goto bottomup; +#endif + +#ifdef CONFIG_PAX_RANDMMAP + if (!(mm->pax_flags & MF_PAX_RANDMMAP)) +#endif + + /* requesting a specific address */ + if (addr) { + addr = PAGE_ALIGN(addr); + if (pax_task_size - len >= addr) { + vma = find_vma(mm, addr); + if (check_heap_stack_gap(vma, addr, len)) + return addr; + } + } + + /* check if free_area_cache is useful for us */ + if (len <= mm->cached_hole_size) { + mm->cached_hole_size = 0; + mm->free_area_cache = mm->mmap_base; + } + + /* either no address requested or can't fit in requested address hole */ + addr = mm->free_area_cache; + + /* make sure it can fit in the remaining address space */ + if (addr > len) { + vma = find_vma(mm, addr-len); + if (check_heap_stack_gap(vma, addr - len, len)) + /* remember the address as a hint for next time */ + return (mm->free_area_cache = addr-len); + } + + if (mm->mmap_base < len) + goto bottomup; + + addr = mm->mmap_base-len; + + do { + /* + * Lookup failure means no vma is above this address, + * else if new region fits below vma->vm_start, + * return with success: + */ + vma = find_vma(mm, addr); + if (check_heap_stack_gap(vma, addr, len)) + /* remember the address as a hint for next time */ + return (mm->free_area_cache = addr); + + /* remember the largest hole we saw so far */ + if (addr + mm->cached_hole_size < vma->vm_start) + mm->cached_hole_size = vma->vm_start - addr; + + /* try just below the current vma->vm_start */ + addr = skip_heap_stack_gap(vma, len); + } while (!IS_ERR_VALUE(addr)); + +bottomup: + /* + * A failed mmap() very likely causes application failure, + * so fall back to the bottom-up function here. This scenario + * can happen with large stack limits and large mmap() + * allocations. + */ + +#ifdef CONFIG_PAX_SEGMEXEC + if (mm->pax_flags & MF_PAX_SEGMEXEC) + mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE; + else +#endif + + mm->mmap_base = TASK_UNMAPPED_BASE; + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base += mm->delta_mmap; +#endif + + mm->free_area_cache = mm->mmap_base; + mm->cached_hole_size = ~0UL; + addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags); + /* + * Restore the topdown base: + */ + mm->mmap_base = base; + mm->free_area_cache = base; + mm->cached_hole_size = ~0UL; + + return addr; } diff -uriN linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/sys_x86_64.c --- linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/sys_x86_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -32,8 +32,8 @@ return error; } -static void find_start_end(unsigned long flags, unsigned long *begin, - unsigned long *end) +static void find_start_end(struct mm_struct *mm, unsigned long flags, + unsigned long *begin, unsigned long *end) { if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) { unsigned long new_begin; @@ -52,7 +52,7 @@ *begin = new_begin; } } else { - *begin = TASK_UNMAPPED_BASE; + *begin = mm->mmap_base; *end = TASK_SIZE; } } @@ -69,16 +69,19 @@ if (flags & MAP_FIXED) return addr; - find_start_end(flags, &begin, &end); + find_start_end(mm, flags, &begin, &end); if (len > end) return -ENOMEM; +#ifdef CONFIG_PAX_RANDMMAP + if (!(mm->pax_flags & MF_PAX_RANDMMAP)) +#endif + if (addr) { addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); - if (end - len >= addr && - (!vma || addr + len <= vma->vm_start)) + if (end - len >= addr && check_heap_stack_gap(vma, addr, len)) return addr; } if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32)) @@ -106,7 +109,7 @@ } return -ENOMEM; } - if (!vma || addr + len <= vma->vm_start) { + if (check_heap_stack_gap(vma, addr, len)) { /* * Remember the place where we stopped the search: */ @@ -128,7 +131,7 @@ { struct vm_area_struct *vma; struct mm_struct *mm = current->mm; - unsigned long addr = addr0; + unsigned long base = mm->mmap_base, addr = addr0; /* requested length too big for entire address space */ if (len > TASK_SIZE) @@ -141,13 +144,18 @@ if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) goto bottomup; +#ifdef CONFIG_PAX_RANDMMAP + if (!(mm->pax_flags & MF_PAX_RANDMMAP)) +#endif + /* requesting a specific address */ if (addr) { addr = PAGE_ALIGN(addr); - vma = find_vma(mm, addr); - if (TASK_SIZE - len >= addr && - (!vma || addr + len <= vma->vm_start)) - return addr; + if (TASK_SIZE - len >= addr) { + vma = find_vma(mm, addr); + if (check_heap_stack_gap(vma, addr, len)) + return addr; + } } /* check if free_area_cache is useful for us */ @@ -162,7 +170,7 @@ /* make sure it can fit in the remaining address space */ if (addr > len) { vma = find_vma(mm, addr-len); - if (!vma || addr <= vma->vm_start) + if (check_heap_stack_gap(vma, addr - len, len)) /* remember the address as a hint for next time */ return mm->free_area_cache = addr-len; } @@ -179,7 +187,7 @@ * return with success: */ vma = find_vma(mm, addr); - if (!vma || addr+len <= vma->vm_start) + if (check_heap_stack_gap(vma, addr, len)) /* remember the address as a hint for next time */ return mm->free_area_cache = addr; @@ -188,8 +196,8 @@ mm->cached_hole_size = vma->vm_start - addr; /* try just below the current vma->vm_start */ - addr = vma->vm_start-len; - } while (len < vma->vm_start); + addr = skip_heap_stack_gap(vma, len); + } while (!IS_ERR_VALUE(addr)); bottomup: /* @@ -198,13 +206,21 @@ * can happen with large stack limits and large mmap() * allocations. */ + mm->mmap_base = TASK_UNMAPPED_BASE; + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base += mm->delta_mmap; +#endif + + mm->free_area_cache = mm->mmap_base; mm->cached_hole_size = ~0UL; - mm->free_area_cache = TASK_UNMAPPED_BASE; addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags); /* * Restore the topdown base: */ - mm->free_area_cache = mm->mmap_base; + mm->mmap_base = base; + mm->free_area_cache = base; mm->cached_hole_size = ~0UL; return addr; diff -uriN linux-2.6.38.4/arch/x86/kernel/time.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/time.c --- linux-2.6.38.4/arch/x86/kernel/time.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/time.c 2011-05-01 17:02:10.000000000 -0500 @@ -22,17 +22,13 @@ #include #include -#ifdef CONFIG_X86_64 -volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES; -#endif - unsigned long profile_pc(struct pt_regs *regs) { unsigned long pc = instruction_pointer(regs); - if (!user_mode_vm(regs) && in_lock_functions(pc)) { + if (!user_mode(regs) && in_lock_functions(pc)) { #ifdef CONFIG_FRAME_POINTER - return *(unsigned long *)(regs->bp + sizeof(long)); + return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long))); #else unsigned long *sp = (unsigned long *)kernel_stack_pointer(regs); @@ -41,11 +37,17 @@ * or above a saved flags. Eflags has bits 22-31 zero, * kernel addresses don't. */ + +#ifdef CONFIG_PAX_KERNEXEC + return ktla_ktva(sp[0]); +#else if (sp[0] >> 22) return sp[0]; if (sp[1] >> 22) return sp[1]; #endif + +#endif } return pc; } diff -uriN linux-2.6.38.4/arch/x86/kernel/tls.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/tls.c --- linux-2.6.38.4/arch/x86/kernel/tls.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/tls.c 2011-05-01 17:02:10.000000000 -0500 @@ -85,6 +85,11 @@ if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) return -EINVAL; +#ifdef CONFIG_PAX_SEGMEXEC + if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE)) + return -EINVAL; +#endif + set_tls_desc(p, idx, &info, 1); return 0; diff -uriN linux-2.6.38.4/arch/x86/kernel/trampoline_32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/trampoline_32.S --- linux-2.6.38.4/arch/x86/kernel/trampoline_32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/trampoline_32.S 2011-05-01 17:02:10.000000000 -0500 @@ -32,6 +32,12 @@ #include #include +#ifdef CONFIG_PAX_KERNEXEC +#define ta(X) (X) +#else +#define ta(X) ((X) - __PAGE_OFFSET) +#endif + /* We can free up trampoline after bootup if cpu hotplug is not supported. */ __CPUINITRODATA .code16 @@ -60,7 +66,7 @@ inc %ax # protected mode (PE) bit lmsw %ax # into protected mode # flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S - ljmpl $__BOOT_CS, $(startup_32_smp-__PAGE_OFFSET) + ljmpl $__BOOT_CS, $ta(startup_32_smp) # These need to be in the same 64K segment as the above; # hence we don't use the boot_gdt_descr defined in head.S diff -uriN linux-2.6.38.4/arch/x86/kernel/trampoline_64.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/trampoline_64.S --- linux-2.6.38.4/arch/x86/kernel/trampoline_64.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/trampoline_64.S 2011-05-01 17:02:10.000000000 -0500 @@ -91,7 +91,7 @@ movl $__KERNEL_DS, %eax # Initialize the %ds segment register movl %eax, %ds - movl $X86_CR4_PAE, %eax + movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax movl %eax, %cr4 # Enable PAE mode # Setup trampoline 4 level pagetables @@ -138,7 +138,7 @@ # so the kernel can live anywhere .balign 4 tgdt: - .short tgdt_end - tgdt # gdt limit + .short tgdt_end - tgdt - 1 # gdt limit .long tgdt - r_base .short 0 .quad 0x00cf9b000000ffff # __KERNEL32_CS diff -uriN linux-2.6.38.4/arch/x86/kernel/traps.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/traps.c --- linux-2.6.38.4/arch/x86/kernel/traps.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/traps.c 2011-05-01 17:02:10.000000000 -0500 @@ -70,12 +70,6 @@ /* Do we ignore FPU interrupts ? */ char ignore_fpu_irq; - -/* - * The IDT has to be page-aligned to simplify the Pentium - * F0 0F bug workaround. - */ -gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, }; #endif DECLARE_BITMAP(used_vectors, NR_VECTORS); @@ -117,13 +111,13 @@ } static void __kprobes -do_trap(int trapnr, int signr, char *str, struct pt_regs *regs, +do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs, long error_code, siginfo_t *info) { struct task_struct *tsk = current; #ifdef CONFIG_X86_32 - if (regs->flags & X86_VM_MASK) { + if (v8086_mode(regs)) { /* * traps 0, 1, 3, 4, and 5 should be forwarded to vm86. * On nmi (interrupt 2), do_trap should not be called. @@ -134,7 +128,7 @@ } #endif - if (!user_mode(regs)) + if (!user_mode_novm(regs)) goto kernel_trap; #ifdef CONFIG_X86_32 @@ -157,7 +151,7 @@ printk_ratelimit()) { printk(KERN_INFO "%s[%d] trap %s ip:%lx sp:%lx error:%lx", - tsk->comm, tsk->pid, str, + tsk->comm, task_pid_nr(tsk), str, regs->ip, regs->sp, error_code); print_vma_addr(" in ", regs->ip); printk("\n"); @@ -174,8 +168,20 @@ if (!fixup_exception(regs)) { tsk->thread.error_code = error_code; tsk->thread.trap_no = trapnr; + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) + if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)) + str = "PAX: suspicious stack segment fault"; +#endif + die(str, regs, error_code); } + +#ifdef CONFIG_PAX_REFCOUNT + if (trapnr == 4) + pax_report_refcount_overflow(regs); +#endif + return; #ifdef CONFIG_X86_32 @@ -264,14 +270,30 @@ conditional_sti(regs); #ifdef CONFIG_X86_32 - if (regs->flags & X86_VM_MASK) + if (v8086_mode(regs)) goto gp_in_vm86; #endif tsk = current; - if (!user_mode(regs)) + if (!user_mode_novm(regs)) goto gp_in_kernel; +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) + if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) { + struct mm_struct *mm = tsk->mm; + unsigned long limit; + + down_write(&mm->mmap_sem); + limit = mm->context.user_cs_limit; + if (limit < TASK_SIZE) { + track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC); + up_write(&mm->mmap_sem); + return; + } + up_write(&mm->mmap_sem); + } +#endif + tsk->thread.error_code = error_code; tsk->thread.trap_no = 13; @@ -304,6 +326,13 @@ if (notify_die(DIE_GPF, "general protection fault", regs, error_code, 13, SIGSEGV) == NOTIFY_STOP) return; + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) + if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS) + die("PAX: suspicious general protection fault", regs, error_code); + else +#endif + die("general protection fault", regs, error_code); } @@ -569,7 +598,7 @@ /* It's safe to allow irq's after DR6 has been saved */ preempt_conditional_sti(regs); - if (regs->flags & X86_VM_MASK) { + if (v8086_mode(regs)) { handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code, 1); preempt_conditional_cli(regs); @@ -583,7 +612,7 @@ * We already checked v86 mode above, so we can check for kernel mode * by just checking the CPL of CS. */ - if ((dr6 & DR_STEP) && !user_mode(regs)) { + if ((dr6 & DR_STEP) && !user_mode_novm(regs)) { tsk->thread.debugreg6 &= ~DR_STEP; set_tsk_thread_flag(tsk, TIF_SINGLESTEP); regs->flags &= ~X86_EFLAGS_TF; @@ -612,7 +641,7 @@ return; conditional_sti(regs); - if (!user_mode_vm(regs)) + if (!user_mode(regs)) { if (!fixup_exception(regs)) { task->thread.error_code = error_code; @@ -723,7 +752,7 @@ void __math_state_restore(void) { struct thread_info *thread = current_thread_info(); - struct task_struct *tsk = thread->task; + struct task_struct *tsk = current; /* * Paranoid restore. send a SIGSEGV if we fail to restore the state. @@ -750,8 +779,7 @@ */ asmlinkage void math_state_restore(void) { - struct thread_info *thread = current_thread_info(); - struct task_struct *tsk = thread->task; + struct task_struct *tsk = current; if (!tsk_used_math(tsk)) { local_irq_enable(); diff -uriN linux-2.6.38.4/arch/x86/kernel/vm86_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/vm86_32.c --- linux-2.6.38.4/arch/x86/kernel/vm86_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/vm86_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -148,7 +149,7 @@ do_exit(SIGSEGV); } - tss = &per_cpu(init_tss, get_cpu()); + tss = init_tss + get_cpu(); current->thread.sp0 = current->thread.saved_sp0; current->thread.sysenter_cs = __KERNEL_CS; load_sp0(tss, ¤t->thread); @@ -208,6 +209,13 @@ struct task_struct *tsk; int tmp, ret = -EPERM; +#ifdef CONFIG_GRKERNSEC_VM86 + if (!capable(CAP_SYS_RAWIO)) { + gr_handle_vm86(); + goto out; + } +#endif + tsk = current; if (tsk->thread.saved_sp0) goto out; @@ -238,6 +246,14 @@ int tmp, ret; struct vm86plus_struct __user *v86; +#ifdef CONFIG_GRKERNSEC_VM86 + if (!capable(CAP_SYS_RAWIO)) { + gr_handle_vm86(); + ret = -EPERM; + goto out; + } +#endif + tsk = current; switch (cmd) { case VM86_REQUEST_IRQ: @@ -324,7 +340,7 @@ tsk->thread.saved_fs = info->regs32->fs; tsk->thread.saved_gs = get_user_gs(info->regs32); - tss = &per_cpu(init_tss, get_cpu()); + tss = init_tss + get_cpu(); tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0; if (cpu_has_sep) tsk->thread.sysenter_cs = 0; @@ -529,7 +545,7 @@ goto cannot_handle; if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored)) goto cannot_handle; - intr_ptr = (unsigned long __user *) (i << 2); + intr_ptr = (__force unsigned long __user *) (i << 2); if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) == BIOSSEG) diff -uriN linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/vmlinux.lds.S --- linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/vmlinux.lds.S 2011-05-01 17:02:10.000000000 -0500 @@ -26,6 +26,13 @@ #include #include #include +#include + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) +#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR) +#else +#define __KERNEL_TEXT_OFFSET 0 +#endif #undef i386 /* in case the preprocessor is a 32bit one */ @@ -34,11 +41,9 @@ #ifdef CONFIG_X86_32 OUTPUT_ARCH(i386) ENTRY(phys_startup_32) -jiffies = jiffies_64; #else OUTPUT_ARCH(i386:x86-64) ENTRY(phys_startup_64) -jiffies_64 = jiffies; #endif #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA) @@ -69,31 +74,46 @@ PHDRS { text PT_LOAD FLAGS(5); /* R_E */ +#ifdef CONFIG_X86_32 + module PT_LOAD FLAGS(5); /* R_E */ +#endif +#ifdef CONFIG_XEN + rodata PT_LOAD FLAGS(5); /* R_E */ +#else + rodata PT_LOAD FLAGS(4); /* R__ */ +#endif data PT_LOAD FLAGS(6); /* RW_ */ #ifdef CONFIG_X86_64 user PT_LOAD FLAGS(5); /* R_E */ +#endif + init.begin PT_LOAD FLAGS(6); /* RW_ */ #ifdef CONFIG_SMP percpu PT_LOAD FLAGS(6); /* RW_ */ #endif + text.init PT_LOAD FLAGS(5); /* R_E */ + text.exit PT_LOAD FLAGS(5); /* R_E */ init PT_LOAD FLAGS(7); /* RWE */ -#endif note PT_NOTE FLAGS(0); /* ___ */ } SECTIONS { #ifdef CONFIG_X86_32 - . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR; - phys_startup_32 = startup_32 - LOAD_OFFSET; + . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR; #else - . = __START_KERNEL; - phys_startup_64 = startup_64 - LOAD_OFFSET; + . = __START_KERNEL; #endif /* Text and read-only data */ - .text : AT(ADDR(.text) - LOAD_OFFSET) { - _text = .; + .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) { /* bootstrapping code */ +#ifdef CONFIG_X86_32 + phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET; +#else + phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET; +#endif + __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET; + _text = .; HEAD_TEXT #ifdef CONFIG_X86_32 . = ALIGN(PAGE_SIZE); @@ -108,13 +128,47 @@ IRQENTRY_TEXT *(.fixup) *(.gnu.warning) - /* End of text section */ - _etext = .; } :text = 0x9090 - NOTES :text :note + . += __KERNEL_TEXT_OFFSET; + +#ifdef CONFIG_X86_32 + . = ALIGN(PAGE_SIZE); + .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) { + +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES) + MODULES_EXEC_VADDR = .; + BYTE(0) + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024); + . = ALIGN(HPAGE_SIZE); + MODULES_EXEC_END = . - 1; +#endif + + } :module +#endif + + .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) { + /* End of text section */ + _etext = . - __KERNEL_TEXT_OFFSET; + } - EXCEPTION_TABLE(16) :text = 0x9090 +#ifdef CONFIG_X86_32 + . = ALIGN(PAGE_SIZE); + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) { + *(.idt) + . = ALIGN(PAGE_SIZE); + *(.empty_zero_page) + *(.initial_pg_fixmap) + *(.initial_pg_pmd) + *(.initial_page_table) + *(.swapper_pg_dir) + } :rodata +#endif + + . = ALIGN(PAGE_SIZE); + NOTES :rodata :note + + EXCEPTION_TABLE(16) :rodata #if defined(CONFIG_DEBUG_RODATA) /* .text should occupy whole number of pages */ @@ -126,16 +180,20 @@ /* Data */ .data : AT(ADDR(.data) - LOAD_OFFSET) { + +#ifdef CONFIG_PAX_KERNEXEC + . = ALIGN(HPAGE_SIZE); +#else + . = ALIGN(PAGE_SIZE); +#endif + /* Start of data section */ _sdata = .; /* init_task */ INIT_TASK_DATA(THREAD_SIZE) -#ifdef CONFIG_X86_32 - /* 32 bit has nosave before _edata */ NOSAVE_DATA -#endif PAGE_ALIGNED_DATA(PAGE_SIZE) @@ -144,6 +202,8 @@ DATA_DATA CONSTRUCTORS + jiffies = jiffies_64; + /* rarely changed data like cpu maps */ READ_MOSTLY_DATA(INTERNODE_CACHE_BYTES) @@ -198,12 +258,6 @@ } vgetcpu_mode = VVIRT(.vgetcpu_mode); - . = ALIGN(L1_CACHE_BYTES); - .jiffies : AT(VLOAD(.jiffies)) { - *(.jiffies) - } - jiffies = VVIRT(.jiffies); - .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) { *(.vsyscall_3) } @@ -219,12 +273,19 @@ #endif /* CONFIG_X86_64 */ /* Init code and data - will be freed after init */ - . = ALIGN(PAGE_SIZE); .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) { + BYTE(0) + +#ifdef CONFIG_PAX_KERNEXEC + . = ALIGN(HPAGE_SIZE); +#else + . = ALIGN(PAGE_SIZE); +#endif + __init_begin = .; /* paired with __init_end */ - } + } :init.begin -#if defined(CONFIG_X86_64) && defined(CONFIG_SMP) +#ifdef CONFIG_SMP /* * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the * output PHDR, so the next output section - .init.text - should @@ -233,12 +294,27 @@ PERCPU_VADDR(0, :percpu) #endif - INIT_TEXT_SECTION(PAGE_SIZE) -#ifdef CONFIG_X86_64 - :init -#endif + . = ALIGN(PAGE_SIZE); + init_begin = .; + .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) { + VMLINUX_SYMBOL(_sinittext) = .; + INIT_TEXT + VMLINUX_SYMBOL(_einittext) = .; + . = ALIGN(PAGE_SIZE); + } :text.init - INIT_DATA_SECTION(16) + /* + * .exit.text is discard at runtime, not link time, to deal with + * references from .altinstructions and .eh_frame + */ + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) { + EXIT_TEXT + . = ALIGN(16); + } :text.exit + . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text); + + . = ALIGN(PAGE_SIZE); + INIT_DATA_SECTION(16) :init .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) { __x86_cpu_dev_start = .; @@ -292,19 +368,12 @@ __iommu_table_end = .; } . = ALIGN(8); - /* - * .exit.text is discard at runtime, not link time, to deal with - * references from .altinstructions and .eh_frame - */ - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { - EXIT_TEXT - } .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { EXIT_DATA } -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP) +#ifndef CONFIG_SMP PERCPU(THREAD_SIZE) #endif @@ -323,16 +392,10 @@ .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { __smp_locks = .; *(.smp_locks) - . = ALIGN(PAGE_SIZE); __smp_locks_end = .; + . = ALIGN(PAGE_SIZE); } -#ifdef CONFIG_X86_64 - .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { - NOSAVE_DATA - } -#endif - /* BSS */ . = ALIGN(PAGE_SIZE); .bss : AT(ADDR(.bss) - LOAD_OFFSET) { @@ -348,6 +411,7 @@ __brk_base = .; . += 64 * 1024; /* 64k alignment slop space */ *(.brk_reservation) /* areas brk users have reserved */ + . = ALIGN(HPAGE_SIZE); __brk_limit = .; } @@ -374,13 +438,12 @@ * for the boot processor. */ #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load -INIT_PER_CPU(gdt_page); INIT_PER_CPU(irq_stack_union); /* * Build-time check on the image size: */ -. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE), +. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE), "kernel image bigger than KERNEL_IMAGE_SIZE"); #ifdef CONFIG_SMP diff -uriN linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/vsyscall_64.c --- linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/vsyscall_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -80,6 +80,7 @@ write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); /* copy vsyscall data */ + strlcpy(vsyscall_gtod_data.clock.name, clock->name, sizeof vsyscall_gtod_data.clock.name); vsyscall_gtod_data.clock.vread = clock->vread; vsyscall_gtod_data.clock.cycle_last = clock->cycle_last; vsyscall_gtod_data.clock.mask = clock->mask; @@ -208,7 +209,7 @@ We do this here because otherwise user space would do it on its own in a likely inferior way (no access to jiffies). If you don't like it pass NULL. */ - if (tcache && tcache->blob[0] == (j = __jiffies)) { + if (tcache && tcache->blob[0] == (j = jiffies)) { p = tcache->blob[1]; } else if (__vgetcpu_mode == VGETCPU_RDTSCP) { /* Load per CPU data from RDTSCP */ diff -uriN linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/x8664_ksyms_64.c --- linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/x8664_ksyms_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(copy_user_generic_string); EXPORT_SYMBOL(copy_user_generic_unrolled); EXPORT_SYMBOL(__copy_user_nocache); -EXPORT_SYMBOL(_copy_from_user); -EXPORT_SYMBOL(_copy_to_user); EXPORT_SYMBOL(copy_page); EXPORT_SYMBOL(clear_page); diff -uriN linux-2.6.38.4/arch/x86/kernel/xsave.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/xsave.c --- linux-2.6.38.4/arch/x86/kernel/xsave.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kernel/xsave.c 2011-05-01 17:02:10.000000000 -0500 @@ -130,7 +130,7 @@ fx_sw_user->xstate_size > fx_sw_user->extended_size) return -EINVAL; - err = __get_user(magic2, (__u32 *) (((void *)fpstate) + + err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) + fx_sw_user->extended_size - FP_XSTATE_MAGIC2_SIZE)); if (err) @@ -267,7 +267,7 @@ * the other extended state. */ xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE); - return fxrstor_checking((__force struct i387_fxsave_struct *)buf); + return fxrstor_checking((struct i387_fxsave_struct __user *)buf); } /* @@ -299,7 +299,7 @@ if (use_xsave()) err = restore_user_xstate(buf); else - err = fxrstor_checking((__force struct i387_fxsave_struct *) + err = fxrstor_checking((struct i387_fxsave_struct __user *) buf); if (unlikely(err)) { /* diff -uriN linux-2.6.38.4/arch/x86/kvm/emulate.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kvm/emulate.c --- linux-2.6.38.4/arch/x86/kvm/emulate.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kvm/emulate.c 2011-05-01 17:02:10.000000000 -0500 @@ -88,7 +88,7 @@ #define Src2ImmByte (2<<29) #define Src2One (3<<29) #define Src2Imm (4<<29) -#define Src2Mask (7<<29) +#define Src2Mask (7U<<29) #define X2(x...) x, x #define X3(x...) X2(x), x @@ -189,6 +189,7 @@ #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix, _dsttype) \ do { \ + unsigned long _tmp; \ __asm__ __volatile__ ( \ _PRE_EFLAGS("0", "4", "2") \ _op _suffix " %"_x"3,%1; " \ @@ -202,8 +203,6 @@ /* Raw emulation: instruction has two explicit operands. */ #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \ do { \ - unsigned long _tmp; \ - \ switch ((_dst).bytes) { \ case 2: \ ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w",u16);\ @@ -219,7 +218,6 @@ #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \ do { \ - unsigned long _tmp; \ switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \ diff -uriN linux-2.6.38.4/arch/x86/kvm/lapic.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kvm/lapic.c --- linux-2.6.38.4/arch/x86/kvm/lapic.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kvm/lapic.c 2011-05-01 17:02:10.000000000 -0500 @@ -53,7 +53,7 @@ #define APIC_BUS_CYCLE_NS 1 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */ -#define apic_debug(fmt, arg...) +#define apic_debug(fmt, arg...) do {} while (0) #define APIC_LVT_NUM 6 /* 14 is the version for Xeon and Pentium 8.4.8*/ diff -uriN linux-2.6.38.4/arch/x86/kvm/svm.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kvm/svm.c --- linux-2.6.38.4/arch/x86/kvm/svm.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kvm/svm.c 2011-05-01 17:02:10.000000000 -0500 @@ -3273,7 +3273,11 @@ int cpu = raw_smp_processor_id(); struct svm_cpu_data *sd = per_cpu(svm_data, cpu); + + pax_open_kernel(); sd->tss_desc->type = 9; /* available 32/64-bit TSS */ + pax_close_kernel(); + load_TR_desc(); } @@ -3850,7 +3854,7 @@ update_cr0_intercept(svm); } -static struct kvm_x86_ops svm_x86_ops = { +static const struct kvm_x86_ops svm_x86_ops = { .cpu_has_kvm_support = has_svm, .disabled_by_bios = is_disabled, .hardware_setup = svm_hardware_setup, diff -uriN linux-2.6.38.4/arch/x86/kvm/vmx.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kvm/vmx.c --- linux-2.6.38.4/arch/x86/kvm/vmx.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kvm/vmx.c 2011-05-01 17:02:10.000000000 -0500 @@ -725,7 +725,11 @@ struct desc_struct *descs; descs = (void *)gdt->address; + + pax_open_kernel(); descs[GDT_ENTRY_TSS].type = 9; /* available TSS */ + pax_close_kernel(); + load_TR_desc(); } @@ -1642,8 +1646,11 @@ if (!cpu_has_vmx_flexpriority()) flexpriority_enabled = 0; - if (!cpu_has_vmx_tpr_shadow()) - kvm_x86_ops->update_cr8_intercept = NULL; + if (!cpu_has_vmx_tpr_shadow()) { + pax_open_kernel(); + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL; + pax_close_kernel(); + } if (enable_ept && !cpu_has_vmx_ept_2m_page()) kvm_disable_largepages(); @@ -2640,7 +2647,7 @@ vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */ asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return)); - vmcs_writel(HOST_RIP, kvm_vmx_return); /* 22.2.5 */ + vmcs_writel(HOST_RIP, ktla_ktva(kvm_vmx_return)); /* 22.2.5 */ vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0); vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0); vmcs_write64(VM_EXIT_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.host)); @@ -4031,6 +4038,12 @@ "jmp .Lkvm_vmx_return \n\t" ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t" ".Lkvm_vmx_return: " + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) + "ljmp %[cs],$.Lkvm_vmx_return2\n\t" + ".Lkvm_vmx_return2: " +#endif + /* Save guest registers, load host registers, keep flags */ "xchg %0, (%%"R"sp) \n\t" "mov %%"R"ax, %c[rax](%0) \n\t" @@ -4077,6 +4090,11 @@ [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])), #endif [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)) + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) + ,[cs]"i"(__KERNEL_CS) +#endif + : "cc", "memory" , R"ax", R"bx", R"di", R"si" #ifdef CONFIG_X86_64 @@ -4091,7 +4109,16 @@ vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD); - asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS)); + asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS)); + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) + asm("mov %0, %%fs" : : "r"(__KERNEL_PERCPU)); +#endif + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) + __set_fs(current_thread_info()->addr_limit); +#endif + vmx->launched = 1; vmx->exit_reason = vmcs_read32(VM_EXIT_REASON); @@ -4326,7 +4353,7 @@ { } -static struct kvm_x86_ops vmx_x86_ops = { +static const struct kvm_x86_ops vmx_x86_ops = { .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios, .hardware_setup = hardware_setup, diff -uriN linux-2.6.38.4/arch/x86/kvm/x86.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kvm/x86.c --- linux-2.6.38.4/arch/x86/kvm/x86.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/kvm/x86.c 2011-05-01 17:02:10.000000000 -0500 @@ -93,7 +93,7 @@ static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries); -struct kvm_x86_ops *kvm_x86_ops; +const struct kvm_x86_ops *kvm_x86_ops; EXPORT_SYMBOL_GPL(kvm_x86_ops); int ignore_msrs = 0; @@ -2023,6 +2023,8 @@ if (n < msr_list.nmsrs) goto out; r = -EFAULT; + if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save)) + goto out; if (copy_to_user(user_msr_list->indices, &msrs_to_save, num_msrs_to_save * sizeof(u32))) goto out; @@ -2190,15 +2192,20 @@ struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries) { - int r; + int r, i; r = -E2BIG; if (cpuid->nent > KVM_MAX_CPUID_ENTRIES) goto out; r = -EFAULT; - if (copy_from_user(&vcpu->arch.cpuid_entries, entries, - cpuid->nent * sizeof(struct kvm_cpuid_entry2))) + if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2))) goto out; + for (i = 0; i < cpuid->nent; ++i) { + struct kvm_cpuid_entry2 cpuid_entry; + if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry))) + goto out; + vcpu->arch.cpuid_entries[i] = cpuid_entry; + } vcpu->arch.cpuid_nent = cpuid->nent; kvm_apic_set_version(vcpu); kvm_x86_ops->cpuid_update(vcpu); @@ -2213,15 +2220,19 @@ struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries) { - int r; + int r, i; r = -E2BIG; if (cpuid->nent < vcpu->arch.cpuid_nent) goto out; r = -EFAULT; - if (copy_to_user(entries, &vcpu->arch.cpuid_entries, - vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2))) + if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2))) goto out; + for (i = 0; i < vcpu->arch.cpuid_nent; ++i) { + struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i]; + if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry))) + goto out; + } return 0; out: @@ -2499,7 +2510,7 @@ static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq) { - if (irq->irq < 0 || irq->irq >= 256) + if (irq->irq >= 256) return -EINVAL; if (irqchip_in_kernel(vcpu->kvm)) return -ENXIO; @@ -4687,10 +4698,10 @@ } EXPORT_SYMBOL_GPL(kvm_after_handle_nmi); -int kvm_arch_init(void *opaque) +int kvm_arch_init(const void *opaque) { int r; - struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque; + const struct kvm_x86_ops *ops = (const struct kvm_x86_ops *)opaque; if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); diff -uriN linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/atomic64_cx8_32.S --- linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/atomic64_cx8_32.S 2011-05-01 17:02:10.000000000 -0500 @@ -86,13 +86,23 @@ movl %edx, %ecx \ins\()l %esi, %ebx \insc\()l %edi, %ecx + +#ifdef CONFIG_PAX_REFCOUNT + into +2: + _ASM_EXTABLE(2b, 3f) +#endif + LOCK_PREFIX cmpxchg8b (%ebp) jne 1b - -10: movl %ebx, %eax movl %ecx, %edx + +#ifdef CONFIG_PAX_REFCOUNT +3: +#endif + RESTORE edi RESTORE esi RESTORE ebx @@ -116,13 +126,24 @@ movl %edx, %ecx \ins\()l $1, %ebx \insc\()l $0, %ecx + +#ifdef CONFIG_PAX_REFCOUNT + into +2: + _ASM_EXTABLE(2b, 3f) +#endif + LOCK_PREFIX cmpxchg8b (%esi) jne 1b -10: movl %ebx, %eax movl %ecx, %edx + +#ifdef CONFIG_PAX_REFCOUNT +3: +#endif + RESTORE ebx ret CFI_ENDPROC @@ -176,6 +197,13 @@ movl %edx, %ecx addl %esi, %ebx adcl %edi, %ecx + +#ifdef CONFIG_PAX_REFCOUNT + into +1234: + _ASM_EXTABLE(1234b, 1234b) +#endif + LOCK_PREFIX cmpxchg8b (%ebp) jne 1b @@ -208,6 +236,13 @@ movl %edx, %ecx addl $1, %ebx adcl $0, %ecx + +#ifdef CONFIG_PAX_REFCOUNT + into +1234: + _ASM_EXTABLE(1234b, 1234b) +#endif + LOCK_PREFIX cmpxchg8b (%esi) jne 1b diff -uriN linux-2.6.38.4/arch/x86/lib/checksum_32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/checksum_32.S --- linux-2.6.38.4/arch/x86/lib/checksum_32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/checksum_32.S 2011-05-01 17:02:10.000000000 -0500 @@ -28,7 +28,8 @@ #include #include #include - +#include + /* * computes a partial checksum, e.g. for TCP/UDP fragments */ @@ -304,9 +305,28 @@ #define ARGBASE 16 #define FP 12 - -ENTRY(csum_partial_copy_generic) + +ENTRY(csum_partial_copy_generic_to_user) CFI_STARTPROC + +#ifdef CONFIG_PAX_MEMORY_UDEREF + pushl %gs + CFI_ADJUST_CFA_OFFSET 4 + popl %es + CFI_ADJUST_CFA_OFFSET -4 + jmp csum_partial_copy_generic +#endif + +ENTRY(csum_partial_copy_generic_from_user) + +#ifdef CONFIG_PAX_MEMORY_UDEREF + pushl %gs + CFI_ADJUST_CFA_OFFSET 4 + popl %ds + CFI_ADJUST_CFA_OFFSET -4 +#endif + +ENTRY(csum_partial_copy_generic) subl $4,%esp CFI_ADJUST_CFA_OFFSET 4 pushl %edi @@ -331,7 +351,7 @@ jmp 4f SRC(1: movw (%esi), %bx ) addl $2, %esi -DST( movw %bx, (%edi) ) +DST( movw %bx, %es:(%edi) ) addl $2, %edi addw %bx, %ax adcl $0, %eax @@ -343,30 +363,30 @@ SRC(1: movl (%esi), %ebx ) SRC( movl 4(%esi), %edx ) adcl %ebx, %eax -DST( movl %ebx, (%edi) ) +DST( movl %ebx, %es:(%edi) ) adcl %edx, %eax -DST( movl %edx, 4(%edi) ) +DST( movl %edx, %es:4(%edi) ) SRC( movl 8(%esi), %ebx ) SRC( movl 12(%esi), %edx ) adcl %ebx, %eax -DST( movl %ebx, 8(%edi) ) +DST( movl %ebx, %es:8(%edi) ) adcl %edx, %eax -DST( movl %edx, 12(%edi) ) +DST( movl %edx, %es:12(%edi) ) SRC( movl 16(%esi), %ebx ) SRC( movl 20(%esi), %edx ) adcl %ebx, %eax -DST( movl %ebx, 16(%edi) ) +DST( movl %ebx, %es:16(%edi) ) adcl %edx, %eax -DST( movl %edx, 20(%edi) ) +DST( movl %edx, %es:20(%edi) ) SRC( movl 24(%esi), %ebx ) SRC( movl 28(%esi), %edx ) adcl %ebx, %eax -DST( movl %ebx, 24(%edi) ) +DST( movl %ebx, %es:24(%edi) ) adcl %edx, %eax -DST( movl %edx, 28(%edi) ) +DST( movl %edx, %es:28(%edi) ) lea 32(%esi), %esi lea 32(%edi), %edi @@ -380,7 +400,7 @@ shrl $2, %edx # This clears CF SRC(3: movl (%esi), %ebx ) adcl %ebx, %eax -DST( movl %ebx, (%edi) ) +DST( movl %ebx, %es:(%edi) ) lea 4(%esi), %esi lea 4(%edi), %edi dec %edx @@ -392,12 +412,12 @@ jb 5f SRC( movw (%esi), %cx ) leal 2(%esi), %esi -DST( movw %cx, (%edi) ) +DST( movw %cx, %es:(%edi) ) leal 2(%edi), %edi je 6f shll $16,%ecx SRC(5: movb (%esi), %cl ) -DST( movb %cl, (%edi) ) +DST( movb %cl, %es:(%edi) ) 6: addl %ecx, %eax adcl $0, %eax 7: @@ -408,7 +428,7 @@ 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr - movl $-EFAULT, (%ebx) + movl $-EFAULT, %ss:(%ebx) # zero the complete destination - computing the rest # is too much work @@ -421,11 +441,19 @@ 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr - movl $-EFAULT,(%ebx) + movl $-EFAULT,%ss:(%ebx) jmp 5000b .previous + pushl %ss + CFI_ADJUST_CFA_OFFSET 4 + popl %ds + CFI_ADJUST_CFA_OFFSET -4 + pushl %ss + CFI_ADJUST_CFA_OFFSET 4 + popl %es + CFI_ADJUST_CFA_OFFSET -4 popl %ebx CFI_ADJUST_CFA_OFFSET -4 CFI_RESTORE ebx @@ -439,26 +467,47 @@ CFI_ADJUST_CFA_OFFSET -4 ret CFI_ENDPROC -ENDPROC(csum_partial_copy_generic) +ENDPROC(csum_partial_copy_generic_to_user) #else /* Version for PentiumII/PPro */ #define ROUND1(x) \ + nop; nop; nop; \ SRC(movl x(%esi), %ebx ) ; \ addl %ebx, %eax ; \ - DST(movl %ebx, x(%edi) ) ; + DST(movl %ebx, %es:x(%edi)) ; #define ROUND(x) \ + nop; nop; nop; \ SRC(movl x(%esi), %ebx ) ; \ adcl %ebx, %eax ; \ - DST(movl %ebx, x(%edi) ) ; + DST(movl %ebx, %es:x(%edi)) ; #define ARGBASE 12 - -ENTRY(csum_partial_copy_generic) + +ENTRY(csum_partial_copy_generic_to_user) CFI_STARTPROC + +#ifdef CONFIG_PAX_MEMORY_UDEREF + pushl %gs + CFI_ADJUST_CFA_OFFSET 4 + popl %es + CFI_ADJUST_CFA_OFFSET -4 + jmp csum_partial_copy_generic +#endif + +ENTRY(csum_partial_copy_generic_from_user) + +#ifdef CONFIG_PAX_MEMORY_UDEREF + pushl %gs + CFI_ADJUST_CFA_OFFSET 4 + popl %ds + CFI_ADJUST_CFA_OFFSET -4 +#endif + +ENTRY(csum_partial_copy_generic) pushl %ebx CFI_ADJUST_CFA_OFFSET 4 CFI_REL_OFFSET ebx, 0 @@ -482,7 +531,7 @@ subl %ebx, %edi lea -1(%esi),%edx andl $-32,%edx - lea 3f(%ebx,%ebx), %ebx + lea 3f(%ebx,%ebx,2), %ebx testl %esi, %esi jmp *%ebx 1: addl $64,%esi @@ -503,19 +552,19 @@ jb 5f SRC( movw (%esi), %dx ) leal 2(%esi), %esi -DST( movw %dx, (%edi) ) +DST( movw %dx, %es:(%edi) ) leal 2(%edi), %edi je 6f shll $16,%edx 5: SRC( movb (%esi), %dl ) -DST( movb %dl, (%edi) ) +DST( movb %dl, %es:(%edi) ) 6: addl %edx, %eax adcl $0, %eax 7: .section .fixup, "ax" 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr - movl $-EFAULT, (%ebx) + movl $-EFAULT, %ss:(%ebx) # zero the complete destination (computing the rest is too much work) movl ARGBASE+8(%esp),%edi # dst movl ARGBASE+12(%esp),%ecx # len @@ -523,10 +572,21 @@ rep; stosb jmp 7b 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr - movl $-EFAULT, (%ebx) + movl $-EFAULT, %ss:(%ebx) jmp 7b .previous +#ifdef CONFIG_PAX_MEMORY_UDEREF + pushl %ss + CFI_ADJUST_CFA_OFFSET 4 + popl %ds + CFI_ADJUST_CFA_OFFSET -4 + pushl %ss + CFI_ADJUST_CFA_OFFSET 4 + popl %es + CFI_ADJUST_CFA_OFFSET -4 +#endif + popl %esi CFI_ADJUST_CFA_OFFSET -4 CFI_RESTORE esi @@ -538,7 +598,7 @@ CFI_RESTORE ebx ret CFI_ENDPROC -ENDPROC(csum_partial_copy_generic) +ENDPROC(csum_partial_copy_generic_to_user) #undef ROUND #undef ROUND1 diff -uriN linux-2.6.38.4/arch/x86/lib/clear_page_64.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/clear_page_64.S --- linux-2.6.38.4/arch/x86/lib/clear_page_64.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/clear_page_64.S 2011-05-01 17:02:10.000000000 -0500 @@ -43,7 +43,7 @@ #include - .section .altinstr_replacement,"ax" + .section .altinstr_replacement,"a" 1: .byte 0xeb /* jmp */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: diff -uriN linux-2.6.38.4/arch/x86/lib/copy_page_64.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/copy_page_64.S --- linux-2.6.38.4/arch/x86/lib/copy_page_64.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/copy_page_64.S 2011-05-01 17:02:10.000000000 -0500 @@ -104,7 +104,7 @@ #include - .section .altinstr_replacement,"ax" + .section .altinstr_replacement,"a" 1: .byte 0xeb /* jmp */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: diff -uriN linux-2.6.38.4/arch/x86/lib/copy_user_64.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/copy_user_64.S --- linux-2.6.38.4/arch/x86/lib/copy_user_64.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/copy_user_64.S 2011-05-01 17:02:10.000000000 -0500 @@ -15,13 +15,14 @@ #include #include #include +#include .macro ALTERNATIVE_JUMP feature,orig,alt 0: .byte 0xe9 /* 32bit jump */ .long \orig-1f /* by default jump to orig */ 1: - .section .altinstr_replacement,"ax" + .section .altinstr_replacement,"a" 2: .byte 0xe9 /* near jump with 32bit immediate */ .long \alt-1b /* offset */ /* or alternatively to alt */ .previous @@ -64,37 +65,13 @@ #endif .endm -/* Standard copy_to_user with segment limit checking */ -ENTRY(_copy_to_user) - CFI_STARTPROC - GET_THREAD_INFO(%rax) - movq %rdi,%rcx - addq %rdx,%rcx - jc bad_to_user - cmpq TI_addr_limit(%rax),%rcx - jae bad_to_user - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string - CFI_ENDPROC -ENDPROC(_copy_to_user) - -/* Standard copy_from_user with segment limit checking */ -ENTRY(_copy_from_user) - CFI_STARTPROC - GET_THREAD_INFO(%rax) - movq %rsi,%rcx - addq %rdx,%rcx - jc bad_from_user - cmpq TI_addr_limit(%rax),%rcx - jae bad_from_user - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string - CFI_ENDPROC -ENDPROC(_copy_from_user) - .section .fixup,"ax" /* must zero dest */ ENTRY(bad_from_user) bad_from_user: CFI_STARTPROC + testl %edx,%edx + js bad_to_user movl %edx,%ecx xorl %eax,%eax rep diff -uriN linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/copy_user_nocache_64.S --- linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/copy_user_nocache_64.S 2011-05-01 17:02:10.000000000 -0500 @@ -14,6 +14,7 @@ #include #include #include +#include .macro ALIGN_DESTINATION #ifdef FIX_ALIGNMENT @@ -50,6 +51,15 @@ */ ENTRY(__copy_user_nocache) CFI_STARTPROC + +#ifdef CONFIG_PAX_MEMORY_UDEREF + mov $PAX_USER_SHADOW_BASE,%rcx + cmp %rcx,%rsi + jae 1f + add %rcx,%rsi +1: +#endif + cmpl $8,%edx jb 20f /* less then 8 bytes, go to byte copy loop */ ALIGN_DESTINATION diff -uriN linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/csum-wrappers_64.c --- linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/csum-wrappers_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -52,6 +52,8 @@ len -= 2; } } + if ((unsigned long)src < PAX_USER_SHADOW_BASE) + src += PAX_USER_SHADOW_BASE; isum = csum_partial_copy_generic((__force const void *)src, dst, len, isum, errp, NULL); if (unlikely(*errp)) @@ -105,6 +107,8 @@ } *errp = 0; + if ((unsigned long)dst < PAX_USER_SHADOW_BASE) + dst += PAX_USER_SHADOW_BASE; return csum_partial_copy_generic(src, (void __force *)dst, len, isum, NULL, errp); } diff -uriN linux-2.6.38.4/arch/x86/lib/getuser.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/getuser.S --- linux-2.6.38.4/arch/x86/lib/getuser.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/getuser.S 2011-05-01 17:02:10.000000000 -0500 @@ -33,14 +33,35 @@ #include #include #include +#include +#include + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) +#define __copyuser_seg gs; +#else +#define __copyuser_seg +#endif .text ENTRY(__get_user_1) CFI_STARTPROC + +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) GET_THREAD_INFO(%_ASM_DX) cmp TI_addr_limit(%_ASM_DX),%_ASM_AX jae bad_get_user -1: movzb (%_ASM_AX),%edx + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + mov $PAX_USER_SHADOW_BASE,%_ASM_DX + cmp %_ASM_DX,%_ASM_AX + jae 1234f + add %_ASM_DX,%_ASM_AX +1234: +#endif + +#endif + +1: __copyuser_seg movzb (%_ASM_AX),%edx xor %eax,%eax ret CFI_ENDPROC @@ -49,11 +70,24 @@ ENTRY(__get_user_2) CFI_STARTPROC add $1,%_ASM_AX + +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) jc bad_get_user GET_THREAD_INFO(%_ASM_DX) cmp TI_addr_limit(%_ASM_DX),%_ASM_AX jae bad_get_user -2: movzwl -1(%_ASM_AX),%edx + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + mov $PAX_USER_SHADOW_BASE,%_ASM_DX + cmp %_ASM_DX,%_ASM_AX + jae 1234f + add %_ASM_DX,%_ASM_AX +1234: +#endif + +#endif + +2: __copyuser_seg movzwl -1(%_ASM_AX),%edx xor %eax,%eax ret CFI_ENDPROC @@ -62,11 +96,24 @@ ENTRY(__get_user_4) CFI_STARTPROC add $3,%_ASM_AX + +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) jc bad_get_user GET_THREAD_INFO(%_ASM_DX) cmp TI_addr_limit(%_ASM_DX),%_ASM_AX jae bad_get_user -3: mov -3(%_ASM_AX),%edx + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + mov $PAX_USER_SHADOW_BASE,%_ASM_DX + cmp %_ASM_DX,%_ASM_AX + jae 1234f + add %_ASM_DX,%_ASM_AX +1234: +#endif + +#endif + +3: __copyuser_seg mov -3(%_ASM_AX),%edx xor %eax,%eax ret CFI_ENDPROC @@ -80,6 +127,15 @@ GET_THREAD_INFO(%_ASM_DX) cmp TI_addr_limit(%_ASM_DX),%_ASM_AX jae bad_get_user + +#ifdef CONFIG_PAX_MEMORY_UDEREF + mov $PAX_USER_SHADOW_BASE,%_ASM_DX + cmp %_ASM_DX,%_ASM_AX + jae 1234f + add %_ASM_DX,%_ASM_AX +1234: +#endif + 4: movq -7(%_ASM_AX),%_ASM_DX xor %eax,%eax ret diff -uriN linux-2.6.38.4/arch/x86/lib/insn.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/insn.c --- linux-2.6.38.4/arch/x86/lib/insn.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/insn.c 2011-05-01 17:02:10.000000000 -0500 @@ -21,6 +21,11 @@ #include #include #include +#ifdef __KERNEL__ +#include +#else +#define ktla_ktva(addr) addr +#endif #define get_next(t, insn) \ ({t r; r = *(t*)insn->next_byte; insn->next_byte += sizeof(t); r; }) @@ -40,8 +45,8 @@ void insn_init(struct insn *insn, const void *kaddr, int x86_64) { memset(insn, 0, sizeof(*insn)); - insn->kaddr = kaddr; - insn->next_byte = kaddr; + insn->kaddr = ktla_ktva(kaddr); + insn->next_byte = ktla_ktva(kaddr); insn->x86_64 = x86_64 ? 1 : 0; insn->opnd_bytes = 4; if (x86_64) diff -uriN linux-2.6.38.4/arch/x86/lib/mmx_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/mmx_32.c --- linux-2.6.38.4/arch/x86/lib/mmx_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/mmx_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -29,6 +29,7 @@ { void *p; int i; + unsigned long cr0; if (unlikely(in_interrupt())) return __memcpy(to, from, len); @@ -39,44 +40,72 @@ kernel_fpu_begin(); __asm__ __volatile__ ( - "1: prefetch (%0)\n" /* This set is 28 bytes */ - " prefetch 64(%0)\n" - " prefetch 128(%0)\n" - " prefetch 192(%0)\n" - " prefetch 256(%0)\n" + "1: prefetch (%1)\n" /* This set is 28 bytes */ + " prefetch 64(%1)\n" + " prefetch 128(%1)\n" + " prefetch 192(%1)\n" + " prefetch 256(%1)\n" "2: \n" ".section .fixup, \"ax\"\n" - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ + "3: \n" + +#ifdef CONFIG_PAX_KERNEXEC + " movl %%cr0, %0\n" + " movl %0, %%eax\n" + " andl $0xFFFEFFFF, %%eax\n" + " movl %%eax, %%cr0\n" +#endif + + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ + +#ifdef CONFIG_PAX_KERNEXEC + " movl %0, %%cr0\n" +#endif + " jmp 2b\n" ".previous\n" _ASM_EXTABLE(1b, 3b) - : : "r" (from)); + : "=&r" (cr0) : "r" (from) : "ax"); for ( ; i > 5; i--) { __asm__ __volatile__ ( - "1: prefetch 320(%0)\n" - "2: movq (%0), %%mm0\n" - " movq 8(%0), %%mm1\n" - " movq 16(%0), %%mm2\n" - " movq 24(%0), %%mm3\n" - " movq %%mm0, (%1)\n" - " movq %%mm1, 8(%1)\n" - " movq %%mm2, 16(%1)\n" - " movq %%mm3, 24(%1)\n" - " movq 32(%0), %%mm0\n" - " movq 40(%0), %%mm1\n" - " movq 48(%0), %%mm2\n" - " movq 56(%0), %%mm3\n" - " movq %%mm0, 32(%1)\n" - " movq %%mm1, 40(%1)\n" - " movq %%mm2, 48(%1)\n" - " movq %%mm3, 56(%1)\n" + "1: prefetch 320(%1)\n" + "2: movq (%1), %%mm0\n" + " movq 8(%1), %%mm1\n" + " movq 16(%1), %%mm2\n" + " movq 24(%1), %%mm3\n" + " movq %%mm0, (%2)\n" + " movq %%mm1, 8(%2)\n" + " movq %%mm2, 16(%2)\n" + " movq %%mm3, 24(%2)\n" + " movq 32(%1), %%mm0\n" + " movq 40(%1), %%mm1\n" + " movq 48(%1), %%mm2\n" + " movq 56(%1), %%mm3\n" + " movq %%mm0, 32(%2)\n" + " movq %%mm1, 40(%2)\n" + " movq %%mm2, 48(%2)\n" + " movq %%mm3, 56(%2)\n" ".section .fixup, \"ax\"\n" - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */ + "3:\n" + +#ifdef CONFIG_PAX_KERNEXEC + " movl %%cr0, %0\n" + " movl %0, %%eax\n" + " andl $0xFFFEFFFF, %%eax\n" + " movl %%eax, %%cr0\n" +#endif + + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */ + +#ifdef CONFIG_PAX_KERNEXEC + " movl %0, %%cr0\n" +#endif + " jmp 2b\n" ".previous\n" _ASM_EXTABLE(1b, 3b) - : : "r" (from), "r" (to) : "memory"); + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax"); from += 64; to += 64; @@ -158,6 +187,7 @@ static void fast_copy_page(void *to, void *from) { int i; + unsigned long cr0; kernel_fpu_begin(); @@ -166,42 +196,70 @@ * but that is for later. -AV */ __asm__ __volatile__( - "1: prefetch (%0)\n" - " prefetch 64(%0)\n" - " prefetch 128(%0)\n" - " prefetch 192(%0)\n" - " prefetch 256(%0)\n" + "1: prefetch (%1)\n" + " prefetch 64(%1)\n" + " prefetch 128(%1)\n" + " prefetch 192(%1)\n" + " prefetch 256(%1)\n" "2: \n" ".section .fixup, \"ax\"\n" - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ + "3: \n" + +#ifdef CONFIG_PAX_KERNEXEC + " movl %%cr0, %0\n" + " movl %0, %%eax\n" + " andl $0xFFFEFFFF, %%eax\n" + " movl %%eax, %%cr0\n" +#endif + + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ + +#ifdef CONFIG_PAX_KERNEXEC + " movl %0, %%cr0\n" +#endif + " jmp 2b\n" ".previous\n" - _ASM_EXTABLE(1b, 3b) : : "r" (from)); + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax"); for (i = 0; i < (4096-320)/64; i++) { __asm__ __volatile__ ( - "1: prefetch 320(%0)\n" - "2: movq (%0), %%mm0\n" - " movntq %%mm0, (%1)\n" - " movq 8(%0), %%mm1\n" - " movntq %%mm1, 8(%1)\n" - " movq 16(%0), %%mm2\n" - " movntq %%mm2, 16(%1)\n" - " movq 24(%0), %%mm3\n" - " movntq %%mm3, 24(%1)\n" - " movq 32(%0), %%mm4\n" - " movntq %%mm4, 32(%1)\n" - " movq 40(%0), %%mm5\n" - " movntq %%mm5, 40(%1)\n" - " movq 48(%0), %%mm6\n" - " movntq %%mm6, 48(%1)\n" - " movq 56(%0), %%mm7\n" - " movntq %%mm7, 56(%1)\n" + "1: prefetch 320(%1)\n" + "2: movq (%1), %%mm0\n" + " movntq %%mm0, (%2)\n" + " movq 8(%1), %%mm1\n" + " movntq %%mm1, 8(%2)\n" + " movq 16(%1), %%mm2\n" + " movntq %%mm2, 16(%2)\n" + " movq 24(%1), %%mm3\n" + " movntq %%mm3, 24(%2)\n" + " movq 32(%1), %%mm4\n" + " movntq %%mm4, 32(%2)\n" + " movq 40(%1), %%mm5\n" + " movntq %%mm5, 40(%2)\n" + " movq 48(%1), %%mm6\n" + " movntq %%mm6, 48(%2)\n" + " movq 56(%1), %%mm7\n" + " movntq %%mm7, 56(%2)\n" ".section .fixup, \"ax\"\n" - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */ + "3:\n" + +#ifdef CONFIG_PAX_KERNEXEC + " movl %%cr0, %0\n" + " movl %0, %%eax\n" + " andl $0xFFFEFFFF, %%eax\n" + " movl %%eax, %%cr0\n" +#endif + + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */ + +#ifdef CONFIG_PAX_KERNEXEC + " movl %0, %%cr0\n" +#endif + " jmp 2b\n" ".previous\n" - _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory"); + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax"); from += 64; to += 64; @@ -280,47 +338,76 @@ static void fast_copy_page(void *to, void *from) { int i; + unsigned long cr0; kernel_fpu_begin(); __asm__ __volatile__ ( - "1: prefetch (%0)\n" - " prefetch 64(%0)\n" - " prefetch 128(%0)\n" - " prefetch 192(%0)\n" - " prefetch 256(%0)\n" + "1: prefetch (%1)\n" + " prefetch 64(%1)\n" + " prefetch 128(%1)\n" + " prefetch 192(%1)\n" + " prefetch 256(%1)\n" "2: \n" ".section .fixup, \"ax\"\n" - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ + "3: \n" + +#ifdef CONFIG_PAX_KERNEXEC + " movl %%cr0, %0\n" + " movl %0, %%eax\n" + " andl $0xFFFEFFFF, %%eax\n" + " movl %%eax, %%cr0\n" +#endif + + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ + +#ifdef CONFIG_PAX_KERNEXEC + " movl %0, %%cr0\n" +#endif + " jmp 2b\n" ".previous\n" - _ASM_EXTABLE(1b, 3b) : : "r" (from)); + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax"); for (i = 0; i < 4096/64; i++) { __asm__ __volatile__ ( - "1: prefetch 320(%0)\n" - "2: movq (%0), %%mm0\n" - " movq 8(%0), %%mm1\n" - " movq 16(%0), %%mm2\n" - " movq 24(%0), %%mm3\n" - " movq %%mm0, (%1)\n" - " movq %%mm1, 8(%1)\n" - " movq %%mm2, 16(%1)\n" - " movq %%mm3, 24(%1)\n" - " movq 32(%0), %%mm0\n" - " movq 40(%0), %%mm1\n" - " movq 48(%0), %%mm2\n" - " movq 56(%0), %%mm3\n" - " movq %%mm0, 32(%1)\n" - " movq %%mm1, 40(%1)\n" - " movq %%mm2, 48(%1)\n" - " movq %%mm3, 56(%1)\n" + "1: prefetch 320(%1)\n" + "2: movq (%1), %%mm0\n" + " movq 8(%1), %%mm1\n" + " movq 16(%1), %%mm2\n" + " movq 24(%1), %%mm3\n" + " movq %%mm0, (%2)\n" + " movq %%mm1, 8(%2)\n" + " movq %%mm2, 16(%2)\n" + " movq %%mm3, 24(%2)\n" + " movq 32(%1), %%mm0\n" + " movq 40(%1), %%mm1\n" + " movq 48(%1), %%mm2\n" + " movq 56(%1), %%mm3\n" + " movq %%mm0, 32(%2)\n" + " movq %%mm1, 40(%2)\n" + " movq %%mm2, 48(%2)\n" + " movq %%mm3, 56(%2)\n" ".section .fixup, \"ax\"\n" - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */ + "3:\n" + +#ifdef CONFIG_PAX_KERNEXEC + " movl %%cr0, %0\n" + " movl %0, %%eax\n" + " andl $0xFFFEFFFF, %%eax\n" + " movl %%eax, %%cr0\n" +#endif + + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */ + +#ifdef CONFIG_PAX_KERNEXEC + " movl %0, %%cr0\n" +#endif + " jmp 2b\n" ".previous\n" _ASM_EXTABLE(1b, 3b) - : : "r" (from), "r" (to) : "memory"); + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax"); from += 64; to += 64; diff -uriN linux-2.6.38.4/arch/x86/lib/putuser.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/putuser.S --- linux-2.6.38.4/arch/x86/lib/putuser.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/putuser.S 2011-05-01 17:02:10.000000000 -0500 @@ -15,7 +15,8 @@ #include #include #include - +#include +#include /* * __put_user_X @@ -29,52 +30,119 @@ * as they get called from within inline assembly. */ -#define ENTER CFI_STARTPROC ; \ - GET_THREAD_INFO(%_ASM_BX) +#define ENTER CFI_STARTPROC #define EXIT ret ; \ CFI_ENDPROC +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) +#define _DEST %_ASM_CX,%_ASM_BX +#else +#define _DEST %_ASM_CX +#endif + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) +#define __copyuser_seg gs; +#else +#define __copyuser_seg +#endif + .text ENTRY(__put_user_1) ENTER + +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) + GET_THREAD_INFO(%_ASM_BX) cmp TI_addr_limit(%_ASM_BX),%_ASM_CX jae bad_put_user -1: movb %al,(%_ASM_CX) + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + mov $PAX_USER_SHADOW_BASE,%_ASM_BX + cmp %_ASM_BX,%_ASM_CX + jb 1234f + xor %ebx,%ebx +1234: +#endif + +#endif + +1: __copyuser_seg movb %al,(_DEST) xor %eax,%eax EXIT ENDPROC(__put_user_1) ENTRY(__put_user_2) ENTER + +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) + GET_THREAD_INFO(%_ASM_BX) mov TI_addr_limit(%_ASM_BX),%_ASM_BX sub $1,%_ASM_BX cmp %_ASM_BX,%_ASM_CX jae bad_put_user -2: movw %ax,(%_ASM_CX) + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + mov $PAX_USER_SHADOW_BASE,%_ASM_BX + cmp %_ASM_BX,%_ASM_CX + jb 1234f + xor %ebx,%ebx +1234: +#endif + +#endif + +2: __copyuser_seg movw %ax,(_DEST) xor %eax,%eax EXIT ENDPROC(__put_user_2) ENTRY(__put_user_4) ENTER + +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) + GET_THREAD_INFO(%_ASM_BX) mov TI_addr_limit(%_ASM_BX),%_ASM_BX sub $3,%_ASM_BX cmp %_ASM_BX,%_ASM_CX jae bad_put_user -3: movl %eax,(%_ASM_CX) + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + mov $PAX_USER_SHADOW_BASE,%_ASM_BX + cmp %_ASM_BX,%_ASM_CX + jb 1234f + xor %ebx,%ebx +1234: +#endif + +#endif + +3: __copyuser_seg movl %eax,(_DEST) xor %eax,%eax EXIT ENDPROC(__put_user_4) ENTRY(__put_user_8) ENTER + +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) + GET_THREAD_INFO(%_ASM_BX) mov TI_addr_limit(%_ASM_BX),%_ASM_BX sub $7,%_ASM_BX cmp %_ASM_BX,%_ASM_CX jae bad_put_user -4: mov %_ASM_AX,(%_ASM_CX) + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + mov $PAX_USER_SHADOW_BASE,%_ASM_BX + cmp %_ASM_BX,%_ASM_CX + jb 1234f + xor %ebx,%ebx +1234: +#endif + +#endif + +4: __copyuser_seg mov %_ASM_AX,(_DEST) #ifdef CONFIG_X86_32 -5: movl %edx,4(%_ASM_CX) +5: __copyuser_seg movl %edx,4(_DEST) #endif xor %eax,%eax EXIT diff -uriN linux-2.6.38.4/arch/x86/lib/usercopy_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/usercopy_32.c --- linux-2.6.38.4/arch/x86/lib/usercopy_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/usercopy_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -43,7 +43,7 @@ __asm__ __volatile__( \ " testl %1,%1\n" \ " jz 2f\n" \ - "0: lodsb\n" \ + "0: "__copyuser_seg"lodsb\n" \ " stosb\n" \ " testb %%al,%%al\n" \ " jz 1f\n" \ @@ -128,10 +128,12 @@ int __d0; \ might_fault(); \ __asm__ __volatile__( \ + __COPYUSER_SET_ES \ "0: rep; stosl\n" \ " movl %2,%0\n" \ "1: rep; stosb\n" \ "2:\n" \ + __COPYUSER_RESTORE_ES \ ".section .fixup,\"ax\"\n" \ "3: lea 0(%2,%0,4),%0\n" \ " jmp 2b\n" \ @@ -200,6 +202,7 @@ might_fault(); __asm__ __volatile__( + __COPYUSER_SET_ES " testl %0, %0\n" " jz 3f\n" " andl %0,%%ecx\n" @@ -208,6 +211,7 @@ " subl %%ecx,%0\n" " addl %0,%%eax\n" "1:\n" + __COPYUSER_RESTORE_ES ".section .fixup,\"ax\"\n" "2: xorl %%eax,%%eax\n" " jmp 1b\n" @@ -227,7 +231,7 @@ #ifdef CONFIG_X86_INTEL_USERCOPY static unsigned long -__copy_user_intel(void __user *to, const void *from, unsigned long size) +__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size) { int d0, d1; __asm__ __volatile__( @@ -239,36 +243,36 @@ " .align 2,0x90\n" "3: movl 0(%4), %%eax\n" "4: movl 4(%4), %%edx\n" - "5: movl %%eax, 0(%3)\n" - "6: movl %%edx, 4(%3)\n" + "5: "__copyuser_seg" movl %%eax, 0(%3)\n" + "6: "__copyuser_seg" movl %%edx, 4(%3)\n" "7: movl 8(%4), %%eax\n" "8: movl 12(%4),%%edx\n" - "9: movl %%eax, 8(%3)\n" - "10: movl %%edx, 12(%3)\n" + "9: "__copyuser_seg" movl %%eax, 8(%3)\n" + "10: "__copyuser_seg" movl %%edx, 12(%3)\n" "11: movl 16(%4), %%eax\n" "12: movl 20(%4), %%edx\n" - "13: movl %%eax, 16(%3)\n" - "14: movl %%edx, 20(%3)\n" + "13: "__copyuser_seg" movl %%eax, 16(%3)\n" + "14: "__copyuser_seg" movl %%edx, 20(%3)\n" "15: movl 24(%4), %%eax\n" "16: movl 28(%4), %%edx\n" - "17: movl %%eax, 24(%3)\n" - "18: movl %%edx, 28(%3)\n" + "17: "__copyuser_seg" movl %%eax, 24(%3)\n" + "18: "__copyuser_seg" movl %%edx, 28(%3)\n" "19: movl 32(%4), %%eax\n" "20: movl 36(%4), %%edx\n" - "21: movl %%eax, 32(%3)\n" - "22: movl %%edx, 36(%3)\n" + "21: "__copyuser_seg" movl %%eax, 32(%3)\n" + "22: "__copyuser_seg" movl %%edx, 36(%3)\n" "23: movl 40(%4), %%eax\n" "24: movl 44(%4), %%edx\n" - "25: movl %%eax, 40(%3)\n" - "26: movl %%edx, 44(%3)\n" + "25: "__copyuser_seg" movl %%eax, 40(%3)\n" + "26: "__copyuser_seg" movl %%edx, 44(%3)\n" "27: movl 48(%4), %%eax\n" "28: movl 52(%4), %%edx\n" - "29: movl %%eax, 48(%3)\n" - "30: movl %%edx, 52(%3)\n" + "29: "__copyuser_seg" movl %%eax, 48(%3)\n" + "30: "__copyuser_seg" movl %%edx, 52(%3)\n" "31: movl 56(%4), %%eax\n" "32: movl 60(%4), %%edx\n" - "33: movl %%eax, 56(%3)\n" - "34: movl %%edx, 60(%3)\n" + "33: "__copyuser_seg" movl %%eax, 56(%3)\n" + "34: "__copyuser_seg" movl %%edx, 60(%3)\n" " addl $-64, %0\n" " addl $64, %4\n" " addl $64, %3\n" @@ -278,10 +282,119 @@ " shrl $2, %0\n" " andl $3, %%eax\n" " cld\n" + __COPYUSER_SET_ES "99: rep; movsl\n" "36: movl %%eax, %0\n" "37: rep; movsb\n" "100:\n" + __COPYUSER_RESTORE_ES + ".section .fixup,\"ax\"\n" + "101: lea 0(%%eax,%0,4),%0\n" + " jmp 100b\n" + ".previous\n" + ".section __ex_table,\"a\"\n" + " .align 4\n" + " .long 1b,100b\n" + " .long 2b,100b\n" + " .long 3b,100b\n" + " .long 4b,100b\n" + " .long 5b,100b\n" + " .long 6b,100b\n" + " .long 7b,100b\n" + " .long 8b,100b\n" + " .long 9b,100b\n" + " .long 10b,100b\n" + " .long 11b,100b\n" + " .long 12b,100b\n" + " .long 13b,100b\n" + " .long 14b,100b\n" + " .long 15b,100b\n" + " .long 16b,100b\n" + " .long 17b,100b\n" + " .long 18b,100b\n" + " .long 19b,100b\n" + " .long 20b,100b\n" + " .long 21b,100b\n" + " .long 22b,100b\n" + " .long 23b,100b\n" + " .long 24b,100b\n" + " .long 25b,100b\n" + " .long 26b,100b\n" + " .long 27b,100b\n" + " .long 28b,100b\n" + " .long 29b,100b\n" + " .long 30b,100b\n" + " .long 31b,100b\n" + " .long 32b,100b\n" + " .long 33b,100b\n" + " .long 34b,100b\n" + " .long 35b,100b\n" + " .long 36b,100b\n" + " .long 37b,100b\n" + " .long 99b,101b\n" + ".previous" + : "=&c"(size), "=&D" (d0), "=&S" (d1) + : "1"(to), "2"(from), "0"(size) + : "eax", "edx", "memory"); + return size; +} + +static unsigned long +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size) +{ + int d0, d1; + __asm__ __volatile__( + " .align 2,0x90\n" + "1: "__copyuser_seg" movl 32(%4), %%eax\n" + " cmpl $67, %0\n" + " jbe 3f\n" + "2: "__copyuser_seg" movl 64(%4), %%eax\n" + " .align 2,0x90\n" + "3: "__copyuser_seg" movl 0(%4), %%eax\n" + "4: "__copyuser_seg" movl 4(%4), %%edx\n" + "5: movl %%eax, 0(%3)\n" + "6: movl %%edx, 4(%3)\n" + "7: "__copyuser_seg" movl 8(%4), %%eax\n" + "8: "__copyuser_seg" movl 12(%4),%%edx\n" + "9: movl %%eax, 8(%3)\n" + "10: movl %%edx, 12(%3)\n" + "11: "__copyuser_seg" movl 16(%4), %%eax\n" + "12: "__copyuser_seg" movl 20(%4), %%edx\n" + "13: movl %%eax, 16(%3)\n" + "14: movl %%edx, 20(%3)\n" + "15: "__copyuser_seg" movl 24(%4), %%eax\n" + "16: "__copyuser_seg" movl 28(%4), %%edx\n" + "17: movl %%eax, 24(%3)\n" + "18: movl %%edx, 28(%3)\n" + "19: "__copyuser_seg" movl 32(%4), %%eax\n" + "20: "__copyuser_seg" movl 36(%4), %%edx\n" + "21: movl %%eax, 32(%3)\n" + "22: movl %%edx, 36(%3)\n" + "23: "__copyuser_seg" movl 40(%4), %%eax\n" + "24: "__copyuser_seg" movl 44(%4), %%edx\n" + "25: movl %%eax, 40(%3)\n" + "26: movl %%edx, 44(%3)\n" + "27: "__copyuser_seg" movl 48(%4), %%eax\n" + "28: "__copyuser_seg" movl 52(%4), %%edx\n" + "29: movl %%eax, 48(%3)\n" + "30: movl %%edx, 52(%3)\n" + "31: "__copyuser_seg" movl 56(%4), %%eax\n" + "32: "__copyuser_seg" movl 60(%4), %%edx\n" + "33: movl %%eax, 56(%3)\n" + "34: movl %%edx, 60(%3)\n" + " addl $-64, %0\n" + " addl $64, %4\n" + " addl $64, %3\n" + " cmpl $63, %0\n" + " ja 1b\n" + "35: movl %0, %%eax\n" + " shrl $2, %0\n" + " andl $3, %%eax\n" + " cld\n" + "99: rep; "__copyuser_seg" movsl\n" + "36: movl %%eax, %0\n" + "37: rep; "__copyuser_seg" movsb\n" + "100:\n" ".section .fixup,\"ax\"\n" "101: lea 0(%%eax,%0,4),%0\n" " jmp 100b\n" @@ -339,41 +452,41 @@ int d0, d1; __asm__ __volatile__( " .align 2,0x90\n" - "0: movl 32(%4), %%eax\n" + "0: "__copyuser_seg" movl 32(%4), %%eax\n" " cmpl $67, %0\n" " jbe 2f\n" - "1: movl 64(%4), %%eax\n" + "1: "__copyuser_seg" movl 64(%4), %%eax\n" " .align 2,0x90\n" - "2: movl 0(%4), %%eax\n" - "21: movl 4(%4), %%edx\n" + "2: "__copyuser_seg" movl 0(%4), %%eax\n" + "21: "__copyuser_seg" movl 4(%4), %%edx\n" " movl %%eax, 0(%3)\n" " movl %%edx, 4(%3)\n" - "3: movl 8(%4), %%eax\n" - "31: movl 12(%4),%%edx\n" + "3: "__copyuser_seg" movl 8(%4), %%eax\n" + "31: "__copyuser_seg" movl 12(%4),%%edx\n" " movl %%eax, 8(%3)\n" " movl %%edx, 12(%3)\n" - "4: movl 16(%4), %%eax\n" - "41: movl 20(%4), %%edx\n" + "4: "__copyuser_seg" movl 16(%4), %%eax\n" + "41: "__copyuser_seg" movl 20(%4), %%edx\n" " movl %%eax, 16(%3)\n" " movl %%edx, 20(%3)\n" - "10: movl 24(%4), %%eax\n" - "51: movl 28(%4), %%edx\n" + "10: "__copyuser_seg" movl 24(%4), %%eax\n" + "51: "__copyuser_seg" movl 28(%4), %%edx\n" " movl %%eax, 24(%3)\n" " movl %%edx, 28(%3)\n" - "11: movl 32(%4), %%eax\n" - "61: movl 36(%4), %%edx\n" + "11: "__copyuser_seg" movl 32(%4), %%eax\n" + "61: "__copyuser_seg" movl 36(%4), %%edx\n" " movl %%eax, 32(%3)\n" " movl %%edx, 36(%3)\n" - "12: movl 40(%4), %%eax\n" - "71: movl 44(%4), %%edx\n" + "12: "__copyuser_seg" movl 40(%4), %%eax\n" + "71: "__copyuser_seg" movl 44(%4), %%edx\n" " movl %%eax, 40(%3)\n" " movl %%edx, 44(%3)\n" - "13: movl 48(%4), %%eax\n" - "81: movl 52(%4), %%edx\n" + "13: "__copyuser_seg" movl 48(%4), %%eax\n" + "81: "__copyuser_seg" movl 52(%4), %%edx\n" " movl %%eax, 48(%3)\n" " movl %%edx, 52(%3)\n" - "14: movl 56(%4), %%eax\n" - "91: movl 60(%4), %%edx\n" + "14: "__copyuser_seg" movl 56(%4), %%eax\n" + "91: "__copyuser_seg" movl 60(%4), %%edx\n" " movl %%eax, 56(%3)\n" " movl %%edx, 60(%3)\n" " addl $-64, %0\n" @@ -385,9 +498,9 @@ " shrl $2, %0\n" " andl $3, %%eax\n" " cld\n" - "6: rep; movsl\n" + "6: rep; "__copyuser_seg" movsl\n" " movl %%eax,%0\n" - "7: rep; movsb\n" + "7: rep; "__copyuser_seg" movsb\n" "8:\n" ".section .fixup,\"ax\"\n" "9: lea 0(%%eax,%0,4),%0\n" @@ -440,41 +553,41 @@ __asm__ __volatile__( " .align 2,0x90\n" - "0: movl 32(%4), %%eax\n" + "0: "__copyuser_seg" movl 32(%4), %%eax\n" " cmpl $67, %0\n" " jbe 2f\n" - "1: movl 64(%4), %%eax\n" + "1: "__copyuser_seg" movl 64(%4), %%eax\n" " .align 2,0x90\n" - "2: movl 0(%4), %%eax\n" - "21: movl 4(%4), %%edx\n" + "2: "__copyuser_seg" movl 0(%4), %%eax\n" + "21: "__copyuser_seg" movl 4(%4), %%edx\n" " movnti %%eax, 0(%3)\n" " movnti %%edx, 4(%3)\n" - "3: movl 8(%4), %%eax\n" - "31: movl 12(%4),%%edx\n" + "3: "__copyuser_seg" movl 8(%4), %%eax\n" + "31: "__copyuser_seg" movl 12(%4),%%edx\n" " movnti %%eax, 8(%3)\n" " movnti %%edx, 12(%3)\n" - "4: movl 16(%4), %%eax\n" - "41: movl 20(%4), %%edx\n" + "4: "__copyuser_seg" movl 16(%4), %%eax\n" + "41: "__copyuser_seg" movl 20(%4), %%edx\n" " movnti %%eax, 16(%3)\n" " movnti %%edx, 20(%3)\n" - "10: movl 24(%4), %%eax\n" - "51: movl 28(%4), %%edx\n" + "10: "__copyuser_seg" movl 24(%4), %%eax\n" + "51: "__copyuser_seg" movl 28(%4), %%edx\n" " movnti %%eax, 24(%3)\n" " movnti %%edx, 28(%3)\n" - "11: movl 32(%4), %%eax\n" - "61: movl 36(%4), %%edx\n" + "11: "__copyuser_seg" movl 32(%4), %%eax\n" + "61: "__copyuser_seg" movl 36(%4), %%edx\n" " movnti %%eax, 32(%3)\n" " movnti %%edx, 36(%3)\n" - "12: movl 40(%4), %%eax\n" - "71: movl 44(%4), %%edx\n" + "12: "__copyuser_seg" movl 40(%4), %%eax\n" + "71: "__copyuser_seg" movl 44(%4), %%edx\n" " movnti %%eax, 40(%3)\n" " movnti %%edx, 44(%3)\n" - "13: movl 48(%4), %%eax\n" - "81: movl 52(%4), %%edx\n" + "13: "__copyuser_seg" movl 48(%4), %%eax\n" + "81: "__copyuser_seg" movl 52(%4), %%edx\n" " movnti %%eax, 48(%3)\n" " movnti %%edx, 52(%3)\n" - "14: movl 56(%4), %%eax\n" - "91: movl 60(%4), %%edx\n" + "14: "__copyuser_seg" movl 56(%4), %%eax\n" + "91: "__copyuser_seg" movl 60(%4), %%edx\n" " movnti %%eax, 56(%3)\n" " movnti %%edx, 60(%3)\n" " addl $-64, %0\n" @@ -487,9 +600,9 @@ " shrl $2, %0\n" " andl $3, %%eax\n" " cld\n" - "6: rep; movsl\n" + "6: rep; "__copyuser_seg" movsl\n" " movl %%eax,%0\n" - "7: rep; movsb\n" + "7: rep; "__copyuser_seg" movsb\n" "8:\n" ".section .fixup,\"ax\"\n" "9: lea 0(%%eax,%0,4),%0\n" @@ -537,41 +650,41 @@ __asm__ __volatile__( " .align 2,0x90\n" - "0: movl 32(%4), %%eax\n" + "0: "__copyuser_seg" movl 32(%4), %%eax\n" " cmpl $67, %0\n" " jbe 2f\n" - "1: movl 64(%4), %%eax\n" + "1: "__copyuser_seg" movl 64(%4), %%eax\n" " .align 2,0x90\n" - "2: movl 0(%4), %%eax\n" - "21: movl 4(%4), %%edx\n" + "2: "__copyuser_seg" movl 0(%4), %%eax\n" + "21: "__copyuser_seg" movl 4(%4), %%edx\n" " movnti %%eax, 0(%3)\n" " movnti %%edx, 4(%3)\n" - "3: movl 8(%4), %%eax\n" - "31: movl 12(%4),%%edx\n" + "3: "__copyuser_seg" movl 8(%4), %%eax\n" + "31: "__copyuser_seg" movl 12(%4),%%edx\n" " movnti %%eax, 8(%3)\n" " movnti %%edx, 12(%3)\n" - "4: movl 16(%4), %%eax\n" - "41: movl 20(%4), %%edx\n" + "4: "__copyuser_seg" movl 16(%4), %%eax\n" + "41: "__copyuser_seg" movl 20(%4), %%edx\n" " movnti %%eax, 16(%3)\n" " movnti %%edx, 20(%3)\n" - "10: movl 24(%4), %%eax\n" - "51: movl 28(%4), %%edx\n" + "10: "__copyuser_seg" movl 24(%4), %%eax\n" + "51: "__copyuser_seg" movl 28(%4), %%edx\n" " movnti %%eax, 24(%3)\n" " movnti %%edx, 28(%3)\n" - "11: movl 32(%4), %%eax\n" - "61: movl 36(%4), %%edx\n" + "11: "__copyuser_seg" movl 32(%4), %%eax\n" + "61: "__copyuser_seg" movl 36(%4), %%edx\n" " movnti %%eax, 32(%3)\n" " movnti %%edx, 36(%3)\n" - "12: movl 40(%4), %%eax\n" - "71: movl 44(%4), %%edx\n" + "12: "__copyuser_seg" movl 40(%4), %%eax\n" + "71: "__copyuser_seg" movl 44(%4), %%edx\n" " movnti %%eax, 40(%3)\n" " movnti %%edx, 44(%3)\n" - "13: movl 48(%4), %%eax\n" - "81: movl 52(%4), %%edx\n" + "13: "__copyuser_seg" movl 48(%4), %%eax\n" + "81: "__copyuser_seg" movl 52(%4), %%edx\n" " movnti %%eax, 48(%3)\n" " movnti %%edx, 52(%3)\n" - "14: movl 56(%4), %%eax\n" - "91: movl 60(%4), %%edx\n" + "14: "__copyuser_seg" movl 56(%4), %%eax\n" + "91: "__copyuser_seg" movl 60(%4), %%edx\n" " movnti %%eax, 56(%3)\n" " movnti %%edx, 60(%3)\n" " addl $-64, %0\n" @@ -584,9 +697,9 @@ " shrl $2, %0\n" " andl $3, %%eax\n" " cld\n" - "6: rep; movsl\n" + "6: rep; "__copyuser_seg" movsl\n" " movl %%eax,%0\n" - "7: rep; movsb\n" + "7: rep; "__copyuser_seg" movsb\n" "8:\n" ".section .fixup,\"ax\"\n" "9: lea 0(%%eax,%0,4),%0\n" @@ -629,32 +742,36 @@ */ unsigned long __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size); -unsigned long __copy_user_intel(void __user *to, const void *from, +unsigned long __generic_copy_to_user_intel(void __user *to, const void *from, + unsigned long size); +unsigned long __generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size); unsigned long __copy_user_zeroing_intel_nocache(void *to, const void __user *from, unsigned long size); #endif /* CONFIG_X86_INTEL_USERCOPY */ /* Generic arbitrary sized copy. */ -#define __copy_user(to, from, size) \ +#define __copy_user(to, from, size, prefix, set, restore) \ do { \ int __d0, __d1, __d2; \ __asm__ __volatile__( \ + set \ " cmp $7,%0\n" \ " jbe 1f\n" \ " movl %1,%0\n" \ " negl %0\n" \ " andl $7,%0\n" \ " subl %0,%3\n" \ - "4: rep; movsb\n" \ + "4: rep; "prefix"movsb\n" \ " movl %3,%0\n" \ " shrl $2,%0\n" \ " andl $3,%3\n" \ " .align 2,0x90\n" \ - "0: rep; movsl\n" \ + "0: rep; "prefix"movsl\n" \ " movl %3,%0\n" \ - "1: rep; movsb\n" \ + "1: rep; "prefix"movsb\n" \ "2:\n" \ + restore \ ".section .fixup,\"ax\"\n" \ "5: addl %3,%0\n" \ " jmp 2b\n" \ @@ -682,14 +799,14 @@ " negl %0\n" \ " andl $7,%0\n" \ " subl %0,%3\n" \ - "4: rep; movsb\n" \ + "4: rep; "__copyuser_seg"movsb\n" \ " movl %3,%0\n" \ " shrl $2,%0\n" \ " andl $3,%3\n" \ " .align 2,0x90\n" \ - "0: rep; movsl\n" \ + "0: rep; "__copyuser_seg"movsl\n" \ " movl %3,%0\n" \ - "1: rep; movsb\n" \ + "1: rep; "__copyuser_seg"movsb\n" \ "2:\n" \ ".section .fixup,\"ax\"\n" \ "5: addl %3,%0\n" \ @@ -775,9 +892,9 @@ } #endif if (movsl_is_ok(to, from, n)) - __copy_user(to, from, n); + __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES); else - n = __copy_user_intel(to, from, n); + n = __generic_copy_to_user_intel(to, from, n); return n; } EXPORT_SYMBOL(__copy_to_user_ll); @@ -797,10 +914,9 @@ unsigned long n) { if (movsl_is_ok(to, from, n)) - __copy_user(to, from, n); + __copy_user(to, from, n, __copyuser_seg, "", ""); else - n = __copy_user_intel((void __user *)to, - (const void *)from, n); + n = __generic_copy_from_user_intel(to, from, n); return n; } EXPORT_SYMBOL(__copy_from_user_ll_nozero); @@ -827,65 +943,50 @@ if (n > 64 && cpu_has_xmm2) n = __copy_user_intel_nocache(to, from, n); else - __copy_user(to, from, n); + __copy_user(to, from, n, __copyuser_seg, "", ""); #else - __copy_user(to, from, n); + __copy_user(to, from, n, __copyuser_seg, "", ""); #endif return n; } EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero); -/** - * copy_to_user: - Copy a block of data into user space. - * @to: Destination address, in user space. - * @from: Source address, in kernel space. - * @n: Number of bytes to copy. - * - * Context: User context only. This function may sleep. - * - * Copy data from kernel space to user space. - * - * Returns number of bytes that could not be copied. - * On success, this will be zero. - */ -unsigned long -copy_to_user(void __user *to, const void *from, unsigned long n) +void copy_from_user_overflow(void) { - if (access_ok(VERIFY_WRITE, to, n)) - n = __copy_to_user(to, from, n); - return n; + WARN(1, "Buffer overflow detected!\n"); } -EXPORT_SYMBOL(copy_to_user); +EXPORT_SYMBOL(copy_from_user_overflow); -/** - * copy_from_user: - Copy a block of data from user space. - * @to: Destination address, in kernel space. - * @from: Source address, in user space. - * @n: Number of bytes to copy. - * - * Context: User context only. This function may sleep. - * - * Copy data from user space to kernel space. - * - * Returns number of bytes that could not be copied. - * On success, this will be zero. - * - * If some data could not be copied, this function will pad the copied - * data to the requested size using zero bytes. - */ -unsigned long -_copy_from_user(void *to, const void __user *from, unsigned long n) +void copy_to_user_overflow(void) { - if (access_ok(VERIFY_READ, from, n)) - n = __copy_from_user(to, from, n); - else - memset(to, 0, n); - return n; + WARN(1, "Buffer overflow detected!\n"); } -EXPORT_SYMBOL(_copy_from_user); +EXPORT_SYMBOL(copy_to_user_overflow); -void copy_from_user_overflow(void) +#ifdef CONFIG_PAX_MEMORY_UDEREF +void __set_fs(mm_segment_t x) { - WARN(1, "Buffer overflow detected!\n"); + switch (x.seg) { + case 0: + loadsegment(gs, 0); + break; + case TASK_SIZE_MAX: + loadsegment(gs, __USER_DS); + break; + case -1UL: + loadsegment(gs, __KERNEL_DS); + break; + default: + BUG(); + } + return; } -EXPORT_SYMBOL(copy_from_user_overflow); +EXPORT_SYMBOL(__set_fs); + +void set_fs(mm_segment_t x) +{ + current_thread_info()->addr_limit = x; + __set_fs(x); +} +EXPORT_SYMBOL(set_fs); +#endif diff -uriN linux-2.6.38.4/arch/x86/lib/usercopy_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/usercopy_64.c --- linux-2.6.38.4/arch/x86/lib/usercopy_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/lib/usercopy_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -42,6 +42,8 @@ __strncpy_from_user(char *dst, const char __user *src, long count) { long res; + if ((unsigned long)src < PAX_USER_SHADOW_BASE) + src += PAX_USER_SHADOW_BASE; __do_strncpy_from_user(dst, src, count, res); return res; } @@ -65,6 +67,8 @@ { long __d0; might_fault(); + if ((unsigned long)addr < PAX_USER_SHADOW_BASE) + addr += PAX_USER_SHADOW_BASE; /* no memory constraint because it doesn't change any memory gcc knows about */ asm volatile( @@ -151,10 +155,14 @@ unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len) { - if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) { + if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) { + if ((unsigned long)to < PAX_USER_SHADOW_BASE) + to += PAX_USER_SHADOW_BASE; + if ((unsigned long)from < PAX_USER_SHADOW_BASE) + from += PAX_USER_SHADOW_BASE; return copy_user_generic((__force void *)to, (__force void *)from, len); - } - return len; + } + return len; } EXPORT_SYMBOL(copy_in_user); diff -uriN linux-2.6.38.4/arch/x86/Makefile linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/Makefile --- linux-2.6.38.4/arch/x86/Makefile 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/Makefile 2011-05-01 17:02:10.000000000 -0500 @@ -195,3 +195,12 @@ echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' endef + +define OLD_LD + +*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils. +*** Please upgrade your binutils to 2.18 or newer +endef + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) diff -uriN linux-2.6.38.4/arch/x86/mm/extable.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/extable.c --- linux-2.6.38.4/arch/x86/mm/extable.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/extable.c 2011-05-01 17:02:10.000000000 -0500 @@ -1,14 +1,71 @@ #include #include +#include #include +#include +/* + * The exception table needs to be sorted so that the binary + * search that we use to find entries in it works properly. + * This is used both for the kernel exception table and for + * the exception tables of modules that get loaded. + */ +static int cmp_ex(const void *a, const void *b) +{ + const struct exception_table_entry *x = a, *y = b; + + /* avoid overflow */ + if (x->insn > y->insn) + return 1; + if (x->insn < y->insn) + return -1; + return 0; +} + +static void swap_ex(void *a, void *b, int size) +{ + struct exception_table_entry t, *x = a, *y = b; + + t = *x; + + pax_open_kernel(); + *x = *y; + *y = t; + pax_close_kernel(); +} + +void sort_extable(struct exception_table_entry *start, + struct exception_table_entry *finish) +{ + sort(start, finish - start, sizeof(struct exception_table_entry), + cmp_ex, swap_ex); +} + +#ifdef CONFIG_MODULES +/* + * If the exception table is sorted, any referring to the module init + * will be at the beginning or the end. + */ +void trim_init_extable(struct module *m) +{ + /*trim the beginning*/ + while (m->num_exentries && within_module_init(m->extable[0].insn, m)) { + m->extable++; + m->num_exentries--; + } + /*trim the end*/ + while (m->num_exentries && + within_module_init(m->extable[m->num_exentries-1].insn, m)) + m->num_exentries--; +} +#endif /* CONFIG_MODULES */ int fixup_exception(struct pt_regs *regs) { const struct exception_table_entry *fixup; #ifdef CONFIG_PNPBIOS - if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) { + if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) { extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap = 1; diff -uriN linux-2.6.38.4/arch/x86/mm/fault.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/fault.c --- linux-2.6.38.4/arch/x86/mm/fault.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/fault.c 2011-05-01 17:02:10.000000000 -0500 @@ -12,10 +12,18 @@ #include /* kmmio_handler, ... */ #include /* perf_sw_event */ #include /* hstate_index_to_shift */ +#include +#include #include /* dotraplinkage, ... */ #include /* pgd_*(), ... */ #include /* kmemcheck_*(), ... */ +#include +#include + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) +#include +#endif /* * Page fault error code bits: @@ -53,7 +61,7 @@ int ret = 0; /* kprobe_running() needs smp_processor_id() */ - if (kprobes_built_in() && !user_mode_vm(regs)) { + if (kprobes_built_in() && !user_mode(regs)) { preempt_disable(); if (kprobe_running() && kprobe_fault_handler(regs, 14)) ret = 1; @@ -114,7 +122,10 @@ return !instr_lo || (instr_lo>>1) == 1; case 0x00: /* Prefetch instruction is 0x0F0D or 0x0F18 */ - if (probe_kernel_address(instr, opcode)) + if (user_mode(regs)) { + if (__copy_from_user_inatomic(&opcode, (__force unsigned char __user *)(instr), 1)) + return 0; + } else if (probe_kernel_address(instr, opcode)) return 0; *prefetch = (instr_lo == 0xF) && @@ -148,7 +159,10 @@ while (instr < max_instr) { unsigned char opcode; - if (probe_kernel_address(instr, opcode)) + if (user_mode(regs)) { + if (__copy_from_user_inatomic(&opcode, (__force unsigned char __user *)(instr), 1)) + break; + } else if (probe_kernel_address(instr, opcode)) break; instr++; @@ -179,6 +193,30 @@ force_sig_info(si_signo, &info, tsk); } +#ifdef CONFIG_PAX_EMUTRAMP +static int pax_handle_fetch_fault(struct pt_regs *regs); +#endif + +#ifdef CONFIG_PAX_PAGEEXEC +static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address) +{ + pgd_t *pgd; + pud_t *pud; + pmd_t *pmd; + + pgd = pgd_offset(mm, address); + if (!pgd_present(*pgd)) + return NULL; + pud = pud_offset(pgd, address); + if (!pud_present(*pud)) + return NULL; + pmd = pmd_offset(pud, address); + if (!pmd_present(*pmd)) + return NULL; + return pmd; +} +#endif + DEFINE_SPINLOCK(pgd_lock); LIST_HEAD(pgd_list); @@ -229,10 +267,22 @@ for (address = VMALLOC_START & PMD_MASK; address >= TASK_SIZE && address < FIXADDR_TOP; address += PMD_SIZE) { + +#ifdef CONFIG_PAX_PER_CPU_PGD + unsigned long cpu; +#else struct page *page; +#endif spin_lock(&pgd_lock); + +#ifdef CONFIG_PAX_PER_CPU_PGD + for (cpu = 0; cpu < NR_CPUS; ++cpu) { + pgd_t *pgd = get_cpu_pgd(cpu); + pmd_t *ret; +#else list_for_each_entry(page, &pgd_list, lru) { + pgd_t *pgd = page_address(page); spinlock_t *pgt_lock; pmd_t *ret; @@ -240,8 +290,13 @@ pgt_lock = &pgd_page_get_mm(page)->page_table_lock; spin_lock(pgt_lock); - ret = vmalloc_sync_one(page_address(page), address); +#endif + + ret = vmalloc_sync_one(pgd, address); + +#ifndef CONFIG_PAX_PER_CPU_PGD spin_unlock(pgt_lock); +#endif if (!ret) break; @@ -275,6 +330,11 @@ * an interrupt in the middle of a task switch.. */ pgd_paddr = read_cr3(); + +#ifdef CONFIG_PAX_PER_CPU_PGD + BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK)); +#endif + pmd_k = vmalloc_sync_one(__va(pgd_paddr), address); if (!pmd_k) return -1; @@ -370,7 +430,14 @@ * happen within a race in page table update. In the later * case just flush: */ + +#ifdef CONFIG_PAX_PER_CPU_PGD + BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK)); + pgd = pgd_offset_cpu(smp_processor_id(), address); +#else pgd = pgd_offset(current->active_mm, address); +#endif + pgd_ref = pgd_offset_k(address); if (pgd_none(*pgd_ref)) return -1; @@ -532,7 +599,7 @@ static int is_errata100(struct pt_regs *regs, unsigned long address) { #ifdef CONFIG_X86_64 - if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32)) + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32)) return 1; #endif return 0; @@ -559,7 +626,7 @@ } static const char nx_warning[] = KERN_CRIT -"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n"; +"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n"; static void show_fault_oops(struct pt_regs *regs, unsigned long error_code, @@ -568,15 +635,26 @@ if (!oops_may_print()) return; - if (error_code & PF_INSTR) { + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) { unsigned int level; pte_t *pte = lookup_address(address, &level); if (pte && pte_present(*pte) && !pte_exec(*pte)) - printk(nx_warning, current_uid()); + printk(nx_warning, current_uid(), current->comm, task_pid_nr(current)); } +#ifdef CONFIG_PAX_KERNEXEC + if (init_mm.start_code <= address && address < init_mm.end_code) { + if (current->signal->curr_ip) + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", + ¤t->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid()); + else + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", + current->comm, task_pid_nr(current), current_uid(), current_euid()); + } +#endif + printk(KERN_ALERT "BUG: unable to handle kernel "); if (address < PAGE_SIZE) printk(KERN_CONT "NULL pointer dereference"); @@ -701,6 +779,68 @@ unsigned long address, int si_code) { struct task_struct *tsk = current; + struct mm_struct *mm = tsk->mm; + +#ifdef CONFIG_X86_64 + if (mm && (error_code & PF_INSTR) && mm->context.vdso) { + if (regs->ip == (unsigned long)vgettimeofday) { + regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_gettimeofday); + return; + } else if (regs->ip == (unsigned long)vtime) { + regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_time); + return; + } else if (regs->ip == (unsigned long)vgetcpu) { + regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, getcpu); + return; + } + } +#endif + +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) + if (mm && (error_code & PF_USER)) { + unsigned long ip = regs->ip; + + if (v8086_mode(regs)) + ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff); + + /* + * It's possible to have interrupts off here: + */ + local_irq_enable(); + +#ifdef CONFIG_PAX_PAGEEXEC + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && + (((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) || (!(error_code & (PF_PROT | PF_WRITE)) && ip == address))) { + +#ifdef CONFIG_PAX_EMUTRAMP + switch (pax_handle_fetch_fault(regs)) { + case 2: + return; + } +#endif + + pax_report_fault(regs, (void *)ip, (void *)regs->sp); + do_group_exit(SIGKILL); + } +#endif + +#ifdef CONFIG_PAX_SEGMEXEC + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && !(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address)) { + +#ifdef CONFIG_PAX_EMUTRAMP + switch (pax_handle_fetch_fault(regs)) { + case 2: + return; + } +#endif + + pax_report_fault(regs, (void *)ip, (void *)regs->sp); + do_group_exit(SIGKILL); + } +#endif + + } +#endif /* User mode accesses just cause a SIGSEGV */ if (error_code & PF_USER) { @@ -855,6 +995,99 @@ return 1; } +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) +static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code) +{ + pte_t *pte; + pmd_t *pmd; + spinlock_t *ptl; + unsigned char pte_mask; + + if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) || + !(mm->pax_flags & MF_PAX_PAGEEXEC)) + return 0; + + /* PaX: it's our fault, let's handle it if we can */ + + /* PaX: take a look at read faults before acquiring any locks */ + if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) { + /* instruction fetch attempt from a protected page in user mode */ + up_read(&mm->mmap_sem); + +#ifdef CONFIG_PAX_EMUTRAMP + switch (pax_handle_fetch_fault(regs)) { + case 2: + return 1; + } +#endif + + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp); + do_group_exit(SIGKILL); + } + + pmd = pax_get_pmd(mm, address); + if (unlikely(!pmd)) + return 0; + + pte = pte_offset_map_lock(mm, pmd, address, &ptl); + if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) { + pte_unmap_unlock(pte, ptl); + return 0; + } + + if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) { + /* write attempt to a protected page in user mode */ + pte_unmap_unlock(pte, ptl); + return 0; + } + +#ifdef CONFIG_SMP + if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask))) +#else + if (likely(address > get_limit(regs->cs))) +#endif + { + set_pte(pte, pte_mkread(*pte)); + __flush_tlb_one(address); + pte_unmap_unlock(pte, ptl); + up_read(&mm->mmap_sem); + return 1; + } + + pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1)); + + /* + * PaX: fill DTLB with user rights and retry + */ + __asm__ __volatile__ ( + "orb %2,(%1)\n" +#if defined(CONFIG_M586) || defined(CONFIG_M586TSC) +/* + * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's + * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any* + * page fault when examined during a TLB load attempt. this is true not only + * for PTEs holding a non-present entry but also present entries that will + * raise a page fault (such as those set up by PaX, or the copy-on-write + * mechanism). in effect it means that we do *not* need to flush the TLBs + * for our target pages since their PTEs are simply not in the TLBs at all. + + * the best thing in omitting it is that we gain around 15-20% speed in the + * fast path of the page fault handler and can get rid of tracing since we + * can no longer flush unintended entries. + */ + "invlpg (%0)\n" +#endif + __copyuser_seg"testb $0,(%0)\n" + "xorb %3,(%1)\n" + : + : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER) + : "memory", "cc"); + pte_unmap_unlock(pte, ptl); + up_read(&mm->mmap_sem); + return 1; +} +#endif + /* * Handle a spurious fault caused by a stale TLB entry. * @@ -927,6 +1160,9 @@ static inline int access_error(unsigned long error_code, struct vm_area_struct *vma) { + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC)) + return 1; + if (error_code & PF_WRITE) { /* write, present and write, not present: */ if (unlikely(!(vma->vm_flags & VM_WRITE))) @@ -960,19 +1196,33 @@ { struct vm_area_struct *vma; struct task_struct *tsk; - unsigned long address; struct mm_struct *mm; int fault; int write = error_code & PF_WRITE; unsigned int flags = FAULT_FLAG_ALLOW_RETRY | (write ? FAULT_FLAG_WRITE : 0); + /* Get the faulting address: */ + unsigned long address = read_cr2(); + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) { + if (!search_exception_tables(regs->ip)) { + bad_area_nosemaphore(regs, error_code, address); + return; + } + if (address < PAX_USER_SHADOW_BASE) { + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n"); + printk(KERN_ERR "PAX: faulting IP: %pA\n", (void *)regs->ip); + show_trace_log_lvl(NULL, NULL, (void *)regs->sp, KERN_ERR); + } else + address -= PAX_USER_SHADOW_BASE; + } +#endif + tsk = current; mm = tsk->mm; - /* Get the faulting address: */ - address = read_cr2(); - /* * Detect and handle instructions that would cause a page fault for * both a tracked kernel page and a userspace page. @@ -1032,7 +1282,7 @@ * User-mode registers count as a user access even for any * potential system fault or CPU buglet: */ - if (user_mode_vm(regs)) { + if (user_mode(regs)) { local_irq_enable(); error_code |= PF_USER; } else { @@ -1087,6 +1337,11 @@ might_sleep(); } +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) + if (pax_handle_pageexec_fault(regs, mm, address, error_code)) + return; +#endif + vma = find_vma(mm, address); if (unlikely(!vma)) { bad_area(regs, error_code, address); @@ -1098,18 +1353,24 @@ bad_area(regs, error_code, address); return; } - if (error_code & PF_USER) { - /* - * Accessing the stack below %sp is always a bug. - * The large cushion allows instructions like enter - * and pusha to work. ("enter $65535, $31" pushes - * 32 pointers and then decrements %sp by 65535.) - */ - if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) { - bad_area(regs, error_code, address); - return; - } + /* + * Accessing the stack below %sp is always a bug. + * The large cushion allows instructions like enter + * and pusha to work. ("enter $65535, $31" pushes + * 32 pointers and then decrements %sp by 65535.) + */ + if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) { + bad_area(regs, error_code, address); + return; } + +#ifdef CONFIG_PAX_SEGMEXEC + if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) { + bad_area(regs, error_code, address); + return; + } +#endif + if (unlikely(expand_stack(vma, address))) { bad_area(regs, error_code, address); return; @@ -1164,3 +1425,199 @@ up_read(&mm->mmap_sem); } + +#ifdef CONFIG_PAX_EMUTRAMP +static int pax_handle_fetch_fault_32(struct pt_regs *regs) +{ + int err; + + do { /* PaX: gcc trampoline emulation #1 */ + unsigned char mov1, mov2; + unsigned short jmp; + unsigned int addr1, addr2; + +#ifdef CONFIG_X86_64 + if ((regs->ip + 11) >> 32) + break; +#endif + + err = get_user(mov1, (unsigned char __user *)regs->ip); + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1)); + err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5)); + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6)); + err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10)); + + if (err) + break; + + if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) { + regs->cx = addr1; + regs->ax = addr2; + regs->ip = addr2; + return 2; + } + } while (0); + + do { /* PaX: gcc trampoline emulation #2 */ + unsigned char mov, jmp; + unsigned int addr1, addr2; + +#ifdef CONFIG_X86_64 + if ((regs->ip + 9) >> 32) + break; +#endif + + err = get_user(mov, (unsigned char __user *)regs->ip); + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1)); + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5)); + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6)); + + if (err) + break; + + if (mov == 0xB9 && jmp == 0xE9) { + regs->cx = addr1; + regs->ip = (unsigned int)(regs->ip + addr2 + 10); + return 2; + } + } while (0); + + return 1; /* PaX in action */ +} + +#ifdef CONFIG_X86_64 +static int pax_handle_fetch_fault_64(struct pt_regs *regs) +{ + int err; + + do { /* PaX: gcc trampoline emulation #1 */ + unsigned short mov1, mov2, jmp1; + unsigned char jmp2; + unsigned int addr1; + unsigned long addr2; + + err = get_user(mov1, (unsigned short __user *)regs->ip); + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2)); + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6)); + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8)); + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16)); + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18)); + + if (err) + break; + + if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) { + regs->r11 = addr1; + regs->r10 = addr2; + regs->ip = addr1; + return 2; + } + } while (0); + + do { /* PaX: gcc trampoline emulation #2 */ + unsigned short mov1, mov2, jmp1; + unsigned char jmp2; + unsigned long addr1, addr2; + + err = get_user(mov1, (unsigned short __user *)regs->ip); + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2)); + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10)); + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12)); + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20)); + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22)); + + if (err) + break; + + if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) { + regs->r11 = addr1; + regs->r10 = addr2; + regs->ip = addr1; + return 2; + } + } while (0); + + return 1; /* PaX in action */ +} +#endif + +/* + * PaX: decide what to do with offenders (regs->ip = fault address) + * + * returns 1 when task should be killed + * 2 when gcc trampoline was detected + */ +static int pax_handle_fetch_fault(struct pt_regs *regs) +{ + if (v8086_mode(regs)) + return 1; + + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP)) + return 1; + +#ifdef CONFIG_X86_32 + return pax_handle_fetch_fault_32(regs); +#else + if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) + return pax_handle_fetch_fault_32(regs); + else + return pax_handle_fetch_fault_64(regs); +#endif +} +#endif + +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) +void pax_report_insns(void *pc, void *sp) +{ + long i; + + printk(KERN_ERR "PAX: bytes at PC: "); + for (i = 0; i < 20; i++) { + unsigned char c; + if (get_user(c, (__force unsigned char __user *)pc+i)) + printk(KERN_CONT "?? "); + else + printk(KERN_CONT "%02x ", c); + } + printk("\n"); + + printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long)); + for (i = -1; i < 80 / (long)sizeof(long); i++) { + unsigned long c; + if (get_user(c, (__force unsigned long __user *)sp+i)) +#ifdef CONFIG_X86_32 + printk(KERN_CONT "???????? "); +#else + printk(KERN_CONT "???????????????? "); +#endif + else + printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c); + } + printk("\n"); +} +#endif + +/** + * probe_kernel_write(): safely attempt to write to a location + * @dst: address to write to + * @src: pointer to the data that shall be written + * @size: size of the data chunk + * + * Safely write to address @dst from the buffer at @src. If a kernel fault + * happens, handle that and return -EFAULT. + */ +long notrace probe_kernel_write(void *dst, const void *src, size_t size) +{ + long ret; + mm_segment_t old_fs = get_fs(); + + set_fs(KERNEL_DS); + pagefault_disable(); + pax_open_kernel(); + ret = __copy_to_user_inatomic((__force void __user *)dst, src, size); + pax_close_kernel(); + pagefault_enable(); + set_fs(old_fs); + + return ret ? -EFAULT : 0; +} diff -uriN linux-2.6.38.4/arch/x86/mm/gup.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/gup.c --- linux-2.6.38.4/arch/x86/mm/gup.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/gup.c 2011-05-01 17:02:10.000000000 -0500 @@ -263,7 +263,7 @@ addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; end = start + len; - if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ, + if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ, (void __user *)start, len))) return 0; diff -uriN linux-2.6.38.4/arch/x86/mm/highmem_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/highmem_32.c --- linux-2.6.38.4/arch/x86/mm/highmem_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/highmem_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -44,7 +44,10 @@ idx = type + KM_TYPE_NR*smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); BUG_ON(!pte_none(*(kmap_pte-idx))); + + pax_open_kernel(); set_pte(kmap_pte-idx, mk_pte(page, prot)); + pax_close_kernel(); return (void *)vaddr; } diff -uriN linux-2.6.38.4/arch/x86/mm/hugetlbpage.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/hugetlbpage.c --- linux-2.6.38.4/arch/x86/mm/hugetlbpage.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/hugetlbpage.c 2011-05-01 17:02:10.000000000 -0500 @@ -266,13 +266,20 @@ struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; struct vm_area_struct *vma; - unsigned long start_addr; + unsigned long start_addr, pax_task_size = TASK_SIZE; + +#ifdef CONFIG_PAX_SEGMEXEC + if (mm->pax_flags & MF_PAX_SEGMEXEC) + pax_task_size = SEGMEXEC_TASK_SIZE; +#endif + + pax_task_size -= PAGE_SIZE; if (len > mm->cached_hole_size) { - start_addr = mm->free_area_cache; + start_addr = mm->free_area_cache; } else { - start_addr = TASK_UNMAPPED_BASE; - mm->cached_hole_size = 0; + start_addr = mm->mmap_base; + mm->cached_hole_size = 0; } full_search: @@ -280,26 +287,27 @@ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) { /* At this point: (!vma || addr < vma->vm_end). */ - if (TASK_SIZE - len < addr) { + if (pax_task_size - len < addr) { /* * Start a new search - just in case we missed * some holes. */ - if (start_addr != TASK_UNMAPPED_BASE) { - start_addr = TASK_UNMAPPED_BASE; + if (start_addr != mm->mmap_base) { + start_addr = mm->mmap_base; mm->cached_hole_size = 0; goto full_search; } return -ENOMEM; } - if (!vma || addr + len <= vma->vm_start) { - mm->free_area_cache = addr + len; - return addr; - } + if (check_heap_stack_gap(vma, addr, len)) + break; if (addr + mm->cached_hole_size < vma->vm_start) mm->cached_hole_size = vma->vm_start - addr; addr = ALIGN(vma->vm_end, huge_page_size(h)); } + + mm->free_area_cache = addr + len; + return addr; } static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, @@ -308,10 +316,9 @@ { struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; - struct vm_area_struct *vma, *prev_vma; - unsigned long base = mm->mmap_base, addr = addr0; + struct vm_area_struct *vma; + unsigned long base = mm->mmap_base, addr; unsigned long largest_hole = mm->cached_hole_size; - int first_time = 1; /* don't allow allocations above current base */ if (mm->free_area_cache > base) @@ -321,64 +328,63 @@ largest_hole = 0; mm->free_area_cache = base; } -try_again: + /* make sure it can fit in the remaining address space */ if (mm->free_area_cache < len) goto fail; /* either no address requested or cant fit in requested address hole */ - addr = (mm->free_area_cache - len) & huge_page_mask(h); + addr = (mm->free_area_cache - len); do { + addr &= huge_page_mask(h); + vma = find_vma(mm, addr); /* * Lookup failure means no vma is above this address, * i.e. return with success: - */ - if (!(vma = find_vma_prev(mm, addr, &prev_vma))) - return addr; - - /* * new region fits between prev_vma->vm_end and * vma->vm_start, use it: */ - if (addr + len <= vma->vm_start && - (!prev_vma || (addr >= prev_vma->vm_end))) { + if (check_heap_stack_gap(vma, addr, len)) { /* remember the address as a hint for next time */ - mm->cached_hole_size = largest_hole; - return (mm->free_area_cache = addr); - } else { - /* pull free_area_cache down to the first hole */ - if (mm->free_area_cache == vma->vm_end) { - mm->free_area_cache = vma->vm_start; - mm->cached_hole_size = largest_hole; - } + mm->cached_hole_size = largest_hole; + return (mm->free_area_cache = addr); + } + /* pull free_area_cache down to the first hole */ + if (mm->free_area_cache == vma->vm_end) { + mm->free_area_cache = vma->vm_start; + mm->cached_hole_size = largest_hole; } /* remember the largest hole we saw so far */ if (addr + largest_hole < vma->vm_start) - largest_hole = vma->vm_start - addr; + largest_hole = vma->vm_start - addr; /* try just below the current vma->vm_start */ - addr = (vma->vm_start - len) & huge_page_mask(h); - } while (len <= vma->vm_start); + addr = skip_heap_stack_gap(vma, len); + } while (!IS_ERR_VALUE(addr)); fail: /* - * if hint left us with no space for the requested - * mapping then try again: - */ - if (first_time) { - mm->free_area_cache = base; - largest_hole = 0; - first_time = 0; - goto try_again; - } - /* * A failed mmap() very likely causes application failure, * so fall back to the bottom-up function here. This scenario * can happen with large stack limits and large mmap() * allocations. */ - mm->free_area_cache = TASK_UNMAPPED_BASE; + +#ifdef CONFIG_PAX_SEGMEXEC + if (mm->pax_flags & MF_PAX_SEGMEXEC) + mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE; + else +#endif + + mm->mmap_base = TASK_UNMAPPED_BASE; + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base += mm->delta_mmap; +#endif + + mm->free_area_cache = mm->mmap_base; mm->cached_hole_size = ~0UL; addr = hugetlb_get_unmapped_area_bottomup(file, addr0, len, pgoff, flags); @@ -386,6 +392,7 @@ /* * Restore the topdown base: */ + mm->mmap_base = base; mm->free_area_cache = base; mm->cached_hole_size = ~0UL; @@ -399,10 +406,19 @@ struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; struct vm_area_struct *vma; + unsigned long pax_task_size = TASK_SIZE; if (len & ~huge_page_mask(h)) return -EINVAL; - if (len > TASK_SIZE) + +#ifdef CONFIG_PAX_SEGMEXEC + if (mm->pax_flags & MF_PAX_SEGMEXEC) + pax_task_size = SEGMEXEC_TASK_SIZE; +#endif + + pax_task_size -= PAGE_SIZE; + + if (len > pax_task_size) return -ENOMEM; if (flags & MAP_FIXED) { @@ -414,8 +430,7 @@ if (addr) { addr = ALIGN(addr, huge_page_size(h)); vma = find_vma(mm, addr); - if (TASK_SIZE - len >= addr && - (!vma || addr + len <= vma->vm_start)) + if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len)) return addr; } if (mm->get_unmapped_area == arch_get_unmapped_area) diff -uriN linux-2.6.38.4/arch/x86/mm/init_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/init_32.c --- linux-2.6.38.4/arch/x86/mm/init_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/init_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -74,36 +74,6 @@ } /* - * Creates a middle page table and puts a pointer to it in the - * given global directory entry. This only returns the gd entry - * in non-PAE compilation mode, since the middle layer is folded. - */ -static pmd_t * __init one_md_table_init(pgd_t *pgd) -{ - pud_t *pud; - pmd_t *pmd_table; - -#ifdef CONFIG_X86_PAE - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) { - if (after_bootmem) - pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE); - else - pmd_table = (pmd_t *)alloc_low_page(); - paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT); - set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT)); - pud = pud_offset(pgd, 0); - BUG_ON(pmd_table != pmd_offset(pud, 0)); - - return pmd_table; - } -#endif - pud = pud_offset(pgd, 0); - pmd_table = pmd_offset(pud, 0); - - return pmd_table; -} - -/* * Create a page table and place a pointer to it in a middle page * directory entry: */ @@ -123,13 +93,28 @@ page_table = (pte_t *)alloc_low_page(); paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT); +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) + set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE)); +#else set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE)); +#endif BUG_ON(page_table != pte_offset_kernel(pmd, 0)); } return pte_offset_kernel(pmd, 0); } +static pmd_t * __init one_md_table_init(pgd_t *pgd) +{ + pud_t *pud; + pmd_t *pmd_table; + + pud = pud_offset(pgd, 0); + pmd_table = pmd_offset(pud, 0); + + return pmd_table; +} + pmd_t * __init populate_extra_pmd(unsigned long vaddr) { int pgd_idx = pgd_index(vaddr); @@ -203,6 +188,7 @@ int pgd_idx, pmd_idx; unsigned long vaddr; pgd_t *pgd; + pud_t *pud; pmd_t *pmd; pte_t *pte = NULL; @@ -212,8 +198,13 @@ pgd = pgd_base + pgd_idx; for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) { - pmd = one_md_table_init(pgd); - pmd = pmd + pmd_index(vaddr); + pud = pud_offset(pgd, vaddr); + pmd = pmd_offset(pud, vaddr); + +#ifdef CONFIG_X86_PAE + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT); +#endif + for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end); pmd++, pmd_idx++) { pte = page_table_kmap_check(one_page_table_init(pmd), @@ -225,11 +216,20 @@ } } -static inline int is_kernel_text(unsigned long addr) +static inline int is_kernel_text(unsigned long start, unsigned long end) { - if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end) - return 1; - return 0; + if ((start > ktla_ktva((unsigned long)_etext) || + end <= ktla_ktva((unsigned long)_stext)) && + (start > ktla_ktva((unsigned long)_einittext) || + end <= ktla_ktva((unsigned long)_sinittext)) && + +#ifdef CONFIG_ACPI_SLEEP + (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) && +#endif + + (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000))) + return 0; + return 1; } /* @@ -246,9 +246,10 @@ unsigned long last_map_addr = end; unsigned long start_pfn, end_pfn; pgd_t *pgd_base = swapper_pg_dir; - int pgd_idx, pmd_idx, pte_ofs; + unsigned int pgd_idx, pmd_idx, pte_ofs; unsigned long pfn; pgd_t *pgd; + pud_t *pud; pmd_t *pmd; pte_t *pte; unsigned pages_2m, pages_4k; @@ -281,8 +282,13 @@ pfn = start_pfn; pgd_idx = pgd_index((pfn<> PAGE_SHIFT); +#endif if (pfn >= end_pfn) continue; @@ -294,14 +300,13 @@ #endif for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn; pmd++, pmd_idx++) { - unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET; + unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET; /* * Map with big pages if possible, otherwise * create normal page tables: */ if (use_pse) { - unsigned int addr2; pgprot_t prot = PAGE_KERNEL_LARGE; /* * first pass will use the same initial @@ -311,11 +316,7 @@ __pgprot(PTE_IDENT_ATTR | _PAGE_PSE); - addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE + - PAGE_OFFSET + PAGE_SIZE-1; - - if (is_kernel_text(addr) || - is_kernel_text(addr2)) + if (is_kernel_text(address, address + PMD_SIZE)) prot = PAGE_KERNEL_LARGE_EXEC; pages_2m++; @@ -332,7 +333,7 @@ pte_ofs = pte_index((pfn<> 10, - (unsigned long)&_etext, (unsigned long)&_edata, - ((unsigned long)&_edata - (unsigned long)&_etext) >> 10, + (unsigned long)&_sdata, (unsigned long)&_edata, + ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10, - (unsigned long)&_text, (unsigned long)&_etext, + ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext), ((unsigned long)&_etext - (unsigned long)&_text) >> 10); /* @@ -894,6 +899,7 @@ if (!kernel_set_to_readonly) return; + start = ktla_ktva(start); pr_debug("Set kernel text: %lx - %lx for read write\n", start, start+size); @@ -908,6 +914,7 @@ if (!kernel_set_to_readonly) return; + start = ktla_ktva(start); pr_debug("Set kernel text: %lx - %lx for read only\n", start, start+size); @@ -936,6 +943,7 @@ unsigned long start = PFN_ALIGN(_text); unsigned long size = PFN_ALIGN(_etext) - start; + start = ktla_ktva(start); set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); printk(KERN_INFO "Write protecting the kernel text: %luk\n", size >> 10); diff -uriN linux-2.6.38.4/arch/x86/mm/init_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/init_64.c --- linux-2.6.38.4/arch/x86/mm/init_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/init_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -72,7 +72,7 @@ * around without checking the pgd every time. */ -pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP; +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP); EXPORT_SYMBOL_GPL(__supported_pte_mask); int force_personality32; @@ -105,12 +105,22 @@ for (address = start; address <= end; address += PGDIR_SIZE) { const pgd_t *pgd_ref = pgd_offset_k(address); + +#ifdef CONFIG_PAX_PER_CPU_PGD + unsigned long cpu; +#else struct page *page; +#endif if (pgd_none(*pgd_ref)) continue; spin_lock(&pgd_lock); + +#ifdef CONFIG_PAX_PER_CPU_PGD + for (cpu = 0; cpu < NR_CPUS; ++cpu) { + pgd_t *pgd = pgd_offset_cpu(cpu, address); +#else list_for_each_entry(page, &pgd_list, lru) { pgd_t *pgd; spinlock_t *pgt_lock; @@ -119,6 +129,7 @@ /* the pgt_lock only for Xen */ pgt_lock = &pgd_page_get_mm(page)->page_table_lock; spin_lock(pgt_lock); +#endif if (pgd_none(*pgd)) set_pgd(pgd, *pgd_ref); @@ -126,7 +137,10 @@ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref)); +#ifndef CONFIG_PAX_PER_CPU_PGD spin_unlock(pgt_lock); +#endif + } spin_unlock(&pgd_lock); } @@ -200,7 +214,9 @@ pmd = fill_pmd(pud, vaddr); pte = fill_pte(pmd, vaddr); + pax_open_kernel(); set_pte(pte, new_pte); + pax_close_kernel(); /* * It's enough to flush this one mapping. @@ -259,14 +275,12 @@ pgd = pgd_offset_k((unsigned long)__va(phys)); if (pgd_none(*pgd)) { pud = (pud_t *) spp_getpage(); - set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE | - _PAGE_USER)); + set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE)); } pud = pud_offset(pgd, (unsigned long)__va(phys)); if (pud_none(*pud)) { pmd = (pmd_t *) spp_getpage(); - set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE | - _PAGE_USER)); + set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE)); } pmd = pmd_offset(pud, phys); BUG_ON(!pmd_none(*pmd)); @@ -706,6 +720,12 @@ pci_iommu_alloc(); +#ifdef CONFIG_PAX_PER_CPU_PGD + clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY, + swapper_pg_dir + KERNEL_PGD_BOUNDARY, + KERNEL_PGD_PTRS); +#endif + /* clear_bss() already clear the empty_zero_page */ reservedpages = 0; @@ -866,8 +886,8 @@ static struct vm_area_struct gate_vma = { .vm_start = VSYSCALL_START, .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE), - .vm_page_prot = PAGE_READONLY_EXEC, - .vm_flags = VM_READ | VM_EXEC + .vm_page_prot = PAGE_READONLY, + .vm_flags = VM_READ }; struct vm_area_struct *get_gate_vma(struct task_struct *tsk) @@ -901,7 +921,7 @@ const char *arch_vma_name(struct vm_area_struct *vma) { - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso) + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso) return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; diff -uriN linux-2.6.38.4/arch/x86/mm/init.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/init.c --- linux-2.6.38.4/arch/x86/mm/init.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/init.c 2011-05-01 17:02:10.000000000 -0500 @@ -72,11 +72,7 @@ * cause a hotspot and fill up ZONE_DMA. The page tables * need roughly 0.5KB per GB. */ -#ifdef CONFIG_X86_32 - start = 0x7000; -#else - start = 0x8000; -#endif + start = 0x100000; base = memblock_find_in_range(start, max_pfn_mapped<> PAGE_SHIFT)) + return 1; +#endif +#endif + + if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT)) return 1; if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) return 0; @@ -383,6 +388,86 @@ void free_initmem(void) { + +#ifdef CONFIG_PAX_KERNEXEC +#ifdef CONFIG_X86_32 + /* PaX: limit KERNEL_CS to actual size */ + unsigned long addr, limit; + struct desc_struct d; + int cpu; + + limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext; + limit = (limit - 1UL) >> PAGE_SHIFT; + + memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE); + for (cpu = 0; cpu < NR_CPUS; cpu++) { + pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC); + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S); + } + + /* PaX: make KERNEL_CS read-only */ + addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text)); + if (!paravirt_enabled()) + set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT); +/* + for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) { + pgd = pgd_offset_k(addr); + pud = pud_offset(pgd, addr); + pmd = pmd_offset(pud, addr); + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); + } +*/ +#ifdef CONFIG_X86_PAE + set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT); +/* + for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) { + pgd = pgd_offset_k(addr); + pud = pud_offset(pgd, addr); + pmd = pmd_offset(pud, addr); + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask))); + } +*/ +#endif + +#ifdef CONFIG_MODULES + set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT); +#endif + +#else + pgd_t *pgd; + pud_t *pud; + pmd_t *pmd; + unsigned long addr, end; + + /* PaX: make kernel code/rodata read-only, rest non-executable */ + for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) { + pgd = pgd_offset_k(addr); + pud = pud_offset(pgd, addr); + pmd = pmd_offset(pud, addr); + if (!pmd_present(*pmd)) + continue; + if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata) + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); + else + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask))); + } + + addr = (unsigned long)__va(__pa(__START_KERNEL_map)); + end = addr + KERNEL_IMAGE_SIZE; + for (; addr < end; addr += PMD_SIZE) { + pgd = pgd_offset_k(addr); + pud = pud_offset(pgd, addr); + pmd = pmd_offset(pud, addr); + if (!pmd_present(*pmd)) + continue; + if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata))) + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); + } +#endif + + flush_tlb_all(); +#endif + free_init_pages("unused kernel memory", (unsigned long)(&__init_begin), (unsigned long)(&__init_end)); diff -uriN linux-2.6.38.4/arch/x86/mm/iomap_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/iomap_32.c --- linux-2.6.38.4/arch/x86/mm/iomap_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/iomap_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -64,7 +64,11 @@ type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR * smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); + + pax_open_kernel(); set_pte(kmap_pte - idx, pfn_pte(pfn, prot)); + pax_close_kernel(); + arch_flush_lazy_mmu_mode(); return (void *)vaddr; diff -uriN linux-2.6.38.4/arch/x86/mm/ioremap.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/ioremap.c --- linux-2.6.38.4/arch/x86/mm/ioremap.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/ioremap.c 2011-05-01 17:02:10.000000000 -0500 @@ -104,7 +104,7 @@ for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) { int is_ram = page_is_ram(pfn); - if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn))) + if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn)))) return NULL; WARN_ON_ONCE(is_ram); } @@ -344,7 +344,7 @@ early_param("early_ioremap_debug", early_ioremap_debug_setup); static __initdata int after_paging_init; -static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss; +static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE); static inline pmd_t * __init early_ioremap_pmd(unsigned long addr) { @@ -381,8 +381,7 @@ slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i); pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN)); - memset(bm_pte, 0, sizeof(bm_pte)); - pmd_populate_kernel(&init_mm, pmd, bm_pte); + pmd_populate_user(&init_mm, pmd, bm_pte); /* * The boot-ioremap range spans multiple pmds, for which diff -uriN linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/kmemcheck/kmemcheck.c --- linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/kmemcheck/kmemcheck.c 2011-05-01 17:02:10.000000000 -0500 @@ -622,9 +622,9 @@ * memory (e.g. tracked pages)? For now, we need this to avoid * invoking kmemcheck for PnP BIOS calls. */ - if (regs->flags & X86_VM_MASK) + if (v8086_mode(regs)) return false; - if (regs->cs != __KERNEL_CS) + if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS) return false; pte = kmemcheck_pte_lookup(address); diff -uriN linux-2.6.38.4/arch/x86/mm/mmap.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/mmap.c --- linux-2.6.38.4/arch/x86/mm/mmap.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/mmap.c 2011-05-01 17:02:10.000000000 -0500 @@ -49,7 +49,7 @@ * Leave an at least ~128 MB hole with possible stack randomization. */ #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size()) -#define MAX_GAP (TASK_SIZE/6*5) +#define MAX_GAP (pax_task_size/6*5) /* * True on X86_32 or when emulating IA32 on X86_64 @@ -94,27 +94,40 @@ return rnd << PAGE_SHIFT; } -static unsigned long mmap_base(void) +static unsigned long mmap_base(struct mm_struct *mm) { unsigned long gap = rlimit(RLIMIT_STACK); + unsigned long pax_task_size = TASK_SIZE; + +#ifdef CONFIG_PAX_SEGMEXEC + if (mm->pax_flags & MF_PAX_SEGMEXEC) + pax_task_size = SEGMEXEC_TASK_SIZE; +#endif if (gap < MIN_GAP) gap = MIN_GAP; else if (gap > MAX_GAP) gap = MAX_GAP; - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd()); + return PAGE_ALIGN(pax_task_size - gap - mmap_rnd()); } /* * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64 * does, but not when emulating X86_32 */ -static unsigned long mmap_legacy_base(void) +static unsigned long mmap_legacy_base(struct mm_struct *mm) { - if (mmap_is_ia32()) + if (mmap_is_ia32()) { + +#ifdef CONFIG_PAX_SEGMEXEC + if (mm->pax_flags & MF_PAX_SEGMEXEC) + return SEGMEXEC_TASK_UNMAPPED_BASE; + else +#endif + return TASK_UNMAPPED_BASE; - else + } else return TASK_UNMAPPED_BASE + mmap_rnd(); } @@ -125,11 +138,23 @@ void arch_pick_mmap_layout(struct mm_struct *mm) { if (mmap_is_legacy()) { - mm->mmap_base = mmap_legacy_base(); + mm->mmap_base = mmap_legacy_base(mm); + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base += mm->delta_mmap; +#endif + mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } else { - mm->mmap_base = mmap_base(); + mm->mmap_base = mmap_base(mm); + +#ifdef CONFIG_PAX_RANDMMAP + if (mm->pax_flags & MF_PAX_RANDMMAP) + mm->mmap_base -= mm->delta_mmap + mm->delta_stack; +#endif + mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } diff -uriN linux-2.6.38.4/arch/x86/mm/numa_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/numa_32.c --- linux-2.6.38.4/arch/x86/mm/numa_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/numa_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -99,7 +99,6 @@ } #endif -extern unsigned long find_max_low_pfn(void); extern unsigned long highend_pfn, highstart_pfn; #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) diff -uriN linux-2.6.38.4/arch/x86/mm/pageattr.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/pageattr.c --- linux-2.6.38.4/arch/x86/mm/pageattr.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/pageattr.c 2011-05-01 17:02:10.000000000 -0500 @@ -261,7 +261,7 @@ */ #ifdef CONFIG_PCI_BIOS if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT)) - pgprot_val(forbidden) |= _PAGE_NX; + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask; #endif /* @@ -269,9 +269,10 @@ * Does not cover __inittext since that is gone later on. On * 64bit we do not enforce !NX on the low mapping */ - if (within(address, (unsigned long)_text, (unsigned long)_etext)) - pgprot_val(forbidden) |= _PAGE_NX; + if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext))) + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask; +#ifdef CONFIG_DEBUG_RODATA /* * The .rodata section needs to be read-only. Using the pfn * catches all aliases. @@ -279,6 +280,7 @@ if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT, __pa((unsigned long)__end_rodata) >> PAGE_SHIFT)) pgprot_val(forbidden) |= _PAGE_RW; +#endif #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA) /* @@ -317,6 +319,13 @@ } #endif +#ifdef CONFIG_PAX_KERNEXEC + if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) { + pgprot_val(forbidden) |= _PAGE_RW; + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask; + } +#endif + prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden)); return prot; @@ -369,23 +378,37 @@ static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte) { /* change init_mm */ + pax_open_kernel(); set_pte_atomic(kpte, pte); + #ifdef CONFIG_X86_32 if (!SHARED_KERNEL_PMD) { + +#ifdef CONFIG_PAX_PER_CPU_PGD + unsigned long cpu; +#else struct page *page; +#endif +#ifdef CONFIG_PAX_PER_CPU_PGD + for (cpu = 0; cpu < NR_CPUS; ++cpu) { + pgd_t *pgd = get_cpu_pgd(cpu); +#else list_for_each_entry(page, &pgd_list, lru) { - pgd_t *pgd; + pgd_t *pgd = (pgd_t *)page_address(page); +#endif + pud_t *pud; pmd_t *pmd; - pgd = (pgd_t *)page_address(page) + pgd_index(address); + pgd += pgd_index(address); pud = pud_offset(pgd, address); pmd = pmd_offset(pud, address); set_pte_atomic((pte_t *)pmd, pte); } } #endif + pax_close_kernel(); } static int diff -uriN linux-2.6.38.4/arch/x86/mm/pageattr-test.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/pageattr-test.c --- linux-2.6.38.4/arch/x86/mm/pageattr-test.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/pageattr-test.c 2011-05-01 17:02:10.000000000 -0500 @@ -36,7 +36,7 @@ static int pte_testbit(pte_t pte) { - return pte_flags(pte) & _PAGE_UNUSED1; + return pte_flags(pte) & _PAGE_CPA_TEST; } struct split_state { diff -uriN linux-2.6.38.4/arch/x86/mm/pat.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/pat.c --- linux-2.6.38.4/arch/x86/mm/pat.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/pat.c 2011-05-01 17:02:10.000000000 -0500 @@ -361,7 +361,7 @@ if (!entry) { printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n", - current->comm, current->pid, start, end); + current->comm, task_pid_nr(current), start, end); return -EINVAL; } @@ -492,8 +492,8 @@ while (cursor < to) { if (!devmem_is_allowed(pfn)) { printk(KERN_INFO - "Program %s tried to access /dev/mem between %Lx->%Lx.\n", - current->comm, from, to); + "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n", + current->comm, from, to, cursor); return 0; } cursor += PAGE_SIZE; @@ -557,7 +557,7 @@ printk(KERN_INFO "%s:%d ioremap_change_attr failed %s " "for %Lx-%Lx\n", - current->comm, current->pid, + current->comm, task_pid_nr(current), cattr_name(flags), base, (unsigned long long)(base + size)); return -EINVAL; @@ -593,7 +593,7 @@ if (want_flags != flags) { printk(KERN_WARNING "%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n", - current->comm, current->pid, + current->comm, task_pid_nr(current), cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), @@ -615,7 +615,7 @@ free_memtype(paddr, paddr + size); printk(KERN_ERR "%s:%d map pfn expected mapping type %s" " for %Lx-%Lx, got %s\n", - current->comm, current->pid, + current->comm, task_pid_nr(current), cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), diff -uriN linux-2.6.38.4/arch/x86/mm/pgtable_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/pgtable_32.c --- linux-2.6.38.4/arch/x86/mm/pgtable_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/pgtable_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -48,10 +48,13 @@ return; } pte = pte_offset_kernel(pmd, vaddr); + + pax_open_kernel(); if (pte_val(pteval)) set_pte_at(&init_mm, vaddr, pte, pteval); else pte_clear(&init_mm, vaddr, pte); + pax_close_kernel(); /* * It's enough to flush this one mapping. diff -uriN linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/pgtable.c --- linux-2.6.38.4/arch/x86/mm/pgtable.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/pgtable.c 2011-05-01 17:02:10.000000000 -0500 @@ -84,9 +84,58 @@ list_del(&page->lru); } -#define UNSHARED_PTRS_PER_PGD \ - (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD) +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) +pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT; +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) +{ + while (count--) + *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER); +} +#endif + +#ifdef CONFIG_PAX_PER_CPU_PGD +void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count) +{ + while (count--) + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + *dst++ = __pgd(pgd_val(*src++) & clone_pgd_mask); +#else + *dst++ = *src++; +#endif + +} +#endif + +#ifdef CONFIG_PAX_PER_CPU_PGD +static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {} +static inline void pgd_dtor(pgd_t *pgd) {} +#ifdef CONFIG_X86_64 +#define pxd_t pud_t +#define pyd_t pgd_t +#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn) +#define pxd_free(mm, pud) pud_free((mm), (pud)) +#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud)) +#define pyd_offset(mm ,address) pgd_offset((mm), (address)) +#define PYD_SIZE PGDIR_SIZE +#else +#define pxd_t pmd_t +#define pyd_t pud_t +#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn) +#define pxd_free(mm, pud) pmd_free((mm), (pud)) +#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud)) +#define pyd_offset(mm ,address) pud_offset((mm), (address)) +#define PYD_SIZE PUD_SIZE +#endif +#else +#define pxd_t pmd_t +#define pyd_t pud_t +#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn) +#define pxd_free(mm, pmd) pmd_free((mm), (pmd)) +#define pyd_populate(mm, pud, pmd) pud_populate((mm), (pud), (pmd)) +#define pyd_offset(mm ,address) pud_offset((mm), (address)) +#define PYD_SIZE PUD_SIZE static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm) { @@ -128,6 +177,7 @@ pgd_list_del(pgd); spin_unlock(&pgd_lock); } +#endif /* * List of all pgd's needed for non-PAE so it can invalidate entries @@ -140,7 +190,7 @@ * -- wli */ -#ifdef CONFIG_X86_PAE +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE) /* * In PAE mode, we need to do a cr3 reload (=tlb flush) when * updating the top-level pagetable entries to guarantee the @@ -152,7 +202,7 @@ * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate * and initialize the kernel pmds here. */ -#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD +#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD) void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd) { @@ -170,36 +220,38 @@ */ flush_tlb_mm(mm); } +#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD) +#define PREALLOCATED_PXDS USER_PGD_PTRS #else /* !CONFIG_X86_PAE */ /* No need to prepopulate any pagetable entries in non-PAE modes. */ -#define PREALLOCATED_PMDS 0 +#define PREALLOCATED_PXDS 0 #endif /* CONFIG_X86_PAE */ -static void free_pmds(pmd_t *pmds[]) +static void free_pxds(pxd_t *pxds[]) { int i; - for(i = 0; i < PREALLOCATED_PMDS; i++) - if (pmds[i]) - free_page((unsigned long)pmds[i]); + for(i = 0; i < PREALLOCATED_PXDS; i++) + if (pxds[i]) + free_page((unsigned long)pxds[i]); } -static int preallocate_pmds(pmd_t *pmds[]) +static int preallocate_pxds(pxd_t *pxds[]) { int i; bool failed = false; - for(i = 0; i < PREALLOCATED_PMDS; i++) { - pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP); - if (pmd == NULL) + for(i = 0; i < PREALLOCATED_PXDS; i++) { + pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP); + if (pxd == NULL) failed = true; - pmds[i] = pmd; + pxds[i] = pxd; } if (failed) { - free_pmds(pmds); + free_pxds(pxds); return -ENOMEM; } @@ -212,51 +264,55 @@ * preallocate which never got a corresponding vma will need to be * freed manually. */ -static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp) +static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp) { int i; - for(i = 0; i < PREALLOCATED_PMDS; i++) { + for(i = 0; i < PREALLOCATED_PXDS; i++) { pgd_t pgd = pgdp[i]; if (pgd_val(pgd) != 0) { - pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd); + pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd); - pgdp[i] = native_make_pgd(0); + set_pgd(pgdp + i, native_make_pgd(0)); - paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT); - pmd_free(mm, pmd); + paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT); + pxd_free(mm, pxd); } } } -static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[]) +static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[]) { - pud_t *pud; + pyd_t *pyd; unsigned long addr; int i; - if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */ + if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */ return; - pud = pud_offset(pgd, 0); +#ifdef CONFIG_X86_64 + pyd = pyd_offset(mm, 0L); +#else + pyd = pyd_offset(pgd, 0L); +#endif - for (addr = i = 0; i < PREALLOCATED_PMDS; - i++, pud++, addr += PUD_SIZE) { - pmd_t *pmd = pmds[i]; + for (addr = i = 0; i < PREALLOCATED_PXDS; + i++, pyd++, addr += PYD_SIZE) { + pxd_t *pxd = pxds[i]; if (i >= KERNEL_PGD_BOUNDARY) - memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]), - sizeof(pmd_t) * PTRS_PER_PMD); + memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]), + sizeof(pxd_t) * PTRS_PER_PMD); - pud_populate(mm, pud, pmd); + pyd_populate(mm, pyd, pxd); } } pgd_t *pgd_alloc(struct mm_struct *mm) { pgd_t *pgd; - pmd_t *pmds[PREALLOCATED_PMDS]; + pxd_t *pxds[PREALLOCATED_PXDS]; pgd = (pgd_t *)__get_free_page(PGALLOC_GFP); @@ -265,11 +321,11 @@ mm->pgd = pgd; - if (preallocate_pmds(pmds) != 0) + if (preallocate_pxds(pxds) != 0) goto out_free_pgd; if (paravirt_pgd_alloc(mm) != 0) - goto out_free_pmds; + goto out_free_pxds; /* * Make sure that pre-populating the pmds is atomic with @@ -279,14 +335,14 @@ spin_lock(&pgd_lock); pgd_ctor(mm, pgd); - pgd_prepopulate_pmd(mm, pgd, pmds); + pgd_prepopulate_pxd(mm, pgd, pxds); spin_unlock(&pgd_lock); return pgd; -out_free_pmds: - free_pmds(pmds); +out_free_pxds: + free_pxds(pxds); out_free_pgd: free_page((unsigned long)pgd); out: @@ -295,7 +351,7 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd) { - pgd_mop_up_pmds(mm, pgd); + pgd_mop_up_pxds(mm, pgd); pgd_dtor(pgd); paravirt_pgd_free(mm, pgd); free_page((unsigned long)pgd); diff -uriN linux-2.6.38.4/arch/x86/mm/setup_nx.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/setup_nx.c --- linux-2.6.38.4/arch/x86/mm/setup_nx.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/setup_nx.c 2011-05-01 17:02:10.000000000 -0500 @@ -5,8 +5,10 @@ #include #include +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) static int disable_nx __cpuinitdata; +#ifndef CONFIG_PAX_PAGEEXEC /* * noexec = on|off * @@ -28,12 +30,17 @@ return 0; } early_param("noexec", noexec_setup); +#endif + +#endif void __cpuinit x86_configure_nx(void) { +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) if (cpu_has_nx && !disable_nx) __supported_pte_mask |= _PAGE_NX; else +#endif __supported_pte_mask &= ~_PAGE_NX; } diff -uriN linux-2.6.38.4/arch/x86/mm/tlb.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/tlb.c --- linux-2.6.38.4/arch/x86/mm/tlb.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/mm/tlb.c 2011-05-01 17:02:10.000000000 -0500 @@ -65,7 +65,11 @@ BUG(); cpumask_clear_cpu(cpu, mm_cpumask(percpu_read(cpu_tlbstate.active_mm))); + +#ifndef CONFIG_PAX_PER_CPU_PGD load_cr3(swapper_pg_dir); +#endif + } EXPORT_SYMBOL_GPL(leave_mm); diff -uriN linux-2.6.38.4/arch/x86/oprofile/backtrace.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/oprofile/backtrace.c --- linux-2.6.38.4/arch/x86/oprofile/backtrace.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/oprofile/backtrace.c 2011-05-01 17:02:10.000000000 -0500 @@ -57,7 +57,7 @@ struct stack_frame_ia32 *fp; /* Also check accessibility of one struct frame_head beyond */ - if (!access_ok(VERIFY_READ, head, sizeof(bufhead))) + if (!__access_ok(VERIFY_READ, head, sizeof(bufhead))) return NULL; if (__copy_from_user_inatomic(bufhead, head, sizeof(bufhead))) return NULL; @@ -123,7 +123,7 @@ { struct stack_frame *head = (struct stack_frame *)frame_pointer(regs); - if (!user_mode_vm(regs)) { + if (!user_mode(regs)) { unsigned long stack = kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, diff -uriN linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/oprofile/op_model_p4.c --- linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/oprofile/op_model_p4.c 2011-05-01 17:02:10.000000000 -0500 @@ -50,7 +50,7 @@ #endif } -static int inline addr_increment(void) +static inline int addr_increment(void) { #ifdef CONFIG_SMP return smp_num_siblings == 2 ? 2 : 1; diff -uriN linux-2.6.38.4/arch/x86/pci/ce4100.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/ce4100.c --- linux-2.6.38.4/arch/x86/pci/ce4100.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/ce4100.c 2011-05-01 17:02:10.000000000 -0500 @@ -302,7 +302,7 @@ return pci_direct_conf1.write(seg, bus, devfn, reg, len, value); } -struct pci_raw_ops ce4100_pci_conf = { +const struct pci_raw_ops ce4100_pci_conf = { .read = ce4100_conf_read, .write = ce4100_conf_write, }; diff -uriN linux-2.6.38.4/arch/x86/pci/common.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/common.c --- linux-2.6.38.4/arch/x86/pci/common.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/common.c 2011-05-01 17:02:10.000000000 -0500 @@ -33,8 +33,8 @@ int pcibios_last_bus = -1; unsigned long pirq_table_addr; struct pci_bus *pci_root_bus; -struct pci_raw_ops *raw_pci_ops; -struct pci_raw_ops *raw_pci_ext_ops; +const struct pci_raw_ops *raw_pci_ops; +const struct pci_raw_ops *raw_pci_ext_ops; int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, int reg, int len, u32 *val) diff -uriN linux-2.6.38.4/arch/x86/pci/direct.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/direct.c --- linux-2.6.38.4/arch/x86/pci/direct.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/direct.c 2011-05-01 17:02:10.000000000 -0500 @@ -79,7 +79,7 @@ #undef PCI_CONF1_ADDRESS -struct pci_raw_ops pci_direct_conf1 = { +const struct pci_raw_ops pci_direct_conf1 = { .read = pci_conf1_read, .write = pci_conf1_write, }; @@ -173,7 +173,7 @@ #undef PCI_CONF2_ADDRESS -struct pci_raw_ops pci_direct_conf2 = { +const struct pci_raw_ops pci_direct_conf2 = { .read = pci_conf2_read, .write = pci_conf2_write, }; @@ -189,7 +189,7 @@ * This should be close to trivial, but it isn't, because there are buggy * chipsets (yes, you guessed it, by Intel and Compaq) that have no class ID. */ -static int __init pci_sanity_check(struct pci_raw_ops *o) +static int __init pci_sanity_check(const struct pci_raw_ops *o) { u32 x = 0; int year, devfn; diff -uriN linux-2.6.38.4/arch/x86/pci/fixup.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/fixup.c --- linux-2.6.38.4/arch/x86/pci/fixup.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/fixup.c 2011-05-01 17:02:10.000000000 -0500 @@ -435,7 +435,7 @@ DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"), }, }, - { } + {} }; static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) diff -uriN linux-2.6.38.4/arch/x86/pci/mmconfig_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/mmconfig_32.c --- linux-2.6.38.4/arch/x86/pci/mmconfig_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/mmconfig_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -117,7 +117,7 @@ return 0; } -static struct pci_raw_ops pci_mmcfg = { +static const struct pci_raw_ops pci_mmcfg = { .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; diff -uriN linux-2.6.38.4/arch/x86/pci/mmconfig_64.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/mmconfig_64.c --- linux-2.6.38.4/arch/x86/pci/mmconfig_64.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/mmconfig_64.c 2011-05-01 17:02:10.000000000 -0500 @@ -81,7 +81,7 @@ return 0; } -static struct pci_raw_ops pci_mmcfg = { +static const struct pci_raw_ops pci_mmcfg = { .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; diff -uriN linux-2.6.38.4/arch/x86/pci/numaq_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/numaq_32.c --- linux-2.6.38.4/arch/x86/pci/numaq_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/numaq_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -108,7 +108,7 @@ #undef PCI_CONF1_MQ_ADDRESS -static struct pci_raw_ops pci_direct_conf1_mq = { +static const struct pci_raw_ops pci_direct_conf1_mq = { .read = pci_conf1_mq_read, .write = pci_conf1_mq_write }; diff -uriN linux-2.6.38.4/arch/x86/pci/olpc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/olpc.c --- linux-2.6.38.4/arch/x86/pci/olpc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/olpc.c 2011-05-01 17:02:10.000000000 -0500 @@ -297,7 +297,7 @@ return 0; } -static struct pci_raw_ops pci_olpc_conf = { +static const struct pci_raw_ops pci_olpc_conf = { .read = pci_olpc_read, .write = pci_olpc_write, }; diff -uriN linux-2.6.38.4/arch/x86/pci/pcbios.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/pcbios.c --- linux-2.6.38.4/arch/x86/pci/pcbios.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/pci/pcbios.c 2011-05-01 17:02:10.000000000 -0500 @@ -79,50 +79,93 @@ static struct { unsigned long address; unsigned short segment; -} bios32_indirect = { 0, __KERNEL_CS }; +} bios32_indirect __read_only = { 0, __PCIBIOS_CS }; /* * Returns the entry point for the given service, NULL on error */ -static unsigned long bios32_service(unsigned long service) +static unsigned long __devinit bios32_service(unsigned long service) { unsigned char return_code; /* %al */ unsigned long address; /* %ebx */ unsigned long length; /* %ecx */ unsigned long entry; /* %edx */ unsigned long flags; + struct desc_struct d, *gdt; local_irq_save(flags); - __asm__("lcall *(%%edi); cld" + + gdt = get_cpu_gdt_table(smp_processor_id()); + + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC); + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S); + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC); + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S); + + __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld" : "=a" (return_code), "=b" (address), "=c" (length), "=d" (entry) : "0" (service), "1" (0), - "D" (&bios32_indirect)); + "D" (&bios32_indirect), + "r"(__PCIBIOS_DS) + : "memory"); + + pax_open_kernel(); + gdt[GDT_ENTRY_PCIBIOS_CS].a = 0; + gdt[GDT_ENTRY_PCIBIOS_CS].b = 0; + gdt[GDT_ENTRY_PCIBIOS_DS].a = 0; + gdt[GDT_ENTRY_PCIBIOS_DS].b = 0; + pax_close_kernel(); + local_irq_restore(flags); switch (return_code) { - case 0: - return address + entry; - case 0x80: /* Not present */ - printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service); - return 0; - default: /* Shouldn't happen */ - printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n", - service, return_code); + case 0: { + int cpu; + unsigned char flags; + + printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry); + if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) { + printk(KERN_WARNING "bios32_service: not valid\n"); return 0; + } + address = address + PAGE_OFFSET; + length += 16UL; /* some BIOSs underreport this... */ + flags = 4; + if (length >= 64*1024*1024) { + length >>= PAGE_SHIFT; + flags |= 8; + } + + for (cpu = 0; cpu < NR_CPUS; cpu++) { + gdt = get_cpu_gdt_table(cpu); + pack_descriptor(&d, address, length, 0x9b, flags); + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S); + pack_descriptor(&d, address, length, 0x93, flags); + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S); + } + return entry; + } + case 0x80: /* Not present */ + printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service); + return 0; + default: /* Shouldn't happen */ + printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n", + service, return_code); + return 0; } } static struct { unsigned long address; unsigned short segment; -} pci_indirect = { 0, __KERNEL_CS }; +} pci_indirect __read_only = { 0, __PCIBIOS_CS }; -static int pci_bios_present; +static int pci_bios_present __read_only; static int __devinit check_pcibios(void) { @@ -131,11 +174,13 @@ unsigned long flags, pcibios_entry; if ((pcibios_entry = bios32_service(PCI_SERVICE))) { - pci_indirect.address = pcibios_entry + PAGE_OFFSET; + pci_indirect.address = pcibios_entry; local_irq_save(flags); - __asm__( - "lcall *(%%edi); cld\n\t" + __asm__("movw %w6, %%ds\n\t" + "lcall *%%ss:(%%edi); cld\n\t" + "push %%ss\n\t" + "pop %%ds\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -144,7 +189,8 @@ "=b" (ebx), "=c" (ecx) : "1" (PCIBIOS_PCI_BIOS_PRESENT), - "D" (&pci_indirect) + "D" (&pci_indirect), + "r" (__PCIBIOS_DS) : "memory"); local_irq_restore(flags); @@ -188,7 +234,10 @@ switch (len) { case 1: - __asm__("lcall *(%%esi); cld\n\t" + __asm__("movw %w6, %%ds\n\t" + "lcall *%%ss:(%%esi); cld\n\t" + "push %%ss\n\t" + "pop %%ds\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -197,7 +246,8 @@ : "1" (PCIBIOS_READ_CONFIG_BYTE), "b" (bx), "D" ((long)reg), - "S" (&pci_indirect)); + "S" (&pci_indirect), + "r" (__PCIBIOS_DS)); /* * Zero-extend the result beyond 8 bits, do not trust the * BIOS having done it: @@ -205,7 +255,10 @@ *value &= 0xff; break; case 2: - __asm__("lcall *(%%esi); cld\n\t" + __asm__("movw %w6, %%ds\n\t" + "lcall *%%ss:(%%esi); cld\n\t" + "push %%ss\n\t" + "pop %%ds\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -214,7 +267,8 @@ : "1" (PCIBIOS_READ_CONFIG_WORD), "b" (bx), "D" ((long)reg), - "S" (&pci_indirect)); + "S" (&pci_indirect), + "r" (__PCIBIOS_DS)); /* * Zero-extend the result beyond 16 bits, do not trust the * BIOS having done it: @@ -222,7 +276,10 @@ *value &= 0xffff; break; case 4: - __asm__("lcall *(%%esi); cld\n\t" + __asm__("movw %w6, %%ds\n\t" + "lcall *%%ss:(%%esi); cld\n\t" + "push %%ss\n\t" + "pop %%ds\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -231,7 +288,8 @@ : "1" (PCIBIOS_READ_CONFIG_DWORD), "b" (bx), "D" ((long)reg), - "S" (&pci_indirect)); + "S" (&pci_indirect), + "r" (__PCIBIOS_DS)); break; } @@ -254,7 +312,10 @@ switch (len) { case 1: - __asm__("lcall *(%%esi); cld\n\t" + __asm__("movw %w6, %%ds\n\t" + "lcall *%%ss:(%%esi); cld\n\t" + "push %%ss\n\t" + "pop %%ds\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -263,10 +324,14 @@ "c" (value), "b" (bx), "D" ((long)reg), - "S" (&pci_indirect)); + "S" (&pci_indirect), + "r" (__PCIBIOS_DS)); break; case 2: - __asm__("lcall *(%%esi); cld\n\t" + __asm__("movw %w6, %%ds\n\t" + "lcall *%%ss:(%%esi); cld\n\t" + "push %%ss\n\t" + "pop %%ds\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -275,10 +340,14 @@ "c" (value), "b" (bx), "D" ((long)reg), - "S" (&pci_indirect)); + "S" (&pci_indirect), + "r" (__PCIBIOS_DS)); break; case 4: - __asm__("lcall *(%%esi); cld\n\t" + __asm__("movw %w6, %%ds\n\t" + "lcall *%%ss:(%%esi); cld\n\t" + "push %%ss\n\t" + "pop %%ds\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -287,7 +356,8 @@ "c" (value), "b" (bx), "D" ((long)reg), - "S" (&pci_indirect)); + "S" (&pci_indirect), + "r" (__PCIBIOS_DS)); break; } @@ -301,7 +371,7 @@ * Function table for BIOS32 access */ -static struct pci_raw_ops pci_bios_access = { +static const struct pci_raw_ops pci_bios_access = { .read = pci_bios_read, .write = pci_bios_write }; @@ -310,7 +380,7 @@ * Try to find PCI BIOS. */ -static struct pci_raw_ops * __devinit pci_find_bios(void) +static const struct pci_raw_ops * __devinit pci_find_bios(void) { union bios32 *check; unsigned char sum; @@ -392,10 +462,13 @@ DBG("PCI: Fetching IRQ routing table... "); __asm__("push %%es\n\t" + "movw %w8, %%ds\n\t" "push %%ds\n\t" "pop %%es\n\t" - "lcall *(%%esi); cld\n\t" + "lcall *%%ss:(%%esi); cld\n\t" "pop %%es\n\t" + "push %%ss\n\t" + "pop %%ds\n" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -406,7 +479,8 @@ "1" (0), "D" ((long) &opt), "S" (&pci_indirect), - "m" (opt) + "m" (opt), + "r" (__PCIBIOS_DS) : "memory"); DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map); if (ret & 0xff00) @@ -430,7 +504,10 @@ { int ret; - __asm__("lcall *(%%esi); cld\n\t" + __asm__("movw %w5, %%ds\n\t" + "lcall *%%ss:(%%esi); cld\n\t" + "push %%ss\n\t" + "pop %%ds\n" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -438,7 +515,8 @@ : "0" (PCIBIOS_SET_PCI_HW_INT), "b" ((dev->bus->number << 8) | dev->devfn), "c" ((irq << 8) | (pin + 10)), - "S" (&pci_indirect)); + "S" (&pci_indirect), + "r" (__PCIBIOS_DS)); return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); diff -uriN linux-2.6.38.4/arch/x86/platform/efi/efi_32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/platform/efi/efi_32.c --- linux-2.6.38.4/arch/x86/platform/efi/efi_32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/platform/efi/efi_32.c 2011-05-01 17:02:10.000000000 -0500 @@ -38,70 +38,37 @@ */ static unsigned long efi_rt_eflags; -static pgd_t efi_bak_pg_dir_pointer[2]; +static pgd_t __initdata efi_bak_pg_dir_pointer[KERNEL_PGD_PTRS]; -void efi_call_phys_prelog(void) +void __init efi_call_phys_prelog(void) { - unsigned long cr4; - unsigned long temp; struct desc_ptr gdt_descr; local_irq_save(efi_rt_eflags); - /* - * If I don't have PAE, I should just duplicate two entries in page - * directory. If I have PAE, I just need to duplicate one entry in - * page directory. - */ - cr4 = read_cr4_safe(); - - if (cr4 & X86_CR4_PAE) { - efi_bak_pg_dir_pointer[0].pgd = - swapper_pg_dir[pgd_index(0)].pgd; - swapper_pg_dir[0].pgd = - swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd; - } else { - efi_bak_pg_dir_pointer[0].pgd = - swapper_pg_dir[pgd_index(0)].pgd; - efi_bak_pg_dir_pointer[1].pgd = - swapper_pg_dir[pgd_index(0x400000)].pgd; - swapper_pg_dir[pgd_index(0)].pgd = - swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd; - temp = PAGE_OFFSET + 0x400000; - swapper_pg_dir[pgd_index(0x400000)].pgd = - swapper_pg_dir[pgd_index(temp)].pgd; - } + clone_pgd_range(efi_bak_pg_dir_pointer, swapper_pg_dir, KERNEL_PGD_PTRS); + clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, + min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY)); /* * After the lock is released, the original page table is restored. */ __flush_tlb_all(); - gdt_descr.address = __pa(get_cpu_gdt_table(0)); + gdt_descr.address = (struct desc_struct *)__pa(get_cpu_gdt_table(0)); gdt_descr.size = GDT_SIZE - 1; load_gdt(&gdt_descr); } -void efi_call_phys_epilog(void) +void __init efi_call_phys_epilog(void) { - unsigned long cr4; struct desc_ptr gdt_descr; - gdt_descr.address = (unsigned long)get_cpu_gdt_table(0); + gdt_descr.address = get_cpu_gdt_table(0); gdt_descr.size = GDT_SIZE - 1; load_gdt(&gdt_descr); - cr4 = read_cr4_safe(); - - if (cr4 & X86_CR4_PAE) { - swapper_pg_dir[pgd_index(0)].pgd = - efi_bak_pg_dir_pointer[0].pgd; - } else { - swapper_pg_dir[pgd_index(0)].pgd = - efi_bak_pg_dir_pointer[0].pgd; - swapper_pg_dir[pgd_index(0x400000)].pgd = - efi_bak_pg_dir_pointer[1].pgd; - } + clone_pgd_range(swapper_pg_dir, efi_bak_pg_dir_pointer, KERNEL_PGD_PTRS); /* * After the lock is released, the original page table is restored. diff -uriN linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/platform/efi/efi_stub_32.S --- linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/platform/efi/efi_stub_32.S 2011-05-01 17:02:10.000000000 -0500 @@ -6,6 +6,7 @@ */ #include +#include #include /* @@ -20,7 +21,7 @@ * service functions will comply with gcc calling convention, too. */ -.text +__INIT ENTRY(efi_call_phys) /* * 0. The function can only be called in Linux kernel. So CS has been @@ -36,9 +37,7 @@ * The mapping of lower virtual memory has been created in prelog and * epilog. */ - movl $1f, %edx - subl $__PAGE_OFFSET, %edx - jmp *%edx + jmp 1f-__PAGE_OFFSET 1: /* @@ -47,14 +46,8 @@ * parameter 2, ..., param n. To make things easy, we save the return * address of efi_call_phys in a global variable. */ - popl %edx - movl %edx, saved_return_addr - /* get the function pointer into ECX*/ - popl %ecx - movl %ecx, efi_rt_function_ptr - movl $2f, %edx - subl $__PAGE_OFFSET, %edx - pushl %edx + popl (saved_return_addr) + popl (efi_rt_function_ptr) /* * 3. Clear PG bit in %CR0. @@ -73,9 +66,8 @@ /* * 5. Call the physical function. */ - jmp *%ecx + call *(efi_rt_function_ptr-__PAGE_OFFSET) -2: /* * 6. After EFI runtime service returns, control will return to * following instruction. We'd better readjust stack pointer first. @@ -88,35 +80,28 @@ movl %cr0, %edx orl $0x80000000, %edx movl %edx, %cr0 - jmp 1f -1: + /* * 8. Now restore the virtual mode from flat mode by * adding EIP with PAGE_OFFSET. */ - movl $1f, %edx - jmp *%edx + jmp 1f+__PAGE_OFFSET 1: /* * 9. Balance the stack. And because EAX contain the return value, * we'd better not clobber it. */ - leal efi_rt_function_ptr, %edx - movl (%edx), %ecx - pushl %ecx + pushl (efi_rt_function_ptr) /* - * 10. Push the saved return address onto the stack and return. + * 10. Return to the saved return address. */ - leal saved_return_addr, %edx - movl (%edx), %ecx - pushl %ecx - ret + jmpl *(saved_return_addr) ENDPROC(efi_call_phys) .previous -.data +__INITDATA saved_return_addr: .long 0 efi_rt_function_ptr: diff -uriN linux-2.6.38.4/arch/x86/power/cpu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/power/cpu.c --- linux-2.6.38.4/arch/x86/power/cpu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/power/cpu.c 2011-05-01 17:02:10.000000000 -0500 @@ -130,7 +130,7 @@ static void fix_processor_context(void) { int cpu = smp_processor_id(); - struct tss_struct *t = &per_cpu(init_tss, cpu); + struct tss_struct *t = init_tss + cpu; set_tss_desc(cpu, t); /* * This just modifies memory; should not be @@ -140,7 +140,9 @@ */ #ifdef CONFIG_X86_64 + pax_open_kernel(); get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9; + pax_close_kernel(); syscall_init(); /* This sets MSR_*STAR and related */ #endif diff -uriN linux-2.6.38.4/arch/x86/vdso/Makefile linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/vdso/Makefile --- linux-2.6.38.4/arch/x86/vdso/Makefile 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/vdso/Makefile 2011-05-01 17:02:10.000000000 -0500 @@ -123,7 +123,7 @@ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' -VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) +VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) GCOV_PROFILE := n # diff -uriN linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/vdso/vclock_gettime.c --- linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/vdso/vclock_gettime.c 2011-05-01 17:02:10.000000000 -0500 @@ -22,24 +22,48 @@ #include #include #include +#include #include "vextern.h" #define gtod vdso_vsyscall_gtod_data +notrace noinline long __vdso_fallback_time(long *t) +{ + long secs; + asm volatile("syscall" + : "=a" (secs) + : "0" (__NR_time),"D" (t) : "r11", "cx", "memory"); + return secs; +} + notrace static long vdso_fallback_gettime(long clock, struct timespec *ts) { long ret; asm("syscall" : "=a" (ret) : - "0" (__NR_clock_gettime),"D" (clock), "S" (ts) : "memory"); + "0" (__NR_clock_gettime),"D" (clock), "S" (ts) : "r11", "cx", "memory"); return ret; } +notrace static inline cycle_t __vdso_vread_hpet(void) +{ + return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0); +} + +notrace static inline cycle_t __vdso_vread_tsc(void) +{ + cycle_t ret = (cycle_t)vget_cycles(); + + return ret >= gtod->clock.cycle_last ? ret : gtod->clock.cycle_last; +} + notrace static inline long vgetns(void) { long v; - cycles_t (*vread)(void); - vread = gtod->clock.vread; - v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask; + if (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3]) + v = __vdso_vread_tsc(); + else + v = __vdso_vread_hpet(); + v = (v - gtod->clock.cycle_last) & gtod->clock.mask; return (v * gtod->clock.mult) >> gtod->clock.shift; } @@ -113,7 +137,9 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) { - if (likely(gtod->sysctl_enabled)) + if (likely(gtod->sysctl_enabled && + ((gtod->clock.name[0] == 'h' && gtod->clock.name[1] == 'p' && gtod->clock.name[2] == 'e' && gtod->clock.name[3] == 't' && !gtod->clock.name[4]) || + (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3])))) switch (clock) { case CLOCK_REALTIME: if (likely(gtod->clock.vread)) @@ -133,10 +159,20 @@ int clock_gettime(clockid_t, struct timespec *) __attribute__((weak, alias("__vdso_clock_gettime"))); -notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) +notrace noinline int __vdso_fallback_gettimeofday(struct timeval *tv, struct timezone *tz) { long ret; - if (likely(gtod->sysctl_enabled && gtod->clock.vread)) { + asm("syscall" : "=a" (ret) : + "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "r11", "cx", "memory"); + return ret; +} + +notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) +{ + if (likely(gtod->sysctl_enabled && + ((gtod->clock.name[0] == 'h' && gtod->clock.name[1] == 'p' && gtod->clock.name[2] == 'e' && gtod->clock.name[3] == 't' && !gtod->clock.name[4]) || + (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3])))) + { if (likely(tv != NULL)) { BUILD_BUG_ON(offsetof(struct timeval, tv_usec) != offsetof(struct timespec, tv_nsec) || @@ -151,9 +187,7 @@ } return 0; } - asm("syscall" : "=a" (ret) : - "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "memory"); - return ret; + return __vdso_fallback_gettimeofday(tv, tz); } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); diff -uriN linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/vdso/vdso32-setup.c --- linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/vdso/vdso32-setup.c 2011-05-01 17:02:10.000000000 -0500 @@ -25,6 +25,7 @@ #include #include #include +#include enum { VDSO_DISABLED = 0, @@ -226,7 +227,7 @@ void enable_sep_cpu(void) { int cpu = get_cpu(); - struct tss_struct *tss = &per_cpu(init_tss, cpu); + struct tss_struct *tss = init_tss + cpu; if (!boot_cpu_has(X86_FEATURE_SEP)) { put_cpu(); @@ -249,7 +250,7 @@ gate_vma.vm_start = FIXADDR_USER_START; gate_vma.vm_end = FIXADDR_USER_END; gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; - gate_vma.vm_page_prot = __P101; + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags); /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later @@ -331,14 +332,14 @@ if (compat) addr = VDSO_HIGH_BASE; else { - addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0); + addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE); if (IS_ERR_VALUE(addr)) { ret = addr; goto up_fail; } } - current->mm->context.vdso = (void *)addr; + current->mm->context.vdso = addr; if (compat_uses_vma || !compat) { /* @@ -361,11 +362,11 @@ } current_thread_info()->sysenter_return = - VDSO32_SYMBOL(addr, SYSENTER_RETURN); + (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN); up_fail: if (ret) - current->mm->context.vdso = NULL; + current->mm->context.vdso = 0; up_write(&mm->mmap_sem); @@ -412,8 +413,14 @@ const char *arch_vma_name(struct vm_area_struct *vma) { - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso) + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso) return "[vdso]"; + +#ifdef CONFIG_PAX_SEGMEXEC + if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso) + return "[vdso]"; +#endif + return NULL; } @@ -422,7 +429,7 @@ struct mm_struct *mm = tsk->mm; /* Check to see if this task was created in compat vdso mode */ - if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE) + if (mm && mm->context.vdso == VDSO_HIGH_BASE) return &gate_vma; return NULL; } diff -uriN linux-2.6.38.4/arch/x86/vdso/vdso.lds.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/vdso/vdso.lds.S --- linux-2.6.38.4/arch/x86/vdso/vdso.lds.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/vdso/vdso.lds.S 2011-05-01 17:02:10.000000000 -0500 @@ -35,3 +35,9 @@ #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; #include "vextern.h" #undef VEXTERN + +#define VEXTERN(x) VDSO64_ ## x = __vdso_ ## x; +VEXTERN(fallback_gettimeofday) +VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN diff -uriN linux-2.6.38.4/arch/x86/vdso/vextern.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/vdso/vextern.h --- linux-2.6.38.4/arch/x86/vdso/vextern.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/vdso/vextern.h 2011-05-01 17:02:10.000000000 -0500 @@ -11,6 +11,5 @@ put into vextern.h and be referenced as a pointer with vdso prefix. The main kernel later fills in the values. */ -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) diff -uriN linux-2.6.38.4/arch/x86/vdso/vma.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/vdso/vma.c --- linux-2.6.38.4/arch/x86/vdso/vma.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/vdso/vma.c 2011-05-01 17:02:10.000000000 -0500 @@ -58,7 +58,7 @@ if (!vbase) goto oom; - if (memcmp(vbase, "\177ELF", 4)) { + if (memcmp(vbase, ELFMAG, SELFMAG)) { printk("VDSO: I'm broken; not ELF\n"); vdso_enabled = 0; } @@ -118,7 +118,7 @@ goto up_fail; } - current->mm->context.vdso = (void *)addr; + current->mm->context.vdso = addr; ret = install_special_mapping(mm, addr, vdso_size, VM_READ|VM_EXEC| @@ -126,7 +126,7 @@ VM_ALWAYSDUMP, vdso_pages); if (ret) { - current->mm->context.vdso = NULL; + current->mm->context.vdso = 0; goto up_fail; } @@ -134,10 +134,3 @@ up_write(&mm->mmap_sem); return ret; } - -static __init int vdso_setup(char *s) -{ - vdso_enabled = simple_strtoul(s, NULL, 0); - return 0; -} -__setup("vdso=", vdso_setup); diff -uriN linux-2.6.38.4/arch/x86/xen/enlighten.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/enlighten.c --- linux-2.6.38.4/arch/x86/xen/enlighten.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/enlighten.c 2011-05-01 17:02:10.000000000 -0500 @@ -85,8 +85,6 @@ struct shared_info xen_dummy_shared_info; -void *xen_initial_gdt; - RESERVE_BRK(shared_info_page_brk, PAGE_SIZE); __read_mostly int xen_have_vector_callback; EXPORT_SYMBOL_GPL(xen_have_vector_callback); @@ -1134,7 +1132,17 @@ __userpte_alloc_gfp &= ~__GFP_HIGHMEM; /* Work out if we support NX */ - x86_configure_nx(); +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) + if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 && + (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) { + unsigned l, h; + + __supported_pte_mask |= _PAGE_NX; + rdmsr(MSR_EFER, l, h); + l |= EFER_NX; + wrmsr(MSR_EFER, l, h); + } +#endif xen_setup_features(); @@ -1165,13 +1173,6 @@ machine_ops = xen_machine_ops; - /* - * The only reliable way to retain the initial address of the - * percpu gdt_page is to remember it here, so we can go and - * mark it RW later, when the initial percpu area is freed. - */ - xen_initial_gdt = &per_cpu(gdt_page, 0); - xen_smp_init(); #ifdef CONFIG_ACPI_NUMA diff -uriN linux-2.6.38.4/arch/x86/xen/mmu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/mmu.c --- linux-2.6.38.4/arch/x86/xen/mmu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/mmu.c 2011-05-01 17:02:10.000000000 -0500 @@ -1721,6 +1721,8 @@ convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); convert_pfn_mfn(level3_kernel_pgt); + convert_pfn_mfn(level3_vmalloc_pgt); + convert_pfn_mfn(level3_vmemmap_pgt); l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd); l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud); @@ -1739,7 +1741,10 @@ set_page_prot(init_level4_pgt, PAGE_KERNEL_RO); set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO); + set_page_prot(level3_vmalloc_pgt, PAGE_KERNEL_RO); + set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO); set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO); + set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO); set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); diff -uriN linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/pci-swiotlb-xen.c --- linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/pci-swiotlb-xen.c 2011-05-01 17:02:10.000000000 -0500 @@ -10,7 +10,7 @@ int xen_swiotlb __read_mostly; -static struct dma_map_ops xen_swiotlb_dma_ops = { +static const struct dma_map_ops xen_swiotlb_dma_ops = { .mapping_error = xen_swiotlb_dma_mapping_error, .alloc_coherent = xen_swiotlb_alloc_coherent, .free_coherent = xen_swiotlb_free_coherent, diff -uriN linux-2.6.38.4/arch/x86/xen/smp.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/smp.c --- linux-2.6.38.4/arch/x86/xen/smp.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/smp.c 2011-05-01 17:02:10.000000000 -0500 @@ -194,11 +194,6 @@ { BUG_ON(smp_processor_id() != 0); native_smp_prepare_boot_cpu(); - - /* We've switched to the "real" per-cpu gdt, so make sure the - old memory can be recycled */ - make_lowmem_page_readwrite(xen_initial_gdt); - xen_filter_cpu_maps(); xen_setup_vcpu_info_placement(); } @@ -259,12 +254,12 @@ gdt = get_cpu_gdt_table(cpu); ctxt->flags = VGCF_IN_KERNEL; - ctxt->user_regs.ds = __USER_DS; - ctxt->user_regs.es = __USER_DS; + ctxt->user_regs.ds = __KERNEL_DS; + ctxt->user_regs.es = __KERNEL_DS; ctxt->user_regs.ss = __KERNEL_DS; #ifdef CONFIG_X86_32 ctxt->user_regs.fs = __KERNEL_PERCPU; - ctxt->user_regs.gs = __KERNEL_STACK_CANARY; + savesegment(gs, ctxt->user_regs.gs); #else ctxt->gs_base_kernel = per_cpu_offset(cpu); #endif @@ -315,13 +310,12 @@ int rc; per_cpu(current_task, cpu) = idle; + per_cpu(current_tinfo, cpu) = &idle->tinfo; #ifdef CONFIG_X86_32 irq_ctx_init(cpu); #else clear_tsk_thread_flag(idle, TIF_FORK); - per_cpu(kernel_stack, cpu) = - (unsigned long)task_stack_page(idle) - - KERNEL_STACK_OFFSET + THREAD_SIZE; + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 8 + THREAD_SIZE; #endif xen_setup_runstate_info(cpu); xen_setup_timer(cpu); diff -uriN linux-2.6.38.4/arch/x86/xen/xen-asm_32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/xen-asm_32.S --- linux-2.6.38.4/arch/x86/xen/xen-asm_32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/xen-asm_32.S 2011-05-01 17:02:10.000000000 -0500 @@ -83,14 +83,14 @@ ESP_OFFSET=4 # bytes pushed onto stack /* - * Store vcpu_info pointer for easy access. Do it this way to - * avoid having to reload %fs + * Store vcpu_info pointer for easy access. */ #ifdef CONFIG_SMP - GET_THREAD_INFO(%eax) - movl TI_cpu(%eax), %eax - movl __per_cpu_offset(,%eax,4), %eax - mov xen_vcpu(%eax), %eax + push %fs + mov $(__KERNEL_PERCPU), %eax + mov %eax, %fs + mov PER_CPU_VAR(xen_vcpu), %eax + pop %fs #else movl xen_vcpu, %eax #endif diff -uriN linux-2.6.38.4/arch/x86/xen/xen-head.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/xen-head.S --- linux-2.6.38.4/arch/x86/xen/xen-head.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/xen-head.S 2011-05-01 17:02:10.000000000 -0500 @@ -19,6 +19,17 @@ #ifdef CONFIG_X86_32 mov %esi,xen_start_info mov $init_thread_union+THREAD_SIZE,%esp +#ifdef CONFIG_SMP + movl $cpu_gdt_table,%edi + movl $__per_cpu_load,%eax + movw %ax,__KERNEL_PERCPU + 2(%edi) + rorl $16,%eax + movb %al,__KERNEL_PERCPU + 4(%edi) + movb %ah,__KERNEL_PERCPU + 7(%edi) + movl $__per_cpu_end - 1,%eax + subl $__per_cpu_start,%eax + movw %ax,__KERNEL_PERCPU + 0(%edi) +#endif #else mov %rsi,xen_start_info mov $init_thread_union+THREAD_SIZE,%rsp diff -uriN linux-2.6.38.4/arch/x86/xen/xen-ops.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/xen-ops.h --- linux-2.6.38.4/arch/x86/xen/xen-ops.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/arch/x86/xen/xen-ops.h 2011-05-01 17:02:10.000000000 -0500 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; -extern void *xen_initial_gdt; - struct trap_info; void xen_copy_trap_info(struct trap_info *traps); diff -uriN linux-2.6.38.4/block/blk-iopoll.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/block/blk-iopoll.c --- linux-2.6.38.4/block/blk-iopoll.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/block/blk-iopoll.c 2011-05-01 17:02:10.000000000 -0500 @@ -77,7 +77,7 @@ } EXPORT_SYMBOL(blk_iopoll_complete); -static void blk_iopoll_softirq(struct softirq_action *h) +static void blk_iopoll_softirq(void) { struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); int rearm = 0, budget = blk_iopoll_budget; diff -uriN linux-2.6.38.4/block/blk-map.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/block/blk-map.c --- linux-2.6.38.4/block/blk-map.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/block/blk-map.c 2011-05-01 17:02:10.000000000 -0500 @@ -301,7 +301,7 @@ if (!len || !kbuf) return -EINVAL; - do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf); + do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf); if (do_copy) bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); else diff -uriN linux-2.6.38.4/block/blk-softirq.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/block/blk-softirq.c --- linux-2.6.38.4/block/blk-softirq.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/block/blk-softirq.c 2011-05-01 17:02:10.000000000 -0500 @@ -17,7 +17,7 @@ * Softirq action handler - move entries to local list and loop over them * while passing them to the queue registered handler. */ -static void blk_done_softirq(struct softirq_action *h) +static void blk_done_softirq(void) { struct list_head *cpu_list, local_list; diff -uriN linux-2.6.38.4/block/bsg.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/block/bsg.c --- linux-2.6.38.4/block/bsg.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/block/bsg.c 2011-05-01 17:02:10.000000000 -0500 @@ -176,16 +176,24 @@ struct sg_io_v4 *hdr, struct bsg_device *bd, fmode_t has_write_perm) { + unsigned char tmpcmd[sizeof(rq->__cmd)]; + unsigned char *cmdptr; + if (hdr->request_len > BLK_MAX_CDB) { rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL); if (!rq->cmd) return -ENOMEM; - } + cmdptr = rq->cmd; + } else + cmdptr = tmpcmd; - if (copy_from_user(rq->cmd, (void *)(unsigned long)hdr->request, + if (copy_from_user(cmdptr, (void *)(unsigned long)hdr->request, hdr->request_len)) return -EFAULT; + if (cmdptr != rq->cmd) + memcpy(rq->cmd, cmdptr, hdr->request_len); + if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) { if (blk_verify_command(rq->cmd, has_write_perm)) return -EPERM; diff -uriN linux-2.6.38.4/block/genhd.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/block/genhd.c --- linux-2.6.38.4/block/genhd.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/block/genhd.c 2011-05-01 17:01:51.000000000 -0500 @@ -1154,17 +1154,17 @@ cpu = part_stat_lock(); part_round_stats(cpu, hd); part_stat_unlock(); - seq_printf(seqf, "%4d %7d %s %lu %lu %llu " - "%u %lu %lu %llu %u %u %u %u\n", + seq_printf(seqf, "%4d %7d %s %lu %lu %lu " + "%u %lu %lu %lu %u %u %u %u\n", MAJOR(part_devt(hd)), MINOR(part_devt(hd)), disk_name(gp, hd->partno, buf), part_stat_read(hd, ios[0]), part_stat_read(hd, merges[0]), - (unsigned long long)part_stat_read(hd, sectors[0]), + part_stat_read(hd, sectors[0]), jiffies_to_msecs(part_stat_read(hd, ticks[0])), part_stat_read(hd, ios[1]), part_stat_read(hd, merges[1]), - (unsigned long long)part_stat_read(hd, sectors[1]), + part_stat_read(hd, sectors[1]), jiffies_to_msecs(part_stat_read(hd, ticks[1])), part_in_flight(hd), jiffies_to_msecs(part_stat_read(hd, io_ticks)), diff -uriN linux-2.6.38.4/block/scsi_ioctl.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/block/scsi_ioctl.c --- linux-2.6.38.4/block/scsi_ioctl.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/block/scsi_ioctl.c 2011-05-01 17:02:10.000000000 -0500 @@ -222,8 +222,20 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, struct sg_io_hdr *hdr, fmode_t mode) { - if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len)) + unsigned char tmpcmd[sizeof(rq->__cmd)]; + unsigned char *cmdptr; + + if (rq->cmd != rq->__cmd) + cmdptr = rq->cmd; + else + cmdptr = tmpcmd; + + if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len)) return -EFAULT; + + if (cmdptr != rq->cmd) + memcpy(rq->cmd, cmdptr, hdr->cmd_len); + if (blk_verify_command(rq->cmd, mode & FMODE_WRITE)) return -EPERM; @@ -432,6 +444,8 @@ int err; unsigned int in_len, out_len, bytes, opcode, cmdlen; char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE]; + unsigned char tmpcmd[sizeof(rq->__cmd)]; + unsigned char *cmdptr; if (!sic) return -EINVAL; @@ -465,9 +479,18 @@ */ err = -EFAULT; rq->cmd_len = cmdlen; - if (copy_from_user(rq->cmd, sic->data, cmdlen)) + + if (rq->cmd != rq->__cmd) + cmdptr = rq->cmd; + else + cmdptr = tmpcmd; + + if (copy_from_user(cmdptr, sic->data, cmdlen)) goto error; + if (rq->cmd != cmdptr) + memcpy(rq->cmd, cmdptr, cmdlen); + if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) goto error; diff -uriN linux-2.6.38.4/Documentation/Changes linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/Documentation/Changes --- linux-2.6.38.4/Documentation/Changes 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/Documentation/Changes 2011-05-02 04:32:08.000000000 -0500 @@ -36,6 +36,7 @@ o e2fsprogs 1.41.4 # e2fsck -V o jfsutils 1.1.3 # fsck.jfs -V o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1|grep reiserfsprogs +o reiser4progs 1.0.0 # fsck.reiser4 -V o xfsprogs 2.6.0 # xfs_db -V o squashfs-tools 4.0 # mksquashfs -version o btrfs-progs 0.18 # btrfsck @@ -157,6 +158,13 @@ versions of mkreiserfs, resize_reiserfs, debugreiserfs and reiserfsck. These utils work on both i386 and alpha platforms. +Reiser4progs +------------ + +The reiser4progs package contains utilities for the reiser4 file system. +Detailed instructions are provided in the README file located at: +. + Xfsprogs -------- @@ -345,6 +353,10 @@ ------------- o +Reiser4progs +------------ +o + Xfsprogs -------- o diff -uriN linux-2.6.38.4/Documentation/dontdiff linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/Documentation/dontdiff --- linux-2.6.38.4/Documentation/dontdiff 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/Documentation/dontdiff 2011-05-01 17:02:10.000000000 -0500 @@ -3,6 +3,7 @@ *.bin *.cpio *.csp +*.dbg *.dsp *.dvi *.elf @@ -38,8 +39,10 @@ *.tab.h *.tex *.ver +*.vim *.xml *_MODULES +*_reg_safe.h *_vga16.c *~ *.9 @@ -49,11 +52,16 @@ 53c700_d.h CVS ChangeSet +GPATH +GRTAGS +GSYMS +GTAGS Image Kerntypes Module.markers Module.symvers PENDING +PERF* SCCS System.map* TAGS @@ -82,6 +90,8 @@ bzImage* capflags.c classlist.h* +clut_vga16.c +common-cmds.h comp*.log compile.h* conf @@ -106,16 +116,19 @@ fore200e_pca_fw.c* gconf gen-devlist +gen-kdb_cmds.c gen_crc32table gen_init_cpio generated genheaders genksyms *_gray256.c +hash ihex2fw ikconfig.h* inat-tables.c initramfs_data.cpio +initramfs_data.cpio.bz2 initramfs_data.cpio.gz initramfs_list int16.c @@ -125,7 +138,6 @@ int4.c int8.c kallsyms -kconfig keywords.c ksym.c* ksym.h* @@ -149,7 +161,9 @@ mkbugboot mkcpustr mkdep +mkpiggy mkprep +mkregtable mktables mktree modpost @@ -165,6 +179,7 @@ patches* pca200e.bin pca200e_ecd.bin2 +perf-archive piggy.gz piggyback piggy.S @@ -180,6 +195,7 @@ raid6altivec*.c raid6int*.c raid6tables.c +regdb.c relocs rn50_reg_safe.h rs600_reg_safe.h @@ -189,6 +205,7 @@ setup.bin setup.elf sImage +slabinfo sm_tbl* split-include syscalltab.h @@ -213,13 +230,17 @@ vmlinux vmlinux-* vmlinux.aout +vmlinux.bin.all +vmlinux.bin.bz2 vmlinux.lds +vmlinux.relocs voffset.h vsyscall.lds vsyscall_32.lds wanxlfw.inc uImage unifdef +utsrelease.h wakeup.bin wakeup.elf wakeup.lds diff -uriN linux-2.6.38.4/Documentation/filesystems/reiser4.txt linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/Documentation/filesystems/reiser4.txt --- linux-2.6.38.4/Documentation/filesystems/reiser4.txt 1969-12-31 18:00:00.000000000 -0600 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/Documentation/filesystems/reiser4.txt 2011-05-02 04:32:08.000000000 -0500 @@ -0,0 +1,75 @@ +Reiser4 filesystem +================== +Reiser4 is a file system based on dancing tree algorithms, and is +described at http://www.namesys.com + + +References +========== +web page http://namesys.com/v4/v4.html +source code ftp://ftp.namesys.com/pub/reiser4-for-2.6/ +userland tools ftp://ftp.namesys.com/pub/reiser4progs/ +install page http://www.namesys.com/install_v4.html + +Compile options +=============== +Enable reiser4 debug mode + This checks everything imaginable while reiser4 + runs + +Mount options +============= +tmgr.atom_max_size=N + Atoms containing more than N blocks will be forced to commit. + N is decimal. + Default is nr_free_pagecache_pages() / 2 at mount time. + +tmgr.atom_max_age=N + Atoms older than N seconds will be forced to commit. N is decimal. + Default is 600. + +tmgr.atom_max_flushers=N + Limit of concurrent flushers for one atom. 0 means no limit. + Default is 0. + +tree.cbk_cache.nr_slots=N + Number of slots in the cbk cache. + +flush.relocate_threshold=N + If flush finds more than N adjacent dirty leaf-level blocks it + will force them to be relocated. + Default is 64. + +flush.relocate_distance=N + If flush finds can find a block allocation closer than at most + N from the preceder it will relocate to that position. + Default is 64. + +flush.scan_maxnodes=N + The maximum number of nodes to scan left on a level during + flush. + Default is 10000. + +optimal_io_size=N + Preferred IO size. This value is used to set st_blksize of + struct stat. + Default is 65536. + +bsdgroups + Turn on BSD-style gid assignment. + +32bittimes + By default file in reiser4 have 64 bit timestamps. Files + created when filesystem is mounted with 32bittimes mount + option will get 32 bit timestamps. + +mtflush + Turn off concurrent flushing. + +nopseudo + Disable pseudo files support. See + http://namesys.com/v4/pseudo.html for more about pseudo files. + +dont_load_bitmap + Don't load all bitmap blocks at mount time, it is useful for + machines with tiny RAM and large disks. diff -uriN linux-2.6.38.4/Documentation/filesystems/sysfs.txt linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/Documentation/filesystems/sysfs.txt --- linux-2.6.38.4/Documentation/filesystems/sysfs.txt 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/Documentation/filesystems/sysfs.txt 2011-05-01 17:02:10.000000000 -0500 @@ -123,8 +123,8 @@ show and store methods of the attribute owners. struct sysfs_ops { - ssize_t (*show)(struct kobject *, struct attribute *, char *); - ssize_t (*store)(struct kobject *, struct attribute *, const char *, size_t); + ssize_t (* const show)(struct kobject *, struct attribute *, char *); + ssize_t (* const store)(struct kobject *, struct attribute *, const char *, size_t); }; [ Subsystems should have already defined a struct kobj_type as a diff -uriN linux-2.6.38.4/Documentation/kernel-parameters.txt linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/Documentation/kernel-parameters.txt --- linux-2.6.38.4/Documentation/kernel-parameters.txt 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/Documentation/kernel-parameters.txt 2011-05-01 17:02:10.000000000 -0500 @@ -1853,6 +1853,13 @@ the specified number of seconds. This is to be used if your oopses keep scrolling off the screen. + pax_nouderef [X86] disables UDEREF. Most likely needed under certain + virtualization environments that don't cope well with the + expand down segment used by UDEREF on X86-32 or the frequent + page table updates on X86-64. + + pax_softmode= 0/1 to disable/enable PaX softmode on boot already. + pcbit= [HW,ISDN] pcd. [PARIDE] diff -uriN linux-2.6.38.4/Documentation/vserver/debug.txt linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/Documentation/vserver/debug.txt --- linux-2.6.38.4/Documentation/vserver/debug.txt 1969-12-31 18:00:00.000000000 -0600 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/Documentation/vserver/debug.txt 2011-05-01 17:01:51.000000000 -0500 @@ -0,0 +1,154 @@ + +debug_cvirt: + + 2 4 "vx_map_tgid: %p/%llx: %d -> %d" + "vx_rmap_tgid: %p/%llx: %d -> %d" + +debug_dlim: + + 0 1 "ALLOC (%p,#%d)%c inode (%d)" + "FREE (%p,#%d)%c inode" + 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)" + "FREE (%p,#%d)%c %lld bytes" + 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]" + 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d" + "ext3_has_free_blocks(%p): free=%lu, root=%lu" + "rcu_free_dl_info(%p)" + 4 10 "alloc_dl_info(%p,%d) = %p" + "dealloc_dl_info(%p)" + "get_dl_info(%p[#%d.%d])" + "put_dl_info(%p[#%d.%d])" + 5 20 "alloc_dl_info(%p,%d)*" + 6 40 "__hash_dl_info: %p[#%d]" + "__unhash_dl_info: %p[#%d]" + 7 80 "locate_dl_info(%p,#%d) = %p" + +debug_misc: + + 0 1 "destroy_dqhash: %p [#0x%08x] c=%d" + "new_dqhash: %p [#0x%08x]" + "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]" + "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]" + "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]" + "vroot_get_real_bdev not set" + 1 2 "cow_break_link(»%s«)" + "temp copy »%s«" + 2 4 "dentry_open(new): %p" + "dentry_open(old): %p" + "lookup_create(new): %p" + "old path »%s«" + "path_lookup(old): %d" + "vfs_create(new): %d" + "vfs_rename: %d" + "vfs_sendfile: %d" + 3 8 "fput(new_file=%p[#%d])" + "fput(old_file=%p[#%d])" + 4 10 "vx_info_kill(%p[#%d],%d,%d) = %d" + "vx_info_kill(%p[#%d],%d,%d)*" + 5 20 "vs_reboot(%p[#%d],%d)" + 6 40 "dropping task %p[#%u,%u] for %p[#%u,%u]" + +debug_net: + + 2 4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d" + 3 8 "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d" + "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d" + 4 10 "ip_route_connect(%p) %p,%p;%lx" + 5 20 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx" + 6 40 "sk,egf: %p [#%d] (from %d)" + "sk,egn: %p [#%d] (from %d)" + "sk,req: %p [#%d] (from %d)" + "sk: %p [#%d] (from %d)" + "tw: %p [#%d] (from %d)" + 7 80 "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d" + "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d" + +debug_nid: + + 0 1 "__lookup_nx_info(#%u): %p[#%u]" + "alloc_nx_info(%d) = %p" + "create_nx_info(%d) (dynamic rejected)" + "create_nx_info(%d) = %p (already there)" + "create_nx_info(%d) = %p (new)" + "dealloc_nx_info(%p)" + 1 2 "alloc_nx_info(%d)*" + "create_nx_info(%d)*" + 2 4 "get_nx_info(%p[#%d.%d])" + "put_nx_info(%p[#%d.%d])" + 3 8 "claim_nx_info(%p[#%d.%d.%d]) %p" + "clr_nx_info(%p[#%d.%d])" + "init_nx_info(%p[#%d.%d])" + "release_nx_info(%p[#%d.%d.%d]) %p" + "set_nx_info(%p[#%d.%d])" + 4 10 "__hash_nx_info: %p[#%d]" + "__nx_dynamic_id: [#%d]" + "__unhash_nx_info: %p[#%d.%d.%d]" + 5 20 "moved task %p into nxi:%p[#%d]" + "nx_migrate_task(%p,%p[#%d.%d.%d])" + "task_get_nx_info(%p)" + 6 40 "nx_clear_persistent(%p[#%d])" + +debug_quota: + + 0 1 "quota_sync_dqh(%p,%d) discard inode %p" + 1 2 "quota_sync_dqh(%p,%d)" + "sync_dquots(%p,%d)" + "sync_dquots_dqh(%p,%d)" + 3 8 "do_quotactl(%p,%d,cmd=%d,id=%d,%p)" + +debug_switch: + + 0 1 "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]" + 1 2 "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]" + 4 10 "%s: (%s %s) returned %s with %d" + +debug_tag: + + 7 80 "dx_parse_tag(»%s«): %d:#%d" + "dx_propagate_tag(%p[#%lu.%d]): %d,%d" + +debug_xid: + + 0 1 "__lookup_vx_info(#%u): %p[#%u]" + "alloc_vx_info(%d) = %p" + "alloc_vx_info(%d)*" + "create_vx_info(%d) (dynamic rejected)" + "create_vx_info(%d) = %p (already there)" + "create_vx_info(%d) = %p (new)" + "dealloc_vx_info(%p)" + "loc_vx_info(%d) = %p (found)" + "loc_vx_info(%d) = %p (new)" + "loc_vx_info(%d) = %p (not available)" + 1 2 "create_vx_info(%d)*" + "loc_vx_info(%d)*" + 2 4 "get_vx_info(%p[#%d.%d])" + "put_vx_info(%p[#%d.%d])" + 3 8 "claim_vx_info(%p[#%d.%d.%d]) %p" + "clr_vx_info(%p[#%d.%d])" + "init_vx_info(%p[#%d.%d])" + "release_vx_info(%p[#%d.%d.%d]) %p" + "set_vx_info(%p[#%d.%d])" + 4 10 "__hash_vx_info: %p[#%d]" + "__unhash_vx_info: %p[#%d.%d.%d]" + "__vx_dynamic_id: [#%d]" + 5 20 "enter_vx_info(%p[#%d],%p) %p[#%d,%p]" + "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]" + "moved task %p into vxi:%p[#%d]" + "task_get_vx_info(%p)" + "vx_migrate_task(%p,%p[#%d.%d])" + 6 40 "vx_clear_persistent(%p[#%d])" + "vx_exit_init(%p[#%d],%p[#%d,%d,%d])" + "vx_set_init(%p[#%d],%p[#%d,%d,%d])" + "vx_set_persistent(%p[#%d])" + "vx_set_reaper(%p[#%d],%p[#%d,%d])" + 7 80 "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]" + + +debug_limit: + + n 2^n "vx_acc_cres[%5d,%s,%2d]: %5d%s" + "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d" + + m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s" + "vx_acc_pages[%5d,%s,%2d]: %5d += %5d" + "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d" diff -uriN linux-2.6.38.4/drivers/acpi/battery.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/battery.c --- linux-2.6.38.4/drivers/acpi/battery.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/battery.c 2011-05-01 17:02:10.000000000 -0500 @@ -862,7 +862,7 @@ } static struct battery_file { - struct file_operations ops; + const struct file_operations ops; mode_t mode; const char *name; } acpi_battery_file[] = { diff -uriN linux-2.6.38.4/drivers/acpi/dock.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/dock.c --- linux-2.6.38.4/drivers/acpi/dock.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/dock.c 2011-05-01 17:02:10.000000000 -0500 @@ -77,7 +77,7 @@ struct list_head list; struct list_head hotplug_list; acpi_handle handle; - struct acpi_dock_ops *ops; + const struct acpi_dock_ops *ops; void *context; }; @@ -589,7 +589,7 @@ * the dock driver after _DCK is executed. */ int -register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops, +register_hotplug_dock_device(acpi_handle handle, const struct acpi_dock_ops *ops, void *context) { struct dock_dependent_device *dd; diff -uriN linux-2.6.38.4/drivers/acpi/ec_sys.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/ec_sys.c --- linux-2.6.38.4/drivers/acpi/ec_sys.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/ec_sys.c 2011-05-01 17:02:10.000000000 -0500 @@ -96,7 +96,7 @@ return count; } -static struct file_operations acpi_ec_io_ops = { +static const struct file_operations acpi_ec_io_ops = { .owner = THIS_MODULE, .open = acpi_ec_open_io, .read = acpi_ec_read_io, diff -uriN linux-2.6.38.4/drivers/acpi/power_meter.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/power_meter.c --- linux-2.6.38.4/drivers/acpi/power_meter.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/power_meter.c 2011-05-01 17:02:10.000000000 -0500 @@ -316,8 +316,6 @@ return res; temp /= 1000; - if (temp < 0) - return -EINVAL; mutex_lock(&resource->lock); resource->trip[attr->index - 7] = temp; diff -uriN linux-2.6.38.4/drivers/acpi/proc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/proc.c --- linux-2.6.38.4/drivers/acpi/proc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/proc.c 2011-05-01 17:02:10.000000000 -0500 @@ -342,19 +342,13 @@ size_t count, loff_t * ppos) { struct list_head *node, *next; - char strbuf[5]; - char str[5] = ""; - unsigned int len = count; - - if (len > 4) - len = 4; - if (len < 0) - return -EFAULT; + char strbuf[5] = {0}; - if (copy_from_user(strbuf, buffer, len)) + if (count > 4) + count = 4; + if (copy_from_user(strbuf, buffer, count)) return -EFAULT; - strbuf[len] = '\0'; - sscanf(strbuf, "%s", str); + strbuf[count] = '\0'; mutex_lock(&acpi_device_lock); list_for_each_safe(node, next, &acpi_wakeup_device_list) { @@ -363,7 +357,7 @@ if (!dev->wakeup.flags.valid) continue; - if (!strncmp(dev->pnp.bus_id, str, 4)) { + if (!strncmp(dev->pnp.bus_id, strbuf, 4)) { if (device_can_wakeup(&dev->dev)) { bool enable = !device_may_wakeup(&dev->dev); device_set_wakeup_enable(&dev->dev, enable); diff -uriN linux-2.6.38.4/drivers/acpi/processor_driver.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/processor_driver.c --- linux-2.6.38.4/drivers/acpi/processor_driver.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/processor_driver.c 2011-05-01 17:02:10.000000000 -0500 @@ -473,7 +473,7 @@ return 0; #endif - BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0)); + BUG_ON(pr->id >= nr_cpu_ids); /* * Buggy BIOS check diff -uriN linux-2.6.38.4/drivers/acpi/processor_idle.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/processor_idle.c --- linux-2.6.38.4/drivers/acpi/processor_idle.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/acpi/processor_idle.c 2011-05-01 17:02:10.000000000 -0500 @@ -121,7 +121,7 @@ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, (void *)1}, - {}, + {} }; diff -uriN linux-2.6.38.4/drivers/ata/acard-ahci.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/acard-ahci.c --- linux-2.6.38.4/drivers/ata/acard-ahci.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/acard-ahci.c 2011-05-01 17:02:10.000000000 -0500 @@ -87,7 +87,7 @@ AHCI_SHT("acard-ahci"), }; -static struct ata_port_operations acard_ops = { +static const struct ata_port_operations acard_ops = { .inherits = &ahci_ops, .qc_prep = acard_ahci_qc_prep, .qc_fill_rtf = acard_ahci_qc_fill_rtf, diff -uriN linux-2.6.38.4/drivers/ata/ahci.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/ahci.c --- linux-2.6.38.4/drivers/ata/ahci.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/ahci.c 2011-05-01 17:02:10.000000000 -0500 @@ -94,17 +94,17 @@ AHCI_SHT("ahci"), }; -static struct ata_port_operations ahci_vt8251_ops = { +static const struct ata_port_operations ahci_vt8251_ops = { .inherits = &ahci_ops, .hardreset = ahci_vt8251_hardreset, }; -static struct ata_port_operations ahci_p5wdh_ops = { +static const struct ata_port_operations ahci_p5wdh_ops = { .inherits = &ahci_ops, .hardreset = ahci_p5wdh_hardreset, }; -static struct ata_port_operations ahci_sb600_ops = { +static const struct ata_port_operations ahci_sb600_ops = { .inherits = &ahci_ops, .softreset = ahci_sb600_softreset, .pmp_softreset = ahci_sb600_softreset, diff -uriN linux-2.6.38.4/drivers/ata/ahci.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/ahci.h --- linux-2.6.38.4/drivers/ata/ahci.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/ahci.h 2011-05-01 17:02:10.000000000 -0500 @@ -309,7 +309,7 @@ .shost_attrs = ahci_shost_attrs, \ .sdev_attrs = ahci_sdev_attrs -extern struct ata_port_operations ahci_ops; +extern const struct ata_port_operations ahci_ops; void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag, u32 opts); diff -uriN linux-2.6.38.4/drivers/ata/ata_generic.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/ata_generic.c --- linux-2.6.38.4/drivers/ata/ata_generic.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/ata_generic.c 2011-05-01 17:02:10.000000000 -0500 @@ -101,7 +101,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations generic_port_ops = { +static const struct ata_port_operations generic_port_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_mode = generic_set_mode, diff -uriN linux-2.6.38.4/drivers/ata/ata_piix.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/ata_piix.c --- linux-2.6.38.4/drivers/ata/ata_piix.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/ata_piix.c 2011-05-01 17:02:10.000000000 -0500 @@ -327,12 +327,12 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations piix_sata_ops = { +static const struct ata_port_operations piix_sata_ops = { .inherits = &ata_bmdma32_port_ops, .sff_irq_check = piix_irq_check, }; -static struct ata_port_operations piix_pata_ops = { +static const struct ata_port_operations piix_pata_ops = { .inherits = &piix_sata_ops, .cable_detect = ata_cable_40wire, .set_piomode = piix_set_piomode, @@ -340,12 +340,12 @@ .prereset = piix_pata_prereset, }; -static struct ata_port_operations piix_vmw_ops = { +static const struct ata_port_operations piix_vmw_ops = { .inherits = &piix_pata_ops, .bmdma_status = piix_vmw_bmdma_status, }; -static struct ata_port_operations ich_pata_ops = { +static const struct ata_port_operations ich_pata_ops = { .inherits = &piix_pata_ops, .cable_detect = ich_pata_cable_detect, .set_dmamode = ich_set_dmamode, @@ -361,7 +361,7 @@ .shost_attrs = piix_sidpr_shost_attrs, }; -static struct ata_port_operations piix_sidpr_sata_ops = { +static const struct ata_port_operations piix_sidpr_sata_ops = { .inherits = &piix_sata_ops, .hardreset = sata_std_hardreset, .scr_read = piix_sidpr_scr_read, diff -uriN linux-2.6.38.4/drivers/ata/libahci.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/libahci.c --- linux-2.6.38.4/drivers/ata/libahci.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/libahci.c 2011-05-01 17:02:10.000000000 -0500 @@ -137,7 +137,7 @@ }; EXPORT_SYMBOL_GPL(ahci_sdev_attrs); -struct ata_port_operations ahci_ops = { +const struct ata_port_operations ahci_ops = { .inherits = &sata_pmp_port_ops, .qc_defer = ahci_pmp_qc_defer, diff -uriN linux-2.6.38.4/drivers/ata/libata-acpi.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/libata-acpi.c --- linux-2.6.38.4/drivers/ata/libata-acpi.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/libata-acpi.c 2011-05-01 17:02:10.000000000 -0500 @@ -218,12 +218,12 @@ ata_acpi_uevent(dev->link->ap, dev, event); } -static struct acpi_dock_ops ata_acpi_dev_dock_ops = { +static const struct acpi_dock_ops ata_acpi_dev_dock_ops = { .handler = ata_acpi_dev_notify_dock, .uevent = ata_acpi_dev_uevent, }; -static struct acpi_dock_ops ata_acpi_ap_dock_ops = { +static const struct acpi_dock_ops ata_acpi_ap_dock_ops = { .handler = ata_acpi_ap_notify_dock, .uevent = ata_acpi_ap_uevent, }; diff -uriN linux-2.6.38.4/drivers/ata/libata-core.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/libata-core.c --- linux-2.6.38.4/drivers/ata/libata-core.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/libata-core.c 2011-05-01 17:02:10.000000000 -0500 @@ -4746,7 +4746,7 @@ struct ata_port *ap; unsigned int tag; - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */ + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */ ap = qc->ap; qc->flags = 0; @@ -4762,7 +4762,7 @@ struct ata_port *ap; struct ata_link *link; - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */ + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */ WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE)); ap = qc->ap; link = qc->dev->link; @@ -5755,7 +5755,7 @@ * LOCKING: * None. */ -static void ata_finalize_port_ops(struct ata_port_operations *ops) +static void ata_finalize_port_ops(const struct ata_port_operations *ops) { static DEFINE_SPINLOCK(lock); const struct ata_port_operations *cur; @@ -5767,6 +5767,7 @@ return; spin_lock(&lock); + pax_open_kernel(); for (cur = ops->inherits; cur; cur = cur->inherits) { void **inherit = (void **)cur; @@ -5780,8 +5781,9 @@ if (IS_ERR(*pp)) *pp = NULL; - ops->inherits = NULL; + ((struct ata_port_operations *)ops)->inherits = NULL; + pax_close_kernel(); spin_unlock(&lock); } @@ -5878,7 +5880,7 @@ */ /* KILLME - the only user left is ipr */ void ata_host_init(struct ata_host *host, struct device *dev, - unsigned long flags, struct ata_port_operations *ops) + unsigned long flags, const struct ata_port_operations *ops) { spin_lock_init(&host->lock); mutex_init(&host->eh_mutex); @@ -6584,7 +6586,7 @@ /* truly dummy */ } -struct ata_port_operations ata_dummy_port_ops = { +const struct ata_port_operations ata_dummy_port_ops = { .qc_prep = ata_noop_qc_prep, .qc_issue = ata_dummy_qc_issue, .error_handler = ata_dummy_error_handler, diff -uriN linux-2.6.38.4/drivers/ata/libata-eh.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/libata-eh.c --- linux-2.6.38.4/drivers/ata/libata-eh.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/libata-eh.c 2011-05-01 17:02:10.000000000 -0500 @@ -3880,7 +3880,7 @@ */ void ata_std_error_handler(struct ata_port *ap) { - struct ata_port_operations *ops = ap->ops; + const struct ata_port_operations *ops = ap->ops; ata_reset_fn_t hardreset = ops->hardreset; /* ignore built-in hardreset if SCR access is not available */ diff -uriN linux-2.6.38.4/drivers/ata/libata-pmp.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/libata-pmp.c --- linux-2.6.38.4/drivers/ata/libata-pmp.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/libata-pmp.c 2011-05-01 17:02:10.000000000 -0500 @@ -912,7 +912,7 @@ */ static int sata_pmp_eh_recover(struct ata_port *ap) { - struct ata_port_operations *ops = ap->ops; + const struct ata_port_operations *ops = ap->ops; int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; struct ata_link *pmp_link = &ap->link; struct ata_device *pmp_dev = pmp_link->device; diff -uriN linux-2.6.38.4/drivers/ata/pata_acpi.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_acpi.c --- linux-2.6.38.4/drivers/ata/pata_acpi.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_acpi.c 2011-05-01 17:02:10.000000000 -0500 @@ -216,7 +216,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations pacpi_ops = { +static const struct ata_port_operations pacpi_ops = { .inherits = &ata_bmdma_port_ops, .qc_issue = pacpi_qc_issue, .cable_detect = pacpi_cable_detect, diff -uriN linux-2.6.38.4/drivers/ata/pata_ali.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_ali.c --- linux-2.6.38.4/drivers/ata/pata_ali.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_ali.c 2011-05-01 17:02:10.000000000 -0500 @@ -363,7 +363,7 @@ * Port operations for PIO only ALi */ -static struct ata_port_operations ali_early_port_ops = { +static const struct ata_port_operations ali_early_port_ops = { .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = ali_set_piomode, @@ -380,7 +380,7 @@ * Port operations for DMA capable ALi without cable * detect */ -static struct ata_port_operations ali_20_port_ops = { +static const struct ata_port_operations ali_20_port_ops = { .inherits = &ali_dma_base_ops, .cable_detect = ata_cable_40wire, .mode_filter = ali_20_filter, @@ -391,7 +391,7 @@ /* * Port operations for DMA capable ALi with cable detect */ -static struct ata_port_operations ali_c2_port_ops = { +static const struct ata_port_operations ali_c2_port_ops = { .inherits = &ali_dma_base_ops, .check_atapi_dma = ali_check_atapi_dma, .cable_detect = ali_c2_cable_detect, @@ -402,7 +402,7 @@ /* * Port operations for DMA capable ALi with cable detect */ -static struct ata_port_operations ali_c4_port_ops = { +static const struct ata_port_operations ali_c4_port_ops = { .inherits = &ali_dma_base_ops, .check_atapi_dma = ali_check_atapi_dma, .cable_detect = ali_c2_cable_detect, @@ -412,7 +412,7 @@ /* * Port operations for DMA capable ALi with cable detect and LBA48 */ -static struct ata_port_operations ali_c5_port_ops = { +static const struct ata_port_operations ali_c5_port_ops = { .inherits = &ali_dma_base_ops, .check_atapi_dma = ali_check_atapi_dma, .dev_config = ali_warn_atapi_dma, diff -uriN linux-2.6.38.4/drivers/ata/pata_amd.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_amd.c --- linux-2.6.38.4/drivers/ata/pata_amd.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_amd.c 2011-05-01 17:02:10.000000000 -0500 @@ -397,28 +397,28 @@ .prereset = amd_pre_reset, }; -static struct ata_port_operations amd33_port_ops = { +static const struct ata_port_operations amd33_port_ops = { .inherits = &amd_base_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = amd33_set_piomode, .set_dmamode = amd33_set_dmamode, }; -static struct ata_port_operations amd66_port_ops = { +static const struct ata_port_operations amd66_port_ops = { .inherits = &amd_base_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = amd66_set_piomode, .set_dmamode = amd66_set_dmamode, }; -static struct ata_port_operations amd100_port_ops = { +static const struct ata_port_operations amd100_port_ops = { .inherits = &amd_base_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = amd100_set_piomode, .set_dmamode = amd100_set_dmamode, }; -static struct ata_port_operations amd133_port_ops = { +static const struct ata_port_operations amd133_port_ops = { .inherits = &amd_base_port_ops, .cable_detect = amd_cable_detect, .set_piomode = amd133_set_piomode, @@ -433,13 +433,13 @@ .host_stop = nv_host_stop, }; -static struct ata_port_operations nv100_port_ops = { +static const struct ata_port_operations nv100_port_ops = { .inherits = &nv_base_port_ops, .set_piomode = nv100_set_piomode, .set_dmamode = nv100_set_dmamode, }; -static struct ata_port_operations nv133_port_ops = { +static const struct ata_port_operations nv133_port_ops = { .inherits = &nv_base_port_ops, .set_piomode = nv133_set_piomode, .set_dmamode = nv133_set_dmamode, diff -uriN linux-2.6.38.4/drivers/ata/pata_artop.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_artop.c --- linux-2.6.38.4/drivers/ata/pata_artop.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_artop.c 2011-05-01 17:02:10.000000000 -0500 @@ -312,7 +312,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations artop6210_ops = { +static const struct ata_port_operations artop6210_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = artop6210_set_piomode, @@ -321,7 +321,7 @@ .qc_defer = artop6210_qc_defer, }; -static struct ata_port_operations artop6260_ops = { +static const struct ata_port_operations artop6260_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = artop6260_cable_detect, .set_piomode = artop6260_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_at32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_at32.c --- linux-2.6.38.4/drivers/ata/pata_at32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_at32.c 2011-05-01 17:02:10.000000000 -0500 @@ -173,7 +173,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations at32_port_ops = { +static const struct ata_port_operations at32_port_ops = { .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = pata_at32_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_at91.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_at91.c --- linux-2.6.38.4/drivers/ata/pata_at91.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_at91.c 2011-05-01 17:02:10.000000000 -0500 @@ -196,7 +196,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations pata_at91_port_ops = { +static const struct ata_port_operations pata_at91_port_ops = { .inherits = &ata_sff_port_ops, .sff_data_xfer = pata_at91_data_xfer_noirq, diff -uriN linux-2.6.38.4/drivers/ata/pata_atiixp.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_atiixp.c --- linux-2.6.38.4/drivers/ata/pata_atiixp.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_atiixp.c 2011-05-01 17:02:10.000000000 -0500 @@ -214,7 +214,7 @@ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; -static struct ata_port_operations atiixp_port_ops = { +static const struct ata_port_operations atiixp_port_ops = { .inherits = &ata_bmdma_port_ops, .qc_prep = ata_bmdma_dumb_qc_prep, diff -uriN linux-2.6.38.4/drivers/ata/pata_atp867x.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_atp867x.c --- linux-2.6.38.4/drivers/ata/pata_atp867x.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_atp867x.c 2011-05-01 17:02:10.000000000 -0500 @@ -275,7 +275,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations atp867x_ops = { +static const struct ata_port_operations atp867x_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = atp867x_cable_detect, .set_piomode = atp867x_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_bf54x.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_bf54x.c --- linux-2.6.38.4/drivers/ata/pata_bf54x.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_bf54x.c 2011-05-01 17:02:10.000000000 -0500 @@ -1420,7 +1420,7 @@ .dma_boundary = ATA_DMA_BOUNDARY, }; -static struct ata_port_operations bfin_pata_ops = { +static const struct ata_port_operations bfin_pata_ops = { .inherits = &ata_bmdma_port_ops, .set_piomode = bfin_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_cmd640.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cmd640.c --- linux-2.6.38.4/drivers/ata/pata_cmd640.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cmd640.c 2011-05-01 17:02:10.000000000 -0500 @@ -176,7 +176,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations cmd640_port_ops = { +static const struct ata_port_operations cmd640_port_ops = { .inherits = &ata_sff_port_ops, /* In theory xfer_noirq is not needed once we kill the prefetcher */ .sff_data_xfer = ata_sff_data_xfer_noirq, diff -uriN linux-2.6.38.4/drivers/ata/pata_cmd64x.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cmd64x.c --- linux-2.6.38.4/drivers/ata/pata_cmd64x.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cmd64x.c 2011-05-01 17:02:10.000000000 -0500 @@ -268,18 +268,18 @@ .set_dmamode = cmd64x_set_dmamode, }; -static struct ata_port_operations cmd64x_port_ops = { +static const struct ata_port_operations cmd64x_port_ops = { .inherits = &cmd64x_base_ops, .cable_detect = ata_cable_40wire, }; -static struct ata_port_operations cmd646r1_port_ops = { +static const struct ata_port_operations cmd646r1_port_ops = { .inherits = &cmd64x_base_ops, .bmdma_stop = cmd646r1_bmdma_stop, .cable_detect = ata_cable_40wire, }; -static struct ata_port_operations cmd648_port_ops = { +static const struct ata_port_operations cmd648_port_ops = { .inherits = &cmd64x_base_ops, .bmdma_stop = cmd648_bmdma_stop, .cable_detect = cmd648_cable_detect, diff -uriN linux-2.6.38.4/drivers/ata/pata_cs5520.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cs5520.c --- linux-2.6.38.4/drivers/ata/pata_cs5520.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cs5520.c 2011-05-01 17:02:10.000000000 -0500 @@ -108,7 +108,7 @@ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; -static struct ata_port_operations cs5520_port_ops = { +static const struct ata_port_operations cs5520_port_ops = { .inherits = &ata_bmdma_port_ops, .qc_prep = ata_bmdma_dumb_qc_prep, .cable_detect = ata_cable_40wire, diff -uriN linux-2.6.38.4/drivers/ata/pata_cs5530.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cs5530.c --- linux-2.6.38.4/drivers/ata/pata_cs5530.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cs5530.c 2011-05-01 17:02:10.000000000 -0500 @@ -164,7 +164,7 @@ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; -static struct ata_port_operations cs5530_port_ops = { +static const struct ata_port_operations cs5530_port_ops = { .inherits = &ata_bmdma_port_ops, .qc_prep = ata_bmdma_dumb_qc_prep, diff -uriN linux-2.6.38.4/drivers/ata/pata_cs5535.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cs5535.c --- linux-2.6.38.4/drivers/ata/pata_cs5535.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cs5535.c 2011-05-01 17:02:10.000000000 -0500 @@ -160,7 +160,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations cs5535_port_ops = { +static const struct ata_port_operations cs5535_port_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = cs5535_cable_detect, .set_piomode = cs5535_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_cs5536.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cs5536.c --- linux-2.6.38.4/drivers/ata/pata_cs5536.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cs5536.c 2011-05-01 17:02:10.000000000 -0500 @@ -233,7 +233,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations cs5536_port_ops = { +static const struct ata_port_operations cs5536_port_ops = { .inherits = &ata_bmdma32_port_ops, .cable_detect = cs5536_cable_detect, .set_piomode = cs5536_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_cypress.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cypress.c --- linux-2.6.38.4/drivers/ata/pata_cypress.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_cypress.c 2011-05-01 17:02:10.000000000 -0500 @@ -115,7 +115,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations cy82c693_port_ops = { +static const struct ata_port_operations cy82c693_port_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = cy82c693_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_efar.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_efar.c --- linux-2.6.38.4/drivers/ata/pata_efar.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_efar.c 2011-05-01 17:02:10.000000000 -0500 @@ -238,7 +238,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations efar_ops = { +static const struct ata_port_operations efar_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = efar_cable_detect, .set_piomode = efar_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_hpt366.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_hpt366.c --- linux-2.6.38.4/drivers/ata/pata_hpt366.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_hpt366.c 2011-05-01 17:02:10.000000000 -0500 @@ -275,7 +275,7 @@ * Configuration for HPT366/68 */ -static struct ata_port_operations hpt366_port_ops = { +static const struct ata_port_operations hpt366_port_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = hpt36x_cable_detect, .mode_filter = hpt366_filter, diff -uriN linux-2.6.38.4/drivers/ata/pata_hpt37x.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_hpt37x.c --- linux-2.6.38.4/drivers/ata/pata_hpt37x.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_hpt37x.c 2011-05-01 17:02:10.000000000 -0500 @@ -587,7 +587,7 @@ * Configuration for HPT370 */ -static struct ata_port_operations hpt370_port_ops = { +static const struct ata_port_operations hpt370_port_ops = { .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt370_bmdma_stop, @@ -603,7 +603,7 @@ * Configuration for HPT370A. Close to 370 but less filters */ -static struct ata_port_operations hpt370a_port_ops = { +static const struct ata_port_operations hpt370a_port_ops = { .inherits = &hpt370_port_ops, .mode_filter = hpt370a_filter, }; @@ -613,7 +613,7 @@ * mode setting functionality. */ -static struct ata_port_operations hpt302_port_ops = { +static const struct ata_port_operations hpt302_port_ops = { .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt37x_bmdma_stop, @@ -629,7 +629,7 @@ * but we have a mode filter. */ -static struct ata_port_operations hpt372_port_ops = { +static const struct ata_port_operations hpt372_port_ops = { .inherits = &hpt302_port_ops, .mode_filter = hpt372_filter, }; @@ -639,7 +639,7 @@ * but we have a different cable detection procedure for function 1. */ -static struct ata_port_operations hpt374_fn1_port_ops = { +static const struct ata_port_operations hpt374_fn1_port_ops = { .inherits = &hpt372_port_ops, .cable_detect = hpt374_fn1_cable_detect, }; diff -uriN linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_hpt3x2n.c --- linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_hpt3x2n.c 2011-05-01 17:02:10.000000000 -0500 @@ -348,7 +348,7 @@ * Configuration for HPT302N/371N. */ -static struct ata_port_operations hpt3xxn_port_ops = { +static const struct ata_port_operations hpt3xxn_port_ops = { .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt3x2n_bmdma_stop, @@ -366,7 +366,7 @@ * Configuration for HPT372N. Same as 302N/371N but we have a mode filter. */ -static struct ata_port_operations hpt372n_port_ops = { +static const struct ata_port_operations hpt372n_port_ops = { .inherits = &hpt3xxn_port_ops, .mode_filter = &hpt372n_filter, }; diff -uriN linux-2.6.38.4/drivers/ata/pata_hpt3x3.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_hpt3x3.c --- linux-2.6.38.4/drivers/ata/pata_hpt3x3.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_hpt3x3.c 2011-05-01 17:02:10.000000000 -0500 @@ -141,7 +141,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations hpt3x3_port_ops = { +static const struct ata_port_operations hpt3x3_port_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = hpt3x3_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_icside.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_icside.c --- linux-2.6.38.4/drivers/ata/pata_icside.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_icside.c 2011-05-01 17:02:10.000000000 -0500 @@ -320,7 +320,7 @@ } } -static struct ata_port_operations pata_icside_port_ops = { +static const struct ata_port_operations pata_icside_port_ops = { .inherits = &ata_bmdma_port_ops, /* no need to build any PRD tables for DMA */ .qc_prep = ata_noop_qc_prep, diff -uriN linux-2.6.38.4/drivers/ata/pata_isapnp.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_isapnp.c --- linux-2.6.38.4/drivers/ata/pata_isapnp.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_isapnp.c 2011-05-01 17:02:10.000000000 -0500 @@ -23,12 +23,12 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations isapnp_port_ops = { +static const struct ata_port_operations isapnp_port_ops = { .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, }; -static struct ata_port_operations isapnp_noalt_port_ops = { +static const struct ata_port_operations isapnp_noalt_port_ops = { .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, /* No altstatus so we don't want to use the lost interrupt poll */ diff -uriN linux-2.6.38.4/drivers/ata/pata_it8213.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_it8213.c --- linux-2.6.38.4/drivers/ata/pata_it8213.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_it8213.c 2011-05-01 17:02:10.000000000 -0500 @@ -233,7 +233,7 @@ }; -static struct ata_port_operations it8213_ops = { +static const struct ata_port_operations it8213_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = it8213_cable_detect, .set_piomode = it8213_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_it821x.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_it821x.c --- linux-2.6.38.4/drivers/ata/pata_it821x.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_it821x.c 2011-05-01 17:02:10.000000000 -0500 @@ -801,7 +801,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations it821x_smart_port_ops = { +static const struct ata_port_operations it821x_smart_port_ops = { .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, @@ -815,7 +815,7 @@ .port_start = it821x_port_start, }; -static struct ata_port_operations it821x_passthru_port_ops = { +static const struct ata_port_operations it821x_passthru_port_ops = { .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, @@ -831,7 +831,7 @@ .port_start = it821x_port_start, }; -static struct ata_port_operations it821x_rdc_port_ops = { +static const struct ata_port_operations it821x_rdc_port_ops = { .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, diff -uriN linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_ixp4xx_cf.c --- linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_ixp4xx_cf.c 2011-05-01 17:02:10.000000000 -0500 @@ -89,7 +89,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations ixp4xx_port_ops = { +static const struct ata_port_operations ixp4xx_port_ops = { .inherits = &ata_sff_port_ops, .sff_data_xfer = ixp4xx_mmio_data_xfer, .cable_detect = ata_cable_40wire, diff -uriN linux-2.6.38.4/drivers/ata/pata_jmicron.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_jmicron.c --- linux-2.6.38.4/drivers/ata/pata_jmicron.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_jmicron.c 2011-05-01 17:02:10.000000000 -0500 @@ -111,7 +111,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations jmicron_ops = { +static const struct ata_port_operations jmicron_ops = { .inherits = &ata_bmdma_port_ops, .prereset = jmicron_pre_reset, }; diff -uriN linux-2.6.38.4/drivers/ata/pata_legacy.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_legacy.c --- linux-2.6.38.4/drivers/ata/pata_legacy.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_legacy.c 2011-05-01 17:02:10.000000000 -0500 @@ -116,7 +116,7 @@ struct legacy_controller { const char *name; - struct ata_port_operations *ops; + const struct ata_port_operations *ops; unsigned int pio_mask; unsigned int flags; unsigned int pflags; @@ -239,12 +239,12 @@ * pio_mask as well. */ -static struct ata_port_operations simple_port_ops = { +static const struct ata_port_operations simple_port_ops = { .inherits = &legacy_base_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, }; -static struct ata_port_operations legacy_port_ops = { +static const struct ata_port_operations legacy_port_ops = { .inherits = &legacy_base_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .set_mode = legacy_set_mode, @@ -340,7 +340,7 @@ return buflen; } -static struct ata_port_operations pdc20230_port_ops = { +static const struct ata_port_operations pdc20230_port_ops = { .inherits = &legacy_base_port_ops, .set_piomode = pdc20230_set_piomode, .sff_data_xfer = pdc_data_xfer_vlb, @@ -373,7 +373,7 @@ ioread8(ap->ioaddr.status_addr); } -static struct ata_port_operations ht6560a_port_ops = { +static const struct ata_port_operations ht6560a_port_ops = { .inherits = &legacy_base_port_ops, .set_piomode = ht6560a_set_piomode, }; @@ -416,7 +416,7 @@ ioread8(ap->ioaddr.status_addr); } -static struct ata_port_operations ht6560b_port_ops = { +static const struct ata_port_operations ht6560b_port_ops = { .inherits = &legacy_base_port_ops, .set_piomode = ht6560b_set_piomode, }; @@ -515,7 +515,7 @@ } -static struct ata_port_operations opti82c611a_port_ops = { +static const struct ata_port_operations opti82c611a_port_ops = { .inherits = &legacy_base_port_ops, .set_piomode = opti82c611a_set_piomode, }; @@ -625,7 +625,7 @@ return ata_sff_qc_issue(qc); } -static struct ata_port_operations opti82c46x_port_ops = { +static const struct ata_port_operations opti82c46x_port_ops = { .inherits = &legacy_base_port_ops, .set_piomode = opti82c46x_set_piomode, .qc_issue = opti82c46x_qc_issue, @@ -787,20 +787,20 @@ return 0; } -static struct ata_port_operations qdi6500_port_ops = { +static const struct ata_port_operations qdi6500_port_ops = { .inherits = &legacy_base_port_ops, .set_piomode = qdi6500_set_piomode, .qc_issue = qdi_qc_issue, .sff_data_xfer = vlb32_data_xfer, }; -static struct ata_port_operations qdi6580_port_ops = { +static const struct ata_port_operations qdi6580_port_ops = { .inherits = &legacy_base_port_ops, .set_piomode = qdi6580_set_piomode, .sff_data_xfer = vlb32_data_xfer, }; -static struct ata_port_operations qdi6580dp_port_ops = { +static const struct ata_port_operations qdi6580dp_port_ops = { .inherits = &legacy_base_port_ops, .set_piomode = qdi6580dp_set_piomode, .qc_issue = qdi_qc_issue, @@ -872,7 +872,7 @@ return 0; } -static struct ata_port_operations winbond_port_ops = { +static const struct ata_port_operations winbond_port_ops = { .inherits = &legacy_base_port_ops, .set_piomode = winbond_set_piomode, .sff_data_xfer = vlb32_data_xfer, @@ -995,7 +995,7 @@ int pio_modes = controller->pio_mask; unsigned long io = probe->port; u32 mask = (1 << probe->slot); - struct ata_port_operations *ops = controller->ops; + const struct ata_port_operations *ops = controller->ops; struct legacy_data *ld = &legacy_data[probe->slot]; struct ata_host *host = NULL; struct ata_port *ap; diff -uriN linux-2.6.38.4/drivers/ata/pata_macio.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_macio.c --- linux-2.6.38.4/drivers/ata/pata_macio.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_macio.c 2011-05-01 17:02:10.000000000 -0500 @@ -918,9 +918,8 @@ .slave_configure = pata_macio_slave_config, }; -static struct ata_port_operations pata_macio_ops = { +static const struct ata_port_operations pata_macio_ops = { .inherits = &ata_bmdma_port_ops, - .freeze = pata_macio_freeze, .set_piomode = pata_macio_set_timings, .set_dmamode = pata_macio_set_timings, diff -uriN linux-2.6.38.4/drivers/ata/pata_marvell.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_marvell.c --- linux-2.6.38.4/drivers/ata/pata_marvell.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_marvell.c 2011-05-01 17:02:10.000000000 -0500 @@ -100,7 +100,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations marvell_ops = { +static const struct ata_port_operations marvell_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = marvell_cable_detect, .prereset = marvell_pre_reset, diff -uriN linux-2.6.38.4/drivers/ata/pata_mpc52xx.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_mpc52xx.c --- linux-2.6.38.4/drivers/ata/pata_mpc52xx.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_mpc52xx.c 2011-05-01 17:02:10.000000000 -0500 @@ -609,7 +609,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations mpc52xx_ata_port_ops = { +static const struct ata_port_operations mpc52xx_ata_port_ops = { .inherits = &ata_bmdma_port_ops, .sff_dev_select = mpc52xx_ata_dev_select, .set_piomode = mpc52xx_ata_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_mpiix.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_mpiix.c --- linux-2.6.38.4/drivers/ata/pata_mpiix.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_mpiix.c 2011-05-01 17:02:10.000000000 -0500 @@ -140,7 +140,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations mpiix_port_ops = { +static const struct ata_port_operations mpiix_port_ops = { .inherits = &ata_sff_port_ops, .qc_issue = mpiix_qc_issue, .cable_detect = ata_cable_40wire, diff -uriN linux-2.6.38.4/drivers/ata/pata_netcell.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_netcell.c --- linux-2.6.38.4/drivers/ata/pata_netcell.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_netcell.c 2011-05-01 17:02:10.000000000 -0500 @@ -34,7 +34,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations netcell_ops = { +static const struct ata_port_operations netcell_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_80wire, .read_id = netcell_read_id, diff -uriN linux-2.6.38.4/drivers/ata/pata_ninja32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_ninja32.c --- linux-2.6.38.4/drivers/ata/pata_ninja32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_ninja32.c 2011-05-01 17:02:10.000000000 -0500 @@ -81,7 +81,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations ninja32_port_ops = { +static const struct ata_port_operations ninja32_port_ops = { .inherits = &ata_bmdma_port_ops, .sff_dev_select = ninja32_dev_select, .cable_detect = ata_cable_40wire, diff -uriN linux-2.6.38.4/drivers/ata/pata_ns87410.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_ns87410.c --- linux-2.6.38.4/drivers/ata/pata_ns87410.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_ns87410.c 2011-05-01 17:02:10.000000000 -0500 @@ -132,7 +132,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations ns87410_port_ops = { +static const struct ata_port_operations ns87410_port_ops = { .inherits = &ata_sff_port_ops, .qc_issue = ns87410_qc_issue, .cable_detect = ata_cable_40wire, diff -uriN linux-2.6.38.4/drivers/ata/pata_ns87415.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_ns87415.c --- linux-2.6.38.4/drivers/ata/pata_ns87415.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_ns87415.c 2011-05-01 17:02:10.000000000 -0500 @@ -299,7 +299,7 @@ } #endif /* 87560 SuperIO Support */ -static struct ata_port_operations ns87415_pata_ops = { +static const struct ata_port_operations ns87415_pata_ops = { .inherits = &ata_bmdma_port_ops, .check_atapi_dma = ns87415_check_atapi_dma, @@ -313,7 +313,7 @@ }; #if defined(CONFIG_SUPERIO) -static struct ata_port_operations ns87560_pata_ops = { +static const struct ata_port_operations ns87560_pata_ops = { .inherits = &ns87415_pata_ops, .sff_tf_read = ns87560_tf_read, .sff_check_status = ns87560_check_status, diff -uriN linux-2.6.38.4/drivers/ata/pata_octeon_cf.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_octeon_cf.c --- linux-2.6.38.4/drivers/ata/pata_octeon_cf.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_octeon_cf.c 2011-05-01 17:02:10.000000000 -0500 @@ -780,7 +780,7 @@ return 0; } -static struct ata_port_operations octeon_cf_ops = { +static struct ata_port_operations octeon_cf_ops = { /* cannot be const */ .inherits = &ata_sff_port_ops, .check_atapi_dma = octeon_cf_check_atapi_dma, .qc_prep = ata_noop_qc_prep, diff -uriN linux-2.6.38.4/drivers/ata/pata_oldpiix.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_oldpiix.c --- linux-2.6.38.4/drivers/ata/pata_oldpiix.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_oldpiix.c 2011-05-01 17:02:10.000000000 -0500 @@ -208,7 +208,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations oldpiix_pata_ops = { +static const struct ata_port_operations oldpiix_pata_ops = { .inherits = &ata_bmdma_port_ops, .qc_issue = oldpiix_qc_issue, .cable_detect = ata_cable_40wire, diff -uriN linux-2.6.38.4/drivers/ata/pata_opti.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_opti.c --- linux-2.6.38.4/drivers/ata/pata_opti.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_opti.c 2011-05-01 17:02:10.000000000 -0500 @@ -152,7 +152,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations opti_port_ops = { +static const struct ata_port_operations opti_port_ops = { .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = opti_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_optidma.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_optidma.c --- linux-2.6.38.4/drivers/ata/pata_optidma.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_optidma.c 2011-05-01 17:02:10.000000000 -0500 @@ -337,7 +337,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations optidma_port_ops = { +static const struct ata_port_operations optidma_port_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = optidma_set_pio_mode, @@ -346,7 +346,7 @@ .prereset = optidma_pre_reset, }; -static struct ata_port_operations optiplus_port_ops = { +static const struct ata_port_operations optiplus_port_ops = { .inherits = &optidma_port_ops, .set_piomode = optiplus_set_pio_mode, .set_dmamode = optiplus_set_dma_mode, diff -uriN linux-2.6.38.4/drivers/ata/pata_palmld.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_palmld.c --- linux-2.6.38.4/drivers/ata/pata_palmld.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_palmld.c 2011-05-01 17:02:10.000000000 -0500 @@ -37,7 +37,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations palmld_port_ops = { +static const struct ata_port_operations palmld_port_ops = { .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_40wire, diff -uriN linux-2.6.38.4/drivers/ata/pata_pcmcia.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_pcmcia.c --- linux-2.6.38.4/drivers/ata/pata_pcmcia.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_pcmcia.c 2011-05-01 17:02:10.000000000 -0500 @@ -151,14 +151,14 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations pcmcia_port_ops = { +static const struct ata_port_operations pcmcia_port_ops = { .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_40wire, .set_mode = pcmcia_set_mode, }; -static struct ata_port_operations pcmcia_8bit_port_ops = { +static const struct ata_port_operations pcmcia_8bit_port_ops = { .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_data_xfer_8bit, .cable_detect = ata_cable_40wire, @@ -205,7 +205,7 @@ unsigned long io_base, ctl_base; void __iomem *io_addr, *ctl_addr; int n_ports = 1; - struct ata_port_operations *ops = &pcmcia_port_ops; + const struct ata_port_operations *ops = &pcmcia_port_ops; /* Set up attributes in order to probe card and get resources */ pdev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO | diff -uriN linux-2.6.38.4/drivers/ata/pata_pdc2027x.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_pdc2027x.c --- linux-2.6.38.4/drivers/ata/pata_pdc2027x.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_pdc2027x.c 2011-05-01 17:02:10.000000000 -0500 @@ -132,14 +132,14 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations pdc2027x_pata100_ops = { +static const struct ata_port_operations pdc2027x_pata100_ops = { .inherits = &ata_bmdma_port_ops, .check_atapi_dma = pdc2027x_check_atapi_dma, .cable_detect = pdc2027x_cable_detect, .prereset = pdc2027x_prereset, }; -static struct ata_port_operations pdc2027x_pata133_ops = { +static const struct ata_port_operations pdc2027x_pata133_ops = { .inherits = &pdc2027x_pata100_ops, .mode_filter = pdc2027x_mode_filter, .set_piomode = pdc2027x_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_pdc202xx_old.c --- linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_pdc202xx_old.c 2011-05-01 17:02:10.000000000 -0500 @@ -295,7 +295,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations pdc2024x_port_ops = { +static const struct ata_port_operations pdc2024x_port_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, @@ -306,7 +306,7 @@ .sff_irq_check = pdc202xx_irq_check, }; -static struct ata_port_operations pdc2026x_port_ops = { +static const struct ata_port_operations pdc2026x_port_ops = { .inherits = &pdc2024x_port_ops, .check_atapi_dma = pdc2026x_check_atapi_dma, diff -uriN linux-2.6.38.4/drivers/ata/pata_piccolo.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_piccolo.c --- linux-2.6.38.4/drivers/ata/pata_piccolo.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_piccolo.c 2011-05-01 17:02:10.000000000 -0500 @@ -67,7 +67,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations tosh_port_ops = { +static const struct ata_port_operations tosh_port_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = tosh_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_platform.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_platform.c --- linux-2.6.38.4/drivers/ata/pata_platform.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_platform.c 2011-05-01 17:02:10.000000000 -0500 @@ -48,7 +48,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations pata_platform_port_ops = { +static const struct ata_port_operations pata_platform_port_ops = { .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_unknown, diff -uriN linux-2.6.38.4/drivers/ata/pata_pxa.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_pxa.c --- linux-2.6.38.4/drivers/ata/pata_pxa.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_pxa.c 2011-05-01 17:02:10.000000000 -0500 @@ -198,7 +198,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations pxa_ata_port_ops = { +static const struct ata_port_operations pxa_ata_port_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, diff -uriN linux-2.6.38.4/drivers/ata/pata_qdi.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_qdi.c --- linux-2.6.38.4/drivers/ata/pata_qdi.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_qdi.c 2011-05-01 17:02:10.000000000 -0500 @@ -157,7 +157,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations qdi6500_port_ops = { +static const struct ata_port_operations qdi6500_port_ops = { .inherits = &ata_sff_port_ops, .qc_issue = qdi_qc_issue, .sff_data_xfer = qdi_data_xfer, @@ -165,7 +165,7 @@ .set_piomode = qdi6500_set_piomode, }; -static struct ata_port_operations qdi6580_port_ops = { +static const struct ata_port_operations qdi6580_port_ops = { .inherits = &qdi6500_port_ops, .set_piomode = qdi6580_set_piomode, }; diff -uriN linux-2.6.38.4/drivers/ata/pata_radisys.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_radisys.c --- linux-2.6.38.4/drivers/ata/pata_radisys.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_radisys.c 2011-05-01 17:02:10.000000000 -0500 @@ -187,7 +187,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations radisys_pata_ops = { +static const struct ata_port_operations radisys_pata_ops = { .inherits = &ata_bmdma_port_ops, .qc_issue = radisys_qc_issue, .cable_detect = ata_cable_unknown, diff -uriN linux-2.6.38.4/drivers/ata/pata_rb532_cf.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_rb532_cf.c --- linux-2.6.38.4/drivers/ata/pata_rb532_cf.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_rb532_cf.c 2011-05-01 17:02:10.000000000 -0500 @@ -69,7 +69,7 @@ return IRQ_HANDLED; } -static struct ata_port_operations rb532_pata_port_ops = { +static const struct ata_port_operations rb532_pata_port_ops = { .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer32, }; diff -uriN linux-2.6.38.4/drivers/ata/pata_rdc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_rdc.c --- linux-2.6.38.4/drivers/ata/pata_rdc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_rdc.c 2011-05-01 17:02:10.000000000 -0500 @@ -273,7 +273,7 @@ pci_write_config_byte(dev, 0x48, udma_enable); } -static struct ata_port_operations rdc_pata_ops = { +static const struct ata_port_operations rdc_pata_ops = { .inherits = &ata_bmdma32_port_ops, .cable_detect = rdc_pata_cable_detect, .set_piomode = rdc_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_rz1000.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_rz1000.c --- linux-2.6.38.4/drivers/ata/pata_rz1000.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_rz1000.c 2011-05-01 17:02:10.000000000 -0500 @@ -54,7 +54,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations rz1000_port_ops = { +static const struct ata_port_operations rz1000_port_ops = { .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_mode = rz1000_set_mode, diff -uriN linux-2.6.38.4/drivers/ata/pata_samsung_cf.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_samsung_cf.c --- linux-2.6.38.4/drivers/ata/pata_samsung_cf.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_samsung_cf.c 2011-05-01 17:02:10.000000000 -0500 @@ -399,7 +399,7 @@ ATA_PIO_SHT(DRV_NAME), }; -static struct ata_port_operations pata_s3c_port_ops = { +static const struct ata_port_operations pata_s3c_port_ops = { .inherits = &ata_sff_port_ops, .sff_check_status = pata_s3c_check_status, .sff_check_altstatus = pata_s3c_check_altstatus, @@ -413,7 +413,7 @@ .set_piomode = pata_s3c_set_piomode, }; -static struct ata_port_operations pata_s5p_port_ops = { +static const struct ata_port_operations pata_s5p_port_ops = { .inherits = &ata_sff_port_ops, .set_piomode = pata_s3c_set_piomode, }; diff -uriN linux-2.6.38.4/drivers/ata/pata_sc1200.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_sc1200.c --- linux-2.6.38.4/drivers/ata/pata_sc1200.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_sc1200.c 2011-05-01 17:02:10.000000000 -0500 @@ -207,7 +207,7 @@ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; -static struct ata_port_operations sc1200_port_ops = { +static const struct ata_port_operations sc1200_port_ops = { .inherits = &ata_bmdma_port_ops, .qc_prep = ata_bmdma_dumb_qc_prep, .qc_issue = sc1200_qc_issue, diff -uriN linux-2.6.38.4/drivers/ata/pata_scc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_scc.c --- linux-2.6.38.4/drivers/ata/pata_scc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_scc.c 2011-05-01 17:02:10.000000000 -0500 @@ -926,7 +926,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations scc_pata_ops = { +static const struct ata_port_operations scc_pata_ops = { .inherits = &ata_bmdma_port_ops, .set_piomode = scc_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_sch.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_sch.c --- linux-2.6.38.4/drivers/ata/pata_sch.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_sch.c 2011-05-01 17:02:10.000000000 -0500 @@ -75,7 +75,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations sch_pata_ops = { +static const struct ata_port_operations sch_pata_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = sch_set_piomode, diff -uriN linux-2.6.38.4/drivers/ata/pata_serverworks.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_serverworks.c --- linux-2.6.38.4/drivers/ata/pata_serverworks.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_serverworks.c 2011-05-01 17:02:10.000000000 -0500 @@ -300,7 +300,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations serverworks_osb4_port_ops = { +static const struct ata_port_operations serverworks_osb4_port_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = serverworks_cable_detect, .mode_filter = serverworks_osb4_filter, @@ -308,7 +308,7 @@ .set_dmamode = serverworks_set_dmamode, }; -static struct ata_port_operations serverworks_csb_port_ops = { +static const struct ata_port_operations serverworks_csb_port_ops = { .inherits = &serverworks_osb4_port_ops, .mode_filter = serverworks_csb_filter, }; diff -uriN linux-2.6.38.4/drivers/ata/pata_sil680.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_sil680.c --- linux-2.6.38.4/drivers/ata/pata_sil680.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_sil680.c 2011-05-01 17:02:10.000000000 -0500 @@ -225,8 +225,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; - -static struct ata_port_operations sil680_port_ops = { +static const struct ata_port_operations sil680_port_ops = { .inherits = &ata_bmdma32_port_ops, .sff_exec_command = sil680_sff_exec_command, .sff_irq_check = sil680_sff_irq_check, diff -uriN linux-2.6.38.4/drivers/ata/pata_sis.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_sis.c --- linux-2.6.38.4/drivers/ata/pata_sis.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_sis.c 2011-05-01 17:02:10.000000000 -0500 @@ -503,47 +503,47 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations sis_133_for_sata_ops = { +static const struct ata_port_operations sis_133_for_sata_ops = { .inherits = &ata_bmdma_port_ops, .set_piomode = sis_133_set_piomode, .set_dmamode = sis_133_set_dmamode, .cable_detect = sis_133_cable_detect, }; -static struct ata_port_operations sis_base_ops = { +static const struct ata_port_operations sis_base_ops = { .inherits = &ata_bmdma_port_ops, .prereset = sis_pre_reset, }; -static struct ata_port_operations sis_133_ops = { +static const struct ata_port_operations sis_133_ops = { .inherits = &sis_base_ops, .set_piomode = sis_133_set_piomode, .set_dmamode = sis_133_set_dmamode, .cable_detect = sis_133_cable_detect, }; -static struct ata_port_operations sis_133_early_ops = { +static const struct ata_port_operations sis_133_early_ops = { .inherits = &sis_base_ops, .set_piomode = sis_100_set_piomode, .set_dmamode = sis_133_early_set_dmamode, .cable_detect = sis_66_cable_detect, }; -static struct ata_port_operations sis_100_ops = { +static const struct ata_port_operations sis_100_ops = { .inherits = &sis_base_ops, .set_piomode = sis_100_set_piomode, .set_dmamode = sis_100_set_dmamode, .cable_detect = sis_66_cable_detect, }; -static struct ata_port_operations sis_66_ops = { +static const struct ata_port_operations sis_66_ops = { .inherits = &sis_base_ops, .set_piomode = sis_old_set_piomode, .set_dmamode = sis_66_set_dmamode, .cable_detect = sis_66_cable_detect, }; -static struct ata_port_operations sis_old_ops = { +static const struct ata_port_operations sis_old_ops = { .inherits = &sis_base_ops, .set_piomode = sis_old_set_piomode, .set_dmamode = sis_old_set_dmamode, diff -uriN linux-2.6.38.4/drivers/ata/pata_sl82c105.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_sl82c105.c --- linux-2.6.38.4/drivers/ata/pata_sl82c105.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_sl82c105.c 2011-05-01 17:02:10.000000000 -0500 @@ -241,7 +241,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations sl82c105_port_ops = { +static const struct ata_port_operations sl82c105_port_ops = { .inherits = &ata_bmdma_port_ops, .qc_defer = sl82c105_qc_defer, .bmdma_start = sl82c105_bmdma_start, diff -uriN linux-2.6.38.4/drivers/ata/pata_triflex.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_triflex.c --- linux-2.6.38.4/drivers/ata/pata_triflex.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_triflex.c 2011-05-01 17:02:10.000000000 -0500 @@ -178,7 +178,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations triflex_port_ops = { +static const struct ata_port_operations triflex_port_ops = { .inherits = &ata_bmdma_port_ops, .bmdma_start = triflex_bmdma_start, .bmdma_stop = triflex_bmdma_stop, diff -uriN linux-2.6.38.4/drivers/ata/pata_via.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_via.c --- linux-2.6.38.4/drivers/ata/pata_via.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pata_via.c 2011-05-01 17:02:10.000000000 -0500 @@ -441,7 +441,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations via_port_ops = { +static const struct ata_port_operations via_port_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = via_cable_detect, .set_piomode = via_set_piomode, @@ -452,7 +452,7 @@ .mode_filter = via_mode_filter, }; -static struct ata_port_operations via_port_ops_noirq = { +static const struct ata_port_operations via_port_ops_noirq = { .inherits = &via_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, }; diff -uriN linux-2.6.38.4/drivers/ata/pdc_adma.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pdc_adma.c --- linux-2.6.38.4/drivers/ata/pdc_adma.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/pdc_adma.c 2011-05-01 17:02:10.000000000 -0500 @@ -146,7 +146,7 @@ .dma_boundary = ADMA_DMA_BOUNDARY, }; -static struct ata_port_operations adma_ata_ops = { +static const struct ata_port_operations adma_ata_ops = { .inherits = &ata_sff_port_ops, .lost_interrupt = ATA_OP_NULL, diff -uriN linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_dwc_460ex.c --- linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_dwc_460ex.c 2011-05-01 17:02:10.000000000 -0500 @@ -1560,7 +1560,7 @@ .dma_boundary = ATA_DMA_BOUNDARY, }; -static struct ata_port_operations sata_dwc_ops = { +static const struct ata_port_operations sata_dwc_ops = { .inherits = &ata_sff_port_ops, .error_handler = sata_dwc_error_handler, diff -uriN linux-2.6.38.4/drivers/ata/sata_fsl.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_fsl.c --- linux-2.6.38.4/drivers/ata/sata_fsl.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_fsl.c 2011-05-01 17:02:10.000000000 -0500 @@ -1258,7 +1258,7 @@ .dma_boundary = ATA_DMA_BOUNDARY, }; -static struct ata_port_operations sata_fsl_ops = { +static const struct ata_port_operations sata_fsl_ops = { .inherits = &sata_pmp_port_ops, .qc_defer = ata_std_qc_defer, diff -uriN linux-2.6.38.4/drivers/ata/sata_inic162x.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_inic162x.c --- linux-2.6.38.4/drivers/ata/sata_inic162x.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_inic162x.c 2011-05-01 17:02:10.000000000 -0500 @@ -705,7 +705,7 @@ return 0; } -static struct ata_port_operations inic_port_ops = { +static const struct ata_port_operations inic_port_ops = { .inherits = &sata_port_ops, .check_atapi_dma = inic_check_atapi_dma, diff -uriN linux-2.6.38.4/drivers/ata/sata_mv.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_mv.c --- linux-2.6.38.4/drivers/ata/sata_mv.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_mv.c 2011-05-01 17:02:11.000000000 -0500 @@ -663,7 +663,7 @@ .dma_boundary = MV_DMA_BOUNDARY, }; -static struct ata_port_operations mv5_ops = { +static const struct ata_port_operations mv5_ops = { .inherits = &ata_sff_port_ops, .lost_interrupt = ATA_OP_NULL, @@ -683,7 +683,7 @@ .port_stop = mv_port_stop, }; -static struct ata_port_operations mv6_ops = { +static const struct ata_port_operations mv6_ops = { .inherits = &ata_bmdma_port_ops, .lost_interrupt = ATA_OP_NULL, @@ -717,7 +717,7 @@ .port_stop = mv_port_stop, }; -static struct ata_port_operations mv_iie_ops = { +static const struct ata_port_operations mv_iie_ops = { .inherits = &mv6_ops, .dev_config = ATA_OP_NULL, .qc_prep = mv_qc_prep_iie, diff -uriN linux-2.6.38.4/drivers/ata/sata_nv.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_nv.c --- linux-2.6.38.4/drivers/ata/sata_nv.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_nv.c 2011-05-01 17:02:11.000000000 -0500 @@ -465,7 +465,7 @@ * cases. Define nv_hardreset() which only kicks in for post-boot * probing and use it for all variants. */ -static struct ata_port_operations nv_generic_ops = { +static const struct ata_port_operations nv_generic_ops = { .inherits = &ata_bmdma_port_ops, .lost_interrupt = ATA_OP_NULL, .scr_read = nv_scr_read, @@ -473,20 +473,20 @@ .hardreset = nv_hardreset, }; -static struct ata_port_operations nv_nf2_ops = { +static const struct ata_port_operations nv_nf2_ops = { .inherits = &nv_generic_ops, .freeze = nv_nf2_freeze, .thaw = nv_nf2_thaw, }; -static struct ata_port_operations nv_ck804_ops = { +static const struct ata_port_operations nv_ck804_ops = { .inherits = &nv_generic_ops, .freeze = nv_ck804_freeze, .thaw = nv_ck804_thaw, .host_stop = nv_ck804_host_stop, }; -static struct ata_port_operations nv_adma_ops = { +static const struct ata_port_operations nv_adma_ops = { .inherits = &nv_ck804_ops, .check_atapi_dma = nv_adma_check_atapi_dma, @@ -510,7 +510,7 @@ .host_stop = nv_adma_host_stop, }; -static struct ata_port_operations nv_swncq_ops = { +static const struct ata_port_operations nv_swncq_ops = { .inherits = &nv_generic_ops, .qc_defer = ata_std_qc_defer, diff -uriN linux-2.6.38.4/drivers/ata/sata_promise.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_promise.c --- linux-2.6.38.4/drivers/ata/sata_promise.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_promise.c 2011-05-01 17:02:11.000000000 -0500 @@ -196,7 +196,7 @@ .error_handler = pdc_error_handler, }; -static struct ata_port_operations pdc_sata_ops = { +static const struct ata_port_operations pdc_sata_ops = { .inherits = &pdc_common_ops, .cable_detect = pdc_sata_cable_detect, .freeze = pdc_sata_freeze, @@ -209,14 +209,14 @@ /* First-generation chips need a more restrictive ->check_atapi_dma op, and ->freeze/thaw that ignore the hotplug controls. */ -static struct ata_port_operations pdc_old_sata_ops = { +static const struct ata_port_operations pdc_old_sata_ops = { .inherits = &pdc_sata_ops, .freeze = pdc_freeze, .thaw = pdc_thaw, .check_atapi_dma = pdc_old_sata_check_atapi_dma, }; -static struct ata_port_operations pdc_pata_ops = { +static const struct ata_port_operations pdc_pata_ops = { .inherits = &pdc_common_ops, .cable_detect = pdc_pata_cable_detect, .freeze = pdc_freeze, diff -uriN linux-2.6.38.4/drivers/ata/sata_qstor.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_qstor.c --- linux-2.6.38.4/drivers/ata/sata_qstor.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_qstor.c 2011-05-01 17:02:11.000000000 -0500 @@ -131,7 +131,7 @@ .dma_boundary = QS_DMA_BOUNDARY, }; -static struct ata_port_operations qs_ata_ops = { +static const struct ata_port_operations qs_ata_ops = { .inherits = &ata_sff_port_ops, .check_atapi_dma = qs_check_atapi_dma, diff -uriN linux-2.6.38.4/drivers/ata/sata_sil24.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_sil24.c --- linux-2.6.38.4/drivers/ata/sata_sil24.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_sil24.c 2011-05-01 17:02:11.000000000 -0500 @@ -389,7 +389,7 @@ .dma_boundary = ATA_DMA_BOUNDARY, }; -static struct ata_port_operations sil24_ops = { +static const struct ata_port_operations sil24_ops = { .inherits = &sata_pmp_port_ops, .qc_defer = sil24_qc_defer, diff -uriN linux-2.6.38.4/drivers/ata/sata_sil.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_sil.c --- linux-2.6.38.4/drivers/ata/sata_sil.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_sil.c 2011-05-01 17:02:11.000000000 -0500 @@ -182,7 +182,7 @@ .sg_tablesize = ATA_MAX_PRD }; -static struct ata_port_operations sil_ops = { +static const struct ata_port_operations sil_ops = { .inherits = &ata_bmdma32_port_ops, .dev_config = sil_dev_config, .set_mode = sil_set_mode, diff -uriN linux-2.6.38.4/drivers/ata/sata_sis.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_sis.c --- linux-2.6.38.4/drivers/ata/sata_sis.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_sis.c 2011-05-01 17:02:11.000000000 -0500 @@ -89,7 +89,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations sis_ops = { +static const struct ata_port_operations sis_ops = { .inherits = &ata_bmdma_port_ops, .scr_read = sis_scr_read, .scr_write = sis_scr_write, diff -uriN linux-2.6.38.4/drivers/ata/sata_svw.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_svw.c --- linux-2.6.38.4/drivers/ata/sata_svw.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_svw.c 2011-05-01 17:02:11.000000000 -0500 @@ -344,7 +344,7 @@ }; -static struct ata_port_operations k2_sata_ops = { +static const struct ata_port_operations k2_sata_ops = { .inherits = &ata_bmdma_port_ops, .sff_tf_load = k2_sata_tf_load, .sff_tf_read = k2_sata_tf_read, diff -uriN linux-2.6.38.4/drivers/ata/sata_sx4.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_sx4.c --- linux-2.6.38.4/drivers/ata/sata_sx4.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_sx4.c 2011-05-01 17:02:11.000000000 -0500 @@ -249,7 +249,7 @@ }; /* TODO: inherit from base port_ops after converting to new EH */ -static struct ata_port_operations pdc_20621_ops = { +static const struct ata_port_operations pdc_20621_ops = { .inherits = &ata_sff_port_ops, .check_atapi_dma = pdc_check_atapi_dma, diff -uriN linux-2.6.38.4/drivers/ata/sata_uli.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_uli.c --- linux-2.6.38.4/drivers/ata/sata_uli.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_uli.c 2011-05-01 17:02:11.000000000 -0500 @@ -80,7 +80,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations uli_ops = { +static const struct ata_port_operations uli_ops = { .inherits = &ata_bmdma_port_ops, .scr_read = uli_scr_read, .scr_write = uli_scr_write, diff -uriN linux-2.6.38.4/drivers/ata/sata_via.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_via.c --- linux-2.6.38.4/drivers/ata/sata_via.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_via.c 2011-05-01 17:02:11.000000000 -0500 @@ -115,32 +115,32 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations svia_base_ops = { +static const struct ata_port_operations svia_base_ops = { .inherits = &ata_bmdma_port_ops, .sff_tf_load = svia_tf_load, }; -static struct ata_port_operations vt6420_sata_ops = { +static const struct ata_port_operations vt6420_sata_ops = { .inherits = &svia_base_ops, .freeze = svia_noop_freeze, .prereset = vt6420_prereset, .bmdma_start = vt6420_bmdma_start, }; -static struct ata_port_operations vt6421_pata_ops = { +static const struct ata_port_operations vt6421_pata_ops = { .inherits = &svia_base_ops, .cable_detect = vt6421_pata_cable_detect, .set_piomode = vt6421_set_pio_mode, .set_dmamode = vt6421_set_dma_mode, }; -static struct ata_port_operations vt6421_sata_ops = { +static const struct ata_port_operations vt6421_sata_ops = { .inherits = &svia_base_ops, .scr_read = svia_scr_read, .scr_write = svia_scr_write, }; -static struct ata_port_operations vt8251_ops = { +static const struct ata_port_operations vt8251_ops = { .inherits = &svia_base_ops, .hardreset = sata_std_hardreset, .scr_read = vt8251_scr_read, diff -uriN linux-2.6.38.4/drivers/ata/sata_vsc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_vsc.c --- linux-2.6.38.4/drivers/ata/sata_vsc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ata/sata_vsc.c 2011-05-01 17:02:11.000000000 -0500 @@ -300,7 +300,7 @@ }; -static struct ata_port_operations vsc_sata_ops = { +static const struct ata_port_operations vsc_sata_ops = { .inherits = &ata_bmdma_port_ops, /* The IRQ handling is not quite standard SFF behaviour so we cannot use the default lost interrupt handler */ diff -uriN linux-2.6.38.4/drivers/atm/adummy.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/adummy.c --- linux-2.6.38.4/drivers/atm/adummy.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/adummy.c 2011-05-01 17:02:11.000000000 -0500 @@ -114,7 +114,7 @@ vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); return 0; } diff -uriN linux-2.6.38.4/drivers/atm/ambassador.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/ambassador.c --- linux-2.6.38.4/drivers/atm/ambassador.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/ambassador.c 2011-05-01 17:02:11.000000000 -0500 @@ -454,7 +454,7 @@ PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); // VC layer stats - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx); + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx); // free the descriptor kfree (tx_descr); @@ -495,7 +495,7 @@ dump_skb ("<<<", vc, skb); // VC layer stats - atomic_inc(&atm_vcc->stats->rx); + atomic_inc_unchecked(&atm_vcc->stats->rx); __net_timestamp(skb); // end of our responsability atm_vcc->push (atm_vcc, skb); @@ -510,7 +510,7 @@ } else { PRINTK (KERN_INFO, "dropped over-size frame"); // should we count this? - atomic_inc(&atm_vcc->stats->rx_drop); + atomic_inc_unchecked(&atm_vcc->stats->rx_drop); } } else { @@ -1342,7 +1342,7 @@ } if (check_area (skb->data, skb->len)) { - atomic_inc(&atm_vcc->stats->tx_err); + atomic_inc_unchecked(&atm_vcc->stats->tx_err); return -ENOMEM; // ? } diff -uriN linux-2.6.38.4/drivers/atm/atmtcp.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/atmtcp.c --- linux-2.6.38.4/drivers/atm/atmtcp.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/atmtcp.c 2011-05-01 17:02:11.000000000 -0500 @@ -207,7 +207,7 @@ if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); if (dev_data) return 0; - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); return -ENOLINK; } size = skb->len+sizeof(struct atmtcp_hdr); @@ -215,7 +215,7 @@ if (!new_skb) { if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); return -ENOBUFS; } hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr)); @@ -226,8 +226,8 @@ if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); out_vcc->push(out_vcc,new_skb); - atomic_inc(&vcc->stats->tx); - atomic_inc(&out_vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->tx); + atomic_inc_unchecked(&out_vcc->stats->rx); return 0; } @@ -301,7 +301,7 @@ out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci)); read_unlock(&vcc_sklist_lock); if (!out_vcc) { - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); goto done; } skb_pull(skb,sizeof(struct atmtcp_hdr)); @@ -313,8 +313,8 @@ __net_timestamp(new_skb); skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len); out_vcc->push(out_vcc,new_skb); - atomic_inc(&vcc->stats->tx); - atomic_inc(&out_vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->tx); + atomic_inc_unchecked(&out_vcc->stats->rx); done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); diff -uriN linux-2.6.38.4/drivers/atm/eni.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/eni.c --- linux-2.6.38.4/drivers/atm/eni.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/eni.c 2011-05-01 17:02:11.000000000 -0500 @@ -526,7 +526,7 @@ DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); length = 0; - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); } else { length = ATM_CELL_SIZE-1; /* no HEC */ @@ -581,7 +581,7 @@ size); } eff = length = 0; - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); } else { size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2); @@ -598,7 +598,7 @@ "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n", vcc->dev->number,vcc->vci,length,size << 2,descr); length = eff = 0; - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); } } skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL; @@ -771,7 +771,7 @@ vcc->push(vcc,skb); pushed++; } - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); } wake_up(&eni_dev->rx_wait); } @@ -1228,7 +1228,7 @@ PCI_DMA_TODEVICE); if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb_irq(skb); - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); wake_up(&eni_dev->tx_wait); dma_complete++; } diff -uriN linux-2.6.38.4/drivers/atm/firestream.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/firestream.c --- linux-2.6.38.4/drivers/atm/firestream.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/firestream.c 2011-05-01 17:02:11.000000000 -0500 @@ -749,7 +749,7 @@ } } - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx); + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx); fs_dprintk (FS_DEBUG_TXMEM, "i"); fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb); @@ -816,7 +816,7 @@ #endif skb_put (skb, qe->p1 & 0xffff); ATM_SKB(skb)->vcc = atm_vcc; - atomic_inc(&atm_vcc->stats->rx); + atomic_inc_unchecked(&atm_vcc->stats->rx); __net_timestamp(skb); fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb); atm_vcc->push (atm_vcc, skb); @@ -837,12 +837,12 @@ kfree (pe); } if (atm_vcc) - atomic_inc(&atm_vcc->stats->rx_drop); + atomic_inc_unchecked(&atm_vcc->stats->rx_drop); break; case 0x1f: /* Reassembly abort: no buffers. */ /* Silently increment error counter. */ if (atm_vcc) - atomic_inc(&atm_vcc->stats->rx_drop); + atomic_inc_unchecked(&atm_vcc->stats->rx_drop); break; default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", diff -uriN linux-2.6.38.4/drivers/atm/fore200e.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/fore200e.c --- linux-2.6.38.4/drivers/atm/fore200e.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/fore200e.c 2011-05-01 17:02:11.000000000 -0500 @@ -933,9 +933,9 @@ #endif /* check error condition */ if (*entry->status & STATUS_ERROR) - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); else - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); } } @@ -1084,7 +1084,7 @@ if (skb == NULL) { DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len); - atomic_inc(&vcc->stats->rx_drop); + atomic_inc_unchecked(&vcc->stats->rx_drop); return -ENOMEM; } @@ -1127,14 +1127,14 @@ dev_kfree_skb_any(skb); - atomic_inc(&vcc->stats->rx_drop); + atomic_inc_unchecked(&vcc->stats->rx_drop); return -ENOMEM; } ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0); vcc->push(vcc, skb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0); @@ -1212,7 +1212,7 @@ DPRINTK(2, "damaged PDU on %d.%d.%d\n", fore200e->atm_dev->number, entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); } } @@ -1657,7 +1657,7 @@ goto retry_here; } - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", diff -uriN linux-2.6.38.4/drivers/atm/he.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/he.c --- linux-2.6.38.4/drivers/atm/he.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/he.c 2011-05-01 17:02:11.000000000 -0500 @@ -1709,7 +1709,7 @@ if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { hprintk("HBUF_ERR! (cid 0x%x)\n", cid); - atomic_inc(&vcc->stats->rx_drop); + atomic_inc_unchecked(&vcc->stats->rx_drop); goto return_host_buffers; } @@ -1736,7 +1736,7 @@ RBRQ_LEN_ERR(he_dev->rbrq_head) ? "LEN_ERR" : "", vcc->vpi, vcc->vci); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); goto return_host_buffers; } @@ -1788,7 +1788,7 @@ vcc->push(vcc, skb); spin_lock(&he_dev->global_lock); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); return_host_buffers: ++pdus_assembled; @@ -2114,7 +2114,7 @@ tpd->vcc->pop(tpd->vcc, tpd->skb); else dev_kfree_skb_any(tpd->skb); - atomic_inc(&tpd->vcc->stats->tx_err); + atomic_inc_unchecked(&tpd->vcc->stats->tx_err); } pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status)); return; @@ -2526,7 +2526,7 @@ vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); return -EINVAL; } @@ -2537,7 +2537,7 @@ vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); return -EINVAL; } #endif @@ -2549,7 +2549,7 @@ vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); spin_unlock_irqrestore(&he_dev->global_lock, flags); return -ENOMEM; } @@ -2591,7 +2591,7 @@ vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); spin_unlock_irqrestore(&he_dev->global_lock, flags); return -ENOMEM; } @@ -2622,7 +2622,7 @@ __enqueue_tpd(he_dev, tpd, cid); spin_unlock_irqrestore(&he_dev->global_lock, flags); - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); return 0; } diff -uriN linux-2.6.38.4/drivers/atm/horizon.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/horizon.c --- linux-2.6.38.4/drivers/atm/horizon.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/horizon.c 2011-05-01 17:02:11.000000000 -0500 @@ -1034,7 +1034,7 @@ { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; // VC layer stats - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); __net_timestamp(skb); // end of our responsability vcc->push (vcc, skb); @@ -1186,7 +1186,7 @@ dev->tx_iovec = NULL; // VC layer stats - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx); + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx); // free the skb hrz_kfree_skb (skb); diff -uriN linux-2.6.38.4/drivers/atm/idt77252.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/idt77252.c --- linux-2.6.38.4/drivers/atm/idt77252.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/idt77252.c 2011-05-01 17:02:11.000000000 -0500 @@ -811,7 +811,7 @@ else dev_kfree_skb(skb); - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); } atomic_dec(&scq->used); @@ -1074,13 +1074,13 @@ if ((sb = dev_alloc_skb(64)) == NULL) { printk("%s: Can't allocate buffers for aal0.\n", card->name); - atomic_add(i, &vcc->stats->rx_drop); + atomic_add_unchecked(i, &vcc->stats->rx_drop); break; } if (!atm_charge(vcc, sb->truesize)) { RXPRINTK("%s: atm_charge() dropped aal0 packets.\n", card->name); - atomic_add(i - 1, &vcc->stats->rx_drop); + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); dev_kfree_skb(sb); break; } @@ -1097,7 +1097,7 @@ ATM_SKB(sb)->vcc = vcc; __net_timestamp(sb); vcc->push(vcc, sb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); cell += ATM_CELL_PAYLOAD; } @@ -1134,13 +1134,13 @@ "(CDC: %08x)\n", card->name, len, rpp->len, readl(SAR_REG_CDC)); recycle_rx_pool_skb(card, rpp); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); return; } if (stat & SAR_RSQE_CRC) { RXPRINTK("%s: AAL5 CRC error.\n", card->name); recycle_rx_pool_skb(card, rpp); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); return; } if (skb_queue_len(&rpp->queue) > 1) { @@ -1151,7 +1151,7 @@ RXPRINTK("%s: Can't alloc RX skb.\n", card->name); recycle_rx_pool_skb(card, rpp); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); return; } if (!atm_charge(vcc, skb->truesize)) { @@ -1170,7 +1170,7 @@ __net_timestamp(skb); vcc->push(vcc, skb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); return; } @@ -1192,7 +1192,7 @@ __net_timestamp(skb); vcc->push(vcc, skb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); if (skb->truesize > SAR_FB_SIZE_3) add_rx_skb(card, 3, SAR_FB_SIZE_3, 1); @@ -1304,14 +1304,14 @@ if (vcc->qos.aal != ATM_AAL0) { RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n", card->name, vpi, vci); - atomic_inc(&vcc->stats->rx_drop); + atomic_inc_unchecked(&vcc->stats->rx_drop); goto drop; } if ((sb = dev_alloc_skb(64)) == NULL) { printk("%s: Can't allocate buffers for AAL0.\n", card->name); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); goto drop; } @@ -1330,7 +1330,7 @@ ATM_SKB(sb)->vcc = vcc; __net_timestamp(sb); vcc->push(vcc, sb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); drop: skb_pull(queue, 64); @@ -1955,13 +1955,13 @@ if (vc == NULL) { printk("%s: NULL connection in send().\n", card->name); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); dev_kfree_skb(skb); return -EINVAL; } if (!test_bit(VCF_TX, &vc->flags)) { printk("%s: Trying to transmit on a non-tx VC.\n", card->name); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); dev_kfree_skb(skb); return -EINVAL; } @@ -1973,14 +1973,14 @@ break; default: printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); dev_kfree_skb(skb); return -EINVAL; } if (skb_shinfo(skb)->nr_frags != 0) { printk("%s: No scatter-gather yet.\n", card->name); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); dev_kfree_skb(skb); return -EINVAL; } @@ -1988,7 +1988,7 @@ err = queue_skb(card, vc, skb, oam); if (err) { - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); dev_kfree_skb(skb); return err; } @@ -2011,7 +2011,7 @@ skb = dev_alloc_skb(64); if (!skb) { printk("%s: Out of memory in send_oam().\n", card->name); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); diff -uriN linux-2.6.38.4/drivers/atm/iphase.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/iphase.c --- linux-2.6.38.4/drivers/atm/iphase.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/iphase.c 2011-05-01 17:02:11.000000000 -0500 @@ -1124,7 +1124,7 @@ status = (u_short) (buf_desc_ptr->desc_mode); if (status & (RX_CER | RX_PTE | RX_OFL)) { - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); IF_ERR(printk("IA: bad packet, dropping it");) if (status & RX_CER) { IF_ERR(printk(" cause: packet CRC error\n");) @@ -1147,7 +1147,7 @@ len = dma_addr - buf_addr; if (len > iadev->rx_buf_sz) { printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); goto out_free_desc; } @@ -1297,7 +1297,7 @@ ia_vcc = INPH_IA_VCC(vcc); if (ia_vcc == NULL) { - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); dev_kfree_skb_any(skb); atm_return(vcc, atm_guess_pdu2truesize(len)); goto INCR_DLE; @@ -1309,7 +1309,7 @@ if ((length > iadev->rx_buf_sz) || (length > (skb->len - sizeof(struct cpcs_trailer)))) { - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)", length, skb->len);) dev_kfree_skb_any(skb); @@ -1325,7 +1325,7 @@ IF_RX(printk("rx_dle_intr: skb push");) vcc->push(vcc,skb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); iadev->rx_pkt_cnt++; } INCR_DLE: @@ -2807,15 +2807,15 @@ { struct k_sonet_stats *stats; stats = &PRIV(_ia_dev[board])->sonet_stats; - printk("section_bip: %d\n", atomic_read(&stats->section_bip)); - printk("line_bip : %d\n", atomic_read(&stats->line_bip)); - printk("path_bip : %d\n", atomic_read(&stats->path_bip)); - printk("line_febe : %d\n", atomic_read(&stats->line_febe)); - printk("path_febe : %d\n", atomic_read(&stats->path_febe)); - printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs)); - printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs)); - printk("tx_cells : %d\n", atomic_read(&stats->tx_cells)); - printk("rx_cells : %d\n", atomic_read(&stats->rx_cells)); + printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip)); + printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip)); + printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip)); + printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe)); + printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe)); + printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs)); + printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs)); + printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells)); + printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells)); } ia_cmds.status = 0; break; @@ -2920,7 +2920,7 @@ if ((desc == 0) || (desc > iadev->num_tx_desc)) { IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);) - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); if (vcc->pop) vcc->pop(vcc, skb); else @@ -3025,14 +3025,14 @@ ATM_DESC(skb) = vcc->vci; skb_queue_tail(&iadev->tx_dma_q, skb); - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); iadev->tx_pkt_cnt++; /* Increment transaction counter */ writel(2, iadev->dma+IPHASE5575_TX_COUNTER); #if 0 /* add flow control logic */ - if (atomic_read(&vcc->stats->tx) % 20 == 0) { + if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) { if (iavcc->vc_desc_cnt > 10) { vcc->tx_quota = vcc->tx_quota * 3 / 4; printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); diff -uriN linux-2.6.38.4/drivers/atm/lanai.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/lanai.c --- linux-2.6.38.4/drivers/atm/lanai.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/lanai.c 2011-05-01 17:02:11.000000000 -0500 @@ -1303,7 +1303,7 @@ vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); lanai_endtx(lanai, lvcc); lanai_free_skb(lvcc->tx.atmvcc, skb); - atomic_inc(&lvcc->tx.atmvcc->stats->tx); + atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx); } /* Try to fill the buffer - don't call unless there is backlog */ @@ -1426,7 +1426,7 @@ ATM_SKB(skb)->vcc = lvcc->rx.atmvcc; __net_timestamp(skb); lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb); - atomic_inc(&lvcc->rx.atmvcc->stats->rx); + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx); out: lvcc->rx.buf.ptr = end; cardvcc_write(lvcc, endptr, vcc_rxreadptr); @@ -1668,7 +1668,7 @@ DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 " "vcc %d\n", lanai->number, (unsigned int) s, vci); lanai->stats.service_rxnotaal5++; - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err); + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err); return 0; } if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) { @@ -1680,7 +1680,7 @@ int bytes; read_unlock(&vcc_sklist_lock); DPRINTK("got trashed rx pdu on vci %d\n", vci); - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err); + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err); lvcc->stats.x.aal5.service_trash++; bytes = (SERVICE_GET_END(s) * 16) - (((unsigned long) lvcc->rx.buf.ptr) - @@ -1692,7 +1692,7 @@ } if (s & SERVICE_STREAM) { read_unlock(&vcc_sklist_lock); - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err); + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err); lvcc->stats.x.aal5.service_stream++; printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream " "PDU on VCI %d!\n", lanai->number, vci); @@ -1700,7 +1700,7 @@ return 0; } DPRINTK("got rx crc error on vci %d\n", vci); - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err); + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err); lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); diff -uriN linux-2.6.38.4/drivers/atm/nicstar.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/nicstar.c --- linux-2.6.38.4/drivers/atm/nicstar.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/nicstar.c 2011-05-01 17:02:11.000000000 -0500 @@ -1654,7 +1654,7 @@ if ((vc = (vc_map *) vcc->dev_data) == NULL) { printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n", card->index); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); dev_kfree_skb_any(skb); return -EINVAL; } @@ -1662,7 +1662,7 @@ if (!vc->tx) { printk("nicstar%d: Trying to transmit on a non-tx VC.\n", card->index); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); dev_kfree_skb_any(skb); return -EINVAL; } @@ -1670,14 +1670,14 @@ if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) { printk("nicstar%d: Only AAL0 and AAL5 are supported.\n", card->index); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); dev_kfree_skb_any(skb); return -EINVAL; } if (skb_shinfo(skb)->nr_frags != 0) { printk("nicstar%d: No scatter-gather yet.\n", card->index); - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); dev_kfree_skb_any(skb); return -EINVAL; } @@ -1725,11 +1725,11 @@ } if (push_scqe(card, vc, scq, &scqe, skb) != 0) { - atomic_inc(&vcc->stats->tx_err); + atomic_inc_unchecked(&vcc->stats->tx_err); dev_kfree_skb_any(skb); return -EIO; } - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); return 0; } @@ -2046,14 +2046,14 @@ printk ("nicstar%d: Can't allocate buffers for aal0.\n", card->index); - atomic_add(i, &vcc->stats->rx_drop); + atomic_add_unchecked(i, &vcc->stats->rx_drop); break; } if (!atm_charge(vcc, sb->truesize)) { RXPRINTK ("nicstar%d: atm_charge() dropped aal0 packets.\n", card->index); - atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */ + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */ dev_kfree_skb_any(sb); break; } @@ -2068,7 +2068,7 @@ ATM_SKB(sb)->vcc = vcc; __net_timestamp(sb); vcc->push(vcc, sb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); cell += ATM_CELL_PAYLOAD; } @@ -2085,7 +2085,7 @@ if (iovb == NULL) { printk("nicstar%d: Out of iovec buffers.\n", card->index); - atomic_inc(&vcc->stats->rx_drop); + atomic_inc_unchecked(&vcc->stats->rx_drop); recycle_rx_buf(card, skb); return; } @@ -2109,7 +2109,7 @@ small or large buffer itself. */ } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) { printk("nicstar%d: received too big AAL5 SDU.\n", card->index); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data, NS_MAX_IOVECS); NS_PRV_IOVCNT(iovb) = 0; @@ -2129,7 +2129,7 @@ ("nicstar%d: Expected a small buffer, and this is not one.\n", card->index); which_list(card, skb); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); recycle_rx_buf(card, skb); vc->rx_iov = NULL; recycle_iov_buf(card, iovb); @@ -2142,7 +2142,7 @@ ("nicstar%d: Expected a large buffer, and this is not one.\n", card->index); which_list(card, skb); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data, NS_PRV_IOVCNT(iovb)); vc->rx_iov = NULL; @@ -2165,7 +2165,7 @@ printk(" - PDU size mismatch.\n"); else printk(".\n"); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data, NS_PRV_IOVCNT(iovb)); vc->rx_iov = NULL; @@ -2179,7 +2179,7 @@ /* skb points to a small buffer */ if (!atm_charge(vcc, skb->truesize)) { push_rxbufs(card, skb); - atomic_inc(&vcc->stats->rx_drop); + atomic_inc_unchecked(&vcc->stats->rx_drop); } else { skb_put(skb, len); dequeue_sm_buf(card, skb); @@ -2189,7 +2189,7 @@ ATM_SKB(skb)->vcc = vcc; __net_timestamp(skb); vcc->push(vcc, skb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); } } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */ struct sk_buff *sb; @@ -2200,7 +2200,7 @@ if (len <= NS_SMBUFSIZE) { if (!atm_charge(vcc, sb->truesize)) { push_rxbufs(card, sb); - atomic_inc(&vcc->stats->rx_drop); + atomic_inc_unchecked(&vcc->stats->rx_drop); } else { skb_put(sb, len); dequeue_sm_buf(card, sb); @@ -2210,7 +2210,7 @@ ATM_SKB(sb)->vcc = vcc; __net_timestamp(sb); vcc->push(vcc, sb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); } push_rxbufs(card, skb); @@ -2219,7 +2219,7 @@ if (!atm_charge(vcc, skb->truesize)) { push_rxbufs(card, skb); - atomic_inc(&vcc->stats->rx_drop); + atomic_inc_unchecked(&vcc->stats->rx_drop); } else { dequeue_lg_buf(card, skb); #ifdef NS_USE_DESTRUCTORS @@ -2232,7 +2232,7 @@ ATM_SKB(skb)->vcc = vcc; __net_timestamp(skb); vcc->push(vcc, skb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); } push_rxbufs(card, sb); @@ -2253,7 +2253,7 @@ printk ("nicstar%d: Out of huge buffers.\n", card->index); - atomic_inc(&vcc->stats->rx_drop); + atomic_inc_unchecked(&vcc->stats->rx_drop); recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, @@ -2304,7 +2304,7 @@ card->hbpool.count++; } else dev_kfree_skb_any(hb); - atomic_inc(&vcc->stats->rx_drop); + atomic_inc_unchecked(&vcc->stats->rx_drop); } else { /* Copy the small buffer to the huge buffer */ sb = (struct sk_buff *)iov->iov_base; @@ -2341,7 +2341,7 @@ #endif /* NS_USE_DESTRUCTORS */ __net_timestamp(hb); vcc->push(vcc, hb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); } } diff -uriN linux-2.6.38.4/drivers/atm/solos-pci.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/solos-pci.c --- linux-2.6.38.4/drivers/atm/solos-pci.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/solos-pci.c 2011-05-01 17:02:11.000000000 -0500 @@ -715,7 +715,7 @@ } atm_charge(vcc, skb->truesize); vcc->push(vcc, skb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); break; case PKT_STATUS: @@ -1009,7 +1009,7 @@ vcc = SKB_CB(oldskb)->vcc; if (vcc) { - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); diff -uriN linux-2.6.38.4/drivers/atm/suni.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/suni.c --- linux-2.6.38.4/drivers/atm/suni.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/suni.c 2011-05-01 17:02:11.000000000 -0500 @@ -50,8 +50,8 @@ #define ADD_LIMITED(s,v) \ - atomic_add((v),&stats->s); \ - if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX); + atomic_add_unchecked((v),&stats->s); \ + if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX); static void suni_hz(unsigned long from_timer) diff -uriN linux-2.6.38.4/drivers/atm/uPD98402.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/uPD98402.c --- linux-2.6.38.4/drivers/atm/uPD98402.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/uPD98402.c 2011-05-01 17:02:11.000000000 -0500 @@ -42,7 +42,7 @@ struct sonet_stats tmp; int error = 0; - atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs); + atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs); sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp); if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp)); if (zero && !error) { @@ -161,9 +161,9 @@ #define ADD_LIMITED(s,v) \ - { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \ - if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \ - atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); } + { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \ + if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \ + atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); } static void stat_event(struct atm_dev *dev) @@ -194,7 +194,7 @@ if (reason & uPD98402_INT_PFM) stat_event(dev); if (reason & uPD98402_INT_PCO) { (void) GET(PCOCR); /* clear interrupt cause */ - atomic_add(GET(HECCT), + atomic_add_unchecked(GET(HECCT), &PRIV(dev)->sonet_stats.uncorr_hcs); } if ((reason & uPD98402_INT_RFO) && @@ -222,9 +222,9 @@ PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO | uPD98402_INT_LOS),PIMR); /* enable them */ (void) fetch_stats(dev,NULL,1); /* clear kernel counters */ - atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1); - atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1); - atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1); + atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1); + atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1); + atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1); return 0; } diff -uriN linux-2.6.38.4/drivers/atm/zatm.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/zatm.c --- linux-2.6.38.4/drivers/atm/zatm.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/atm/zatm.c 2011-05-01 17:02:11.000000000 -0500 @@ -459,7 +459,7 @@ } if (!size) { dev_kfree_skb_irq(skb); - if (vcc) atomic_inc(&vcc->stats->rx_err); + if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err); continue; } if (!atm_charge(vcc,skb->truesize)) { @@ -469,7 +469,7 @@ skb->len = size; ATM_SKB(skb)->vcc = vcc; vcc->push(vcc,skb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); } zout(pos & 0xffff,MTA(mbx)); #if 0 /* probably a stupid idea */ @@ -733,7 +733,7 @@ skb_queue_head(&zatm_vcc->backlog,skb); break; } - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); wake_up(&zatm_vcc->tx_wait); } diff -uriN linux-2.6.38.4/drivers/block/cciss.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/block/cciss.c --- linux-2.6.38.4/drivers/block/cciss.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/block/cciss.c 2011-05-01 17:02:11.000000000 -0500 @@ -1112,6 +1112,8 @@ int err; u32 cp; + memset(&arg64, 0, sizeof(arg64)); + err = 0; err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info, diff -uriN linux-2.6.38.4/drivers/block/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/block/Kconfig --- linux-2.6.38.4/drivers/block/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/block/Kconfig 2011-05-01 17:01:51.000000000 -0500 @@ -273,6 +273,13 @@ source "drivers/block/drbd/Kconfig" +config BLK_DEV_VROOT + tristate "Virtual Root device support" + depends on QUOTACTL + ---help--- + Saying Y here will allow you to use quota/fs ioctls on a shared + partition within a virtual server without compromising security. + config BLK_DEV_NBD tristate "Network block device support" depends on NET diff -uriN linux-2.6.38.4/drivers/block/loop.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/block/loop.c --- linux-2.6.38.4/drivers/block/loop.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/block/loop.c 2011-05-01 17:01:51.000000000 -0500 @@ -75,6 +75,7 @@ #include #include #include +#include #include @@ -902,6 +903,7 @@ lo->lo_blocksize = lo_blocksize; lo->lo_device = bdev; lo->lo_flags = lo_flags; + lo->lo_xid = vx_current_xid(); lo->lo_backing_file = file; lo->transfer = transfer_none; lo->ioctl = NULL; @@ -1032,6 +1034,7 @@ lo->lo_encrypt_key_size = 0; lo->lo_flags = 0; lo->lo_thread = NULL; + lo->lo_xid = 0; memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE); memset(lo->lo_crypt_name, 0, LO_NAME_SIZE); memset(lo->lo_file_name, 0, LO_NAME_SIZE); @@ -1070,7 +1073,7 @@ if (lo->lo_encrypt_key_size && lo->lo_key_owner != uid && - !capable(CAP_SYS_ADMIN)) + !vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP)) return -EPERM; if (lo->lo_state != Lo_bound) return -ENXIO; @@ -1154,7 +1157,8 @@ memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE); info->lo_encrypt_type = lo->lo_encryption ? lo->lo_encryption->number : 0; - if (lo->lo_encrypt_key_size && capable(CAP_SYS_ADMIN)) { + if (lo->lo_encrypt_key_size && + vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP)) { info->lo_encrypt_key_size = lo->lo_encrypt_key_size; memcpy(info->lo_encrypt_key, lo->lo_encrypt_key, lo->lo_encrypt_key_size); @@ -1500,6 +1504,9 @@ { struct loop_device *lo = bdev->bd_disk->private_data; + if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P)) + return -EACCES; + mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; mutex_unlock(&lo->lo_ctl_mutex); diff -uriN linux-2.6.38.4/drivers/block/Makefile linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/block/Makefile --- linux-2.6.38.4/drivers/block/Makefile 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/block/Makefile 2011-05-01 17:01:51.000000000 -0500 @@ -34,6 +34,7 @@ obj-$(CONFIG_BLK_DEV_SX8) += sx8.o obj-$(CONFIG_BLK_DEV_UB) += ub.o obj-$(CONFIG_BLK_DEV_HD) += hd.o +obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_BLK_DEV_DRBD) += drbd/ diff -uriN linux-2.6.38.4/drivers/block/vroot.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/block/vroot.c --- linux-2.6.38.4/drivers/block/vroot.c 1969-12-31 18:00:00.000000000 -0600 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/block/vroot.c 2011-05-01 17:01:51.000000000 -0500 @@ -0,0 +1,292 @@ +/* + * linux/drivers/block/vroot.c + * + * written by Herbert Pötzl, 9/11/2002 + * ported to 2.6.10 by Herbert Pötzl, 30/12/2004 + * + * based on the loop.c code by Theodore Ts'o. + * + * Copyright (C) 2002-2007 by Herbert Pötzl. + * Redistribution of this file is permitted under the + * GNU General Public License. + * + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + + +static int max_vroot = 8; + +static struct vroot_device *vroot_dev; +static struct gendisk **disks; + + +static int vroot_set_dev( + struct vroot_device *vr, + struct block_device *bdev, + unsigned int arg) +{ + struct block_device *real_bdev; + struct file *file; + struct inode *inode; + int error; + + error = -EBUSY; + if (vr->vr_state != Vr_unbound) + goto out; + + error = -EBADF; + file = fget(arg); + if (!file) + goto out; + + error = -EINVAL; + inode = file->f_dentry->d_inode; + + + if (S_ISBLK(inode->i_mode)) { + real_bdev = inode->i_bdev; + vr->vr_device = real_bdev; + __iget(real_bdev->bd_inode); + } else + goto out_fput; + + vxdprintk(VXD_CBIT(misc, 0), + "vroot[%d]_set_dev: dev=" VXF_DEV, + vr->vr_number, VXD_DEV(real_bdev)); + + vr->vr_state = Vr_bound; + error = 0; + + out_fput: + fput(file); + out: + return error; +} + +static int vroot_clr_dev( + struct vroot_device *vr, + struct block_device *bdev) +{ + struct block_device *real_bdev; + + if (vr->vr_state != Vr_bound) + return -ENXIO; + if (vr->vr_refcnt > 1) /* we needed one fd for the ioctl */ + return -EBUSY; + + real_bdev = vr->vr_device; + + vxdprintk(VXD_CBIT(misc, 0), + "vroot[%d]_clr_dev: dev=" VXF_DEV, + vr->vr_number, VXD_DEV(real_bdev)); + + bdput(real_bdev); + vr->vr_state = Vr_unbound; + vr->vr_device = NULL; + return 0; +} + + +static int vr_ioctl(struct block_device *bdev, fmode_t mode, + unsigned int cmd, unsigned long arg) +{ + struct vroot_device *vr = bdev->bd_disk->private_data; + int err; + + down(&vr->vr_ctl_mutex); + switch (cmd) { + case VROOT_SET_DEV: + err = vroot_set_dev(vr, bdev, arg); + break; + case VROOT_CLR_DEV: + err = vroot_clr_dev(vr, bdev); + break; + default: + err = -EINVAL; + break; + } + up(&vr->vr_ctl_mutex); + return err; +} + +static int vr_open(struct block_device *bdev, fmode_t mode) +{ + struct vroot_device *vr = bdev->bd_disk->private_data; + + down(&vr->vr_ctl_mutex); + vr->vr_refcnt++; + up(&vr->vr_ctl_mutex); + return 0; +} + +static int vr_release(struct gendisk *disk, fmode_t mode) +{ + struct vroot_device *vr = disk->private_data; + + down(&vr->vr_ctl_mutex); + --vr->vr_refcnt; + up(&vr->vr_ctl_mutex); + return 0; +} + +static struct block_device_operations vr_fops = { + .owner = THIS_MODULE, + .open = vr_open, + .release = vr_release, + .ioctl = vr_ioctl, +}; + +static int vroot_make_request(struct request_queue *q, struct bio *bio) +{ + printk("vroot_make_request %p, %p\n", q, bio); + bio_io_error(bio); + return 0; +} + +struct block_device *__vroot_get_real_bdev(struct block_device *bdev) +{ + struct inode *inode = bdev->bd_inode; + struct vroot_device *vr; + struct block_device *real_bdev; + int minor = iminor(inode); + + vr = &vroot_dev[minor]; + real_bdev = vr->vr_device; + + vxdprintk(VXD_CBIT(misc, 0), + "vroot[%d]_get_real_bdev: dev=" VXF_DEV, + vr->vr_number, VXD_DEV(real_bdev)); + + if (vr->vr_state != Vr_bound) + return ERR_PTR(-ENXIO); + + __iget(real_bdev->bd_inode); + return real_bdev; +} + + + +/* + * And now the modules code and kernel interface. + */ + +module_param(max_vroot, int, 0); + +MODULE_PARM_DESC(max_vroot, "Maximum number of vroot devices (1-256)"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS_BLOCKDEV_MAJOR(VROOT_MAJOR); + +MODULE_AUTHOR ("Herbert Pötzl"); +MODULE_DESCRIPTION ("Virtual Root Device Mapper"); + + +int __init vroot_init(void) +{ + int err, i; + + if (max_vroot < 1 || max_vroot > 256) { + max_vroot = MAX_VROOT_DEFAULT; + printk(KERN_WARNING "vroot: invalid max_vroot " + "(must be between 1 and 256), " + "using default (%d)\n", max_vroot); + } + + if (register_blkdev(VROOT_MAJOR, "vroot")) + return -EIO; + + err = -ENOMEM; + vroot_dev = kmalloc(max_vroot * sizeof(struct vroot_device), GFP_KERNEL); + if (!vroot_dev) + goto out_mem1; + memset(vroot_dev, 0, max_vroot * sizeof(struct vroot_device)); + + disks = kmalloc(max_vroot * sizeof(struct gendisk *), GFP_KERNEL); + if (!disks) + goto out_mem2; + + for (i = 0; i < max_vroot; i++) { + disks[i] = alloc_disk(1); + if (!disks[i]) + goto out_mem3; + disks[i]->queue = blk_alloc_queue(GFP_KERNEL); + if (!disks[i]->queue) + goto out_mem3; + blk_queue_make_request(disks[i]->queue, vroot_make_request); + } + + for (i = 0; i < max_vroot; i++) { + struct vroot_device *vr = &vroot_dev[i]; + struct gendisk *disk = disks[i]; + + memset(vr, 0, sizeof(*vr)); + sema_init(&vr->vr_ctl_mutex, 1); + vr->vr_number = i; + disk->major = VROOT_MAJOR; + disk->first_minor = i; + disk->fops = &vr_fops; + sprintf(disk->disk_name, "vroot%d", i); + disk->private_data = vr; + } + + err = register_vroot_grb(&__vroot_get_real_bdev); + if (err) + goto out_mem3; + + for (i = 0; i < max_vroot; i++) + add_disk(disks[i]); + printk(KERN_INFO "vroot: loaded (max %d devices)\n", max_vroot); + return 0; + +out_mem3: + while (i--) + put_disk(disks[i]); + kfree(disks); +out_mem2: + kfree(vroot_dev); +out_mem1: + unregister_blkdev(VROOT_MAJOR, "vroot"); + printk(KERN_ERR "vroot: ran out of memory\n"); + return err; +} + +void vroot_exit(void) +{ + int i; + + if (unregister_vroot_grb(&__vroot_get_real_bdev)) + printk(KERN_WARNING "vroot: cannot unregister grb\n"); + + for (i = 0; i < max_vroot; i++) { + del_gendisk(disks[i]); + put_disk(disks[i]); + } + unregister_blkdev(VROOT_MAJOR, "vroot"); + + kfree(disks); + kfree(vroot_dev); +} + +module_init(vroot_init); +module_exit(vroot_exit); + +#ifndef MODULE + +static int __init max_vroot_setup(char *str) +{ + max_vroot = simple_strtol(str, NULL, 0); + return 1; +} + +__setup("max_vroot=", max_vroot_setup); + +#endif + diff -uriN linux-2.6.38.4/drivers/char/agp/frontend.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/agp/frontend.c --- linux-2.6.38.4/drivers/char/agp/frontend.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/agp/frontend.c 2011-05-01 17:02:11.000000000 -0500 @@ -817,7 +817,7 @@ if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; - if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment)) + if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv)) return -EFAULT; client = agp_find_client_by_pid(reserve.pid); diff -uriN linux-2.6.38.4/drivers/char/agp/generic.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/agp/generic.c --- linux-2.6.38.4/drivers/char/agp/generic.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/agp/generic.c 2011-05-01 17:02:11.000000000 -0500 @@ -115,6 +115,9 @@ struct agp_memory *new; unsigned long alloc_size = num_agp_pages*sizeof(struct page *); + if (INT_MAX/sizeof(struct page *) < num_agp_pages) + return NULL; + new = kzalloc(sizeof(struct agp_memory), GFP_KERNEL); if (new == NULL) return NULL; @@ -234,11 +237,14 @@ int scratch_pages; struct agp_memory *new; size_t i; + int cur_memory; if (!bridge) return NULL; - if ((atomic_read(&bridge->current_memory_agp) + page_count) > bridge->max_memory_agp) + cur_memory = atomic_read(&bridge->current_memory_agp); + if ((cur_memory + page_count > bridge->max_memory_agp) || + (cur_memory + page_count < page_count)) return NULL; if (type >= AGP_USER_TYPES) { @@ -1089,8 +1095,8 @@ return -EINVAL; } - /* AK: could wrap */ - if ((pg_start + mem->page_count) > num_entries) + if (((pg_start + mem->page_count) > num_entries) || + ((pg_start + mem->page_count) < pg_start)) return -EINVAL; j = pg_start; @@ -1124,7 +1130,7 @@ { size_t i; struct agp_bridge_data *bridge; - int mask_type; + int mask_type, num_entries; bridge = mem->bridge; if (!bridge) @@ -1136,6 +1142,11 @@ if (type != mem->type) return -EINVAL; + num_entries = agp_num_entries(); + if (((pg_start + mem->page_count) > num_entries) || + ((pg_start + mem->page_count) < pg_start)) + return -EINVAL; + mask_type = bridge->driver->agp_type_to_mask_type(bridge, type); if (mask_type != 0) { /* The generic routines know nothing of memory types */ diff -uriN linux-2.6.38.4/drivers/char/briq_panel.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/briq_panel.c --- linux-2.6.38.4/drivers/char/briq_panel.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/briq_panel.c 2011-05-01 17:02:11.000000000 -0500 @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -34,6 +35,7 @@ static unsigned char vfd[40]; static int vfd_cursor; static unsigned char ledpb, led; +static DEFINE_MUTEX(vfd_mutex); static void update_vfd(void) { @@ -140,12 +142,15 @@ if (!vfd_is_open) return -EBUSY; + mutex_lock(&vfd_mutex); for (;;) { char c; if (!indx) break; - if (get_user(c, buf)) + if (get_user(c, buf)) { + mutex_unlock(&vfd_mutex); return -EFAULT; + } if (esc) { set_led(c); esc = 0; @@ -175,6 +180,7 @@ buf++; } update_vfd(); + mutex_unlock(&vfd_mutex); return len; } diff -uriN linux-2.6.38.4/drivers/char/genrtc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/genrtc.c --- linux-2.6.38.4/drivers/char/genrtc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/genrtc.c 2011-05-01 17:02:11.000000000 -0500 @@ -273,6 +273,7 @@ switch (cmd) { case RTC_PLL_GET: + memset(&pll, 0, sizeof(pll)); if (get_rtc_pll(&pll)) return -EINVAL; else diff -uriN linux-2.6.38.4/drivers/char/hpet.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/hpet.c --- linux-2.6.38.4/drivers/char/hpet.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/hpet.c 2011-05-01 17:02:11.000000000 -0500 @@ -553,7 +553,7 @@ } static int -hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, +hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg, struct hpet_info *info) { struct hpet_timer __iomem *timer; diff -uriN linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/ipmi/ipmi_msghandler.c --- linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/ipmi/ipmi_msghandler.c 2011-05-01 17:02:11.000000000 -0500 @@ -414,7 +414,7 @@ struct proc_dir_entry *proc_dir; char proc_dir_name[10]; - atomic_t stats[IPMI_NUM_STATS]; + atomic_unchecked_t stats[IPMI_NUM_STATS]; /* * run_to_completion duplicate of smb_info, smi_info @@ -447,9 +447,9 @@ #define ipmi_inc_stat(intf, stat) \ - atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat]) + atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]) #define ipmi_get_stat(intf, stat) \ - ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat])) + ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])) static int is_lan_addr(struct ipmi_addr *addr) { @@ -2844,7 +2844,7 @@ INIT_LIST_HEAD(&intf->cmd_rcvrs); init_waitqueue_head(&intf->waitq); for (i = 0; i < IPMI_NUM_STATS; i++) - atomic_set(&intf->stats[i], 0); + atomic_set_unchecked(&intf->stats[i], 0); intf->proc_dir = NULL; diff -uriN linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/ipmi/ipmi_si_intf.c --- linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/ipmi/ipmi_si_intf.c 2011-05-01 17:02:11.000000000 -0500 @@ -285,7 +285,7 @@ unsigned char slave_addr; /* Counters and things for the proc filesystem. */ - atomic_t stats[SI_NUM_STATS]; + atomic_unchecked_t stats[SI_NUM_STATS]; struct task_struct *thread; @@ -294,9 +294,9 @@ }; #define smi_inc_stat(smi, stat) \ - atomic_inc(&(smi)->stats[SI_STAT_ ## stat]) + atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat]) #define smi_get_stat(smi, stat) \ - ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat])) + ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat])) #define SI_MAX_PARMS 4 @@ -3202,7 +3202,7 @@ atomic_set(&new_smi->req_events, 0); new_smi->run_to_completion = 0; for (i = 0; i < SI_NUM_STATS; i++) - atomic_set(&new_smi->stats[i], 0); + atomic_set_unchecked(&new_smi->stats[i], 0); new_smi->interrupt_disabled = 1; atomic_set(&new_smi->stop_operation, 0); diff -uriN linux-2.6.38.4/drivers/char/istallion.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/istallion.c --- linux-2.6.38.4/drivers/char/istallion.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/istallion.c 2011-05-01 17:02:11.000000000 -0500 @@ -186,7 +186,6 @@ * re-used for each stats call. */ static comstats_t stli_comstats; -static combrd_t stli_brdstats; static struct asystats stli_cdkstats; /*****************************************************************************/ @@ -4005,6 +4004,7 @@ { struct stlibrd *brdp; unsigned int i; + combrd_t stli_brdstats; if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t))) return -EFAULT; diff -uriN linux-2.6.38.4/drivers/char/Kconfig linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/Kconfig --- linux-2.6.38.4/drivers/char/Kconfig 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/Kconfig 2011-05-01 17:02:11.000000000 -0500 @@ -90,7 +90,8 @@ config DEVKMEM bool "/dev/kmem virtual device support" - default y + default n + depends on !GRKERNSEC_KMEM help Say Y here if you want to support the /dev/kmem device. The /dev/kmem device is rarely used, but can be used for certain @@ -1132,6 +1133,7 @@ bool depends on !M68K depends on ISA || PCI + depends on !GRKERNSEC_KMEM default y source "drivers/s390/char/Kconfig" diff -uriN linux-2.6.38.4/drivers/char/mem.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/mem.c --- linux-2.6.38.4/drivers/char/mem.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/mem.c 2011-05-01 17:02:11.000000000 -0500 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -34,6 +35,10 @@ # include #endif +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC) +extern struct file_operations grsec_fops; +#endif + static inline unsigned long size_inside_page(unsigned long start, unsigned long size) { @@ -68,9 +73,13 @@ while (cursor < to) { if (!devmem_is_allowed(pfn)) { +#ifdef CONFIG_GRKERNSEC_KMEM + gr_handle_mem_readwrite(from, to); +#else printk(KERN_INFO "Program %s tried to access /dev/mem between %Lx->%Lx.\n", current->comm, from, to); +#endif return 0; } cursor += PAGE_SIZE; @@ -78,6 +87,11 @@ } return 1; } +#elif defined(CONFIG_GRKERNSEC_KMEM) +static inline int range_is_allowed(unsigned long pfn, unsigned long size) +{ + return 0; +} #else static inline int range_is_allowed(unsigned long pfn, unsigned long size) { @@ -120,6 +134,7 @@ while (count > 0) { unsigned long remaining; + char *temp; sz = size_inside_page(p, count); @@ -135,7 +150,23 @@ if (!ptr) return -EFAULT; - remaining = copy_to_user(buf, ptr, sz); +#ifdef CONFIG_PAX_USERCOPY + temp = kmalloc(sz, GFP_KERNEL); + if (!temp) { + unxlate_dev_mem_ptr(p, ptr); + return -ENOMEM; + } + memcpy(temp, ptr, sz); +#else + temp = ptr; +#endif + + remaining = copy_to_user(buf, temp, sz); + +#ifdef CONFIG_PAX_USERCOPY + kfree(temp); +#endif + unxlate_dev_mem_ptr(p, ptr); if (remaining) return -EFAULT; @@ -398,9 +429,8 @@ size_t count, loff_t *ppos) { unsigned long p = *ppos; - ssize_t low_count, read, sz; + ssize_t low_count, read, sz, err = 0; char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */ - int err = 0; read = 0; if (p < (unsigned long) high_memory) { @@ -422,6 +452,8 @@ } #endif while (low_count > 0) { + char *temp; + sz = size_inside_page(p, low_count); /* @@ -431,7 +463,22 @@ */ kbuf = xlate_dev_kmem_ptr((char *)p); - if (copy_to_user(buf, kbuf, sz)) +#ifdef CONFIG_PAX_USERCOPY + temp = kmalloc(sz, GFP_KERNEL); + if (!temp) + return -ENOMEM; + memcpy(temp, kbuf, sz); +#else + temp = kbuf; +#endif + + err = copy_to_user(buf, temp, sz); + +#ifdef CONFIG_PAX_USERCOPY + kfree(temp); +#endif + + if (err) return -EFAULT; buf += sz; p += sz; @@ -857,6 +904,9 @@ #ifdef CONFIG_CRASH_DUMP [12] = { "oldmem", 0, &oldmem_fops, NULL }, #endif +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC) + [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL }, +#endif }; static int memory_open(struct inode *inode, struct file *filp) diff -uriN linux-2.6.38.4/drivers/char/nvram.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/nvram.c --- linux-2.6.38.4/drivers/char/nvram.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/nvram.c 2011-05-01 17:02:11.000000000 -0500 @@ -246,7 +246,7 @@ spin_unlock_irq(&rtc_lock); - if (copy_to_user(buf, contents, tmp - contents)) + if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents)) return -EFAULT; *ppos = i; diff -uriN linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/pcmcia/ipwireless/tty.c --- linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/pcmcia/ipwireless/tty.c 2011-05-01 17:02:11.000000000 -0500 @@ -29,6 +29,7 @@ #include #include #include +#include #include "tty.h" #include "network.h" @@ -51,7 +52,7 @@ int tty_type; struct ipw_network *network; struct tty_struct *linux_tty; - int open_count; + local_t open_count; unsigned int control_lines; struct mutex ipw_tty_mutex; int tx_bytes_queued; @@ -127,10 +128,10 @@ mutex_unlock(&tty->ipw_tty_mutex); return -ENODEV; } - if (tty->open_count == 0) + if (local_read(&tty->open_count) == 0) tty->tx_bytes_queued = 0; - tty->open_count++; + local_inc(&tty->open_count); tty->linux_tty = linux_tty; linux_tty->driver_data = tty; @@ -146,9 +147,7 @@ static void do_ipw_close(struct ipw_tty *tty) { - tty->open_count--; - - if (tty->open_count == 0) { + if (local_dec_return(&tty->open_count) == 0) { struct tty_struct *linux_tty = tty->linux_tty; if (linux_tty != NULL) { @@ -169,7 +168,7 @@ return; mutex_lock(&tty->ipw_tty_mutex); - if (tty->open_count == 0) { + if (local_read(&tty->open_count) == 0) { mutex_unlock(&tty->ipw_tty_mutex); return; } @@ -198,7 +197,7 @@ return; } - if (!tty->open_count) { + if (!local_read(&tty->open_count)) { mutex_unlock(&tty->ipw_tty_mutex); return; } @@ -240,7 +239,7 @@ return -ENODEV; mutex_lock(&tty->ipw_tty_mutex); - if (!tty->open_count) { + if (!local_read(&tty->open_count)) { mutex_unlock(&tty->ipw_tty_mutex); return -EINVAL; } @@ -280,7 +279,7 @@ if (!tty) return -ENODEV; - if (!tty->open_count) + if (!local_read(&tty->open_count)) return -EINVAL; room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued; @@ -322,7 +321,7 @@ if (!tty) return 0; - if (!tty->open_count) + if (!local_read(&tty->open_count)) return 0; return tty->tx_bytes_queued; @@ -403,7 +402,7 @@ if (!tty) return -ENODEV; - if (!tty->open_count) + if (!local_read(&tty->open_count)) return -EINVAL; return get_control_lines(tty); @@ -419,7 +418,7 @@ if (!tty) return -ENODEV; - if (!tty->open_count) + if (!local_read(&tty->open_count)) return -EINVAL; return set_control_lines(tty, set, clear); @@ -433,7 +432,7 @@ if (!tty) return -ENODEV; - if (!tty->open_count) + if (!local_read(&tty->open_count)) return -EINVAL; /* FIXME: Exactly how is the tty object locked here .. */ @@ -582,7 +581,7 @@ against a parallel ioctl etc */ mutex_lock(&ttyj->ipw_tty_mutex); } - while (ttyj->open_count) + while (local_read(&ttyj->open_count)) do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); diff -uriN linux-2.6.38.4/drivers/char/random.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/random.c --- linux-2.6.38.4/drivers/char/random.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/random.c 2011-05-01 17:02:11.000000000 -0500 @@ -254,8 +254,13 @@ /* * Configuration information */ +#ifdef CONFIG_GRKERNSEC_RANDNET +#define INPUT_POOL_WORDS 512 +#define OUTPUT_POOL_WORDS 128 +#else #define INPUT_POOL_WORDS 128 #define OUTPUT_POOL_WORDS 32 +#endif #define SEC_XFER_SIZE 512 #define EXTRACT_SIZE 10 @@ -293,10 +298,17 @@ int poolwords; int tap1, tap2, tap3, tap4, tap5; } poolinfo_table[] = { +#ifdef CONFIG_GRKERNSEC_RANDNET + /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */ + { 512, 411, 308, 208, 104, 1 }, + /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */ + { 128, 103, 76, 51, 25, 1 }, +#else /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */ { 128, 103, 76, 51, 25, 1 }, /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */ { 32, 26, 20, 14, 7, 1 }, +#endif #if 0 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */ { 2048, 1638, 1231, 819, 411, 1 }, @@ -902,7 +914,7 @@ extract_buf(r, tmp); i = min_t(int, nbytes, EXTRACT_SIZE); - if (copy_to_user(buf, tmp, i)) { + if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) { ret = -EFAULT; break; } @@ -1207,7 +1219,7 @@ #include static int min_read_thresh = 8, min_write_thresh; -static int max_read_thresh = INPUT_POOL_WORDS * 32; +static int max_read_thresh = OUTPUT_POOL_WORDS * 32; static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; diff -uriN linux-2.6.38.4/drivers/char/sonypi.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/sonypi.c --- linux-2.6.38.4/drivers/char/sonypi.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/sonypi.c 2011-05-01 17:02:11.000000000 -0500 @@ -55,6 +55,7 @@ #include #include #include +#include #include @@ -491,7 +492,7 @@ spinlock_t fifo_lock; wait_queue_head_t fifo_proc_list; struct fasync_struct *fifo_async; - int open_count; + local_t open_count; int model; struct input_dev *input_jog_dev; struct input_dev *input_key_dev; @@ -898,7 +899,7 @@ static int sonypi_misc_release(struct inode *inode, struct file *file) { mutex_lock(&sonypi_device.lock); - sonypi_device.open_count--; + local_dec(&sonypi_device.open_count); mutex_unlock(&sonypi_device.lock); return 0; } @@ -907,9 +908,9 @@ { mutex_lock(&sonypi_device.lock); /* Flush input queue on first open */ - if (!sonypi_device.open_count) + if (!local_read(&sonypi_device.open_count)) kfifo_reset(&sonypi_device.fifo); - sonypi_device.open_count++; + local_inc(&sonypi_device.open_count); mutex_unlock(&sonypi_device.lock); return 0; diff -uriN linux-2.6.38.4/drivers/char/tpm/tpm_bios.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/tpm/tpm_bios.c --- linux-2.6.38.4/drivers/char/tpm/tpm_bios.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/tpm/tpm_bios.c 2011-05-01 17:02:11.000000000 -0500 @@ -173,7 +173,7 @@ event = addr; if ((event->event_type == 0 && event->event_size == 0) || - ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit)) + (event->event_size >= limit - addr - sizeof(struct tcpa_event))) return NULL; return addr; @@ -198,7 +198,7 @@ return NULL; if ((event->event_type == 0 && event->event_size == 0) || - ((v + sizeof(struct tcpa_event) + event->event_size) >= limit)) + (event->event_size >= limit - v - sizeof(struct tcpa_event))) return NULL; (*pos)++; @@ -291,7 +291,8 @@ int i; for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++) - seq_putc(m, data[i]); + if (!seq_putc(m, data[i])) + return -EFAULT; return 0; } @@ -410,6 +411,11 @@ log->bios_event_log_end = log->bios_event_log + len; virt = acpi_os_map_memory(start, len); + if (!virt) { + kfree(log->bios_event_log); + log->bios_event_log = NULL; + return -EFAULT; + } memcpy(log->bios_event_log, virt, len); diff -uriN linux-2.6.38.4/drivers/char/tpm/tpm.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/tpm/tpm.c --- linux-2.6.38.4/drivers/char/tpm/tpm.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/char/tpm/tpm.c 2011-05-01 17:02:11.000000000 -0500 @@ -411,7 +411,7 @@ chip->vendor.req_complete_val) goto out_recv; - if ((status == chip->vendor.req_canceled)) { + if (status == chip->vendor.req_canceled) { dev_err(chip->dev, "Operation Canceled\n"); rc = -ECANCELED; goto out; diff -uriN linux-2.6.38.4/drivers/cpuidle/sysfs.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/cpuidle/sysfs.c --- linux-2.6.38.4/drivers/cpuidle/sysfs.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/cpuidle/sysfs.c 2011-05-01 17:02:11.000000000 -0500 @@ -300,7 +300,7 @@ .release = cpuidle_state_sysfs_release, }; -static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i) +static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i) { kobject_put(&device->kobjs[i]->kobj); wait_for_completion(&device->kobjs[i]->kobj_unregister); diff -uriN linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/edac/edac_mc_sysfs.c --- linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/edac/edac_mc_sysfs.c 2011-05-01 17:02:11.000000000 -0500 @@ -761,7 +761,7 @@ } /* Intermediate show/store table */ -static struct sysfs_ops inst_grp_ops = { +static const struct sysfs_ops inst_grp_ops = { .show = inst_grp_show, .store = inst_grp_store }; diff -uriN linux-2.6.38.4/drivers/firewire/core-cdev.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/firewire/core-cdev.c --- linux-2.6.38.4/drivers/firewire/core-cdev.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/firewire/core-cdev.c 2011-05-01 17:02:11.000000000 -0500 @@ -1329,8 +1329,7 @@ int ret; if ((request->channels == 0 && request->bandwidth == 0) || - request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL || - request->bandwidth < 0) + request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL) return -EINVAL; r = kmalloc(sizeof(*r), GFP_KERNEL); diff -uriN linux-2.6.38.4/drivers/firmware/dmi_scan.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/firmware/dmi_scan.c --- linux-2.6.38.4/drivers/firmware/dmi_scan.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/firmware/dmi_scan.c 2011-05-01 17:02:11.000000000 -0500 @@ -449,11 +449,6 @@ } } else { - /* - * no iounmap() for that ioremap(); it would be a no-op, but - * it's so early in setup that sucker gets confused into doing - * what it shouldn't if we actually call it. - */ p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; diff -uriN linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_crtc_helper.c --- linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_crtc_helper.c 2011-05-01 17:02:11.000000000 -0500 @@ -276,7 +276,7 @@ struct drm_crtc *tmp; int crtc_mask = 1; - WARN(!crtc, "checking null crtc?\n"); + BUG_ON(!crtc); dev = crtc->dev; diff -uriN linux-2.6.38.4/drivers/gpu/drm/drm_drv.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_drv.c --- linux-2.6.38.4/drivers/gpu/drm/drm_drv.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_drv.c 2011-05-01 17:02:11.000000000 -0500 @@ -425,7 +425,7 @@ dev = file_priv->minor->dev; atomic_inc(&dev->ioctl_count); - atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]); + atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]); ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", diff -uriN linux-2.6.38.4/drivers/gpu/drm/drm_fops.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_fops.c --- linux-2.6.38.4/drivers/gpu/drm/drm_fops.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_fops.c 2011-05-01 17:02:11.000000000 -0500 @@ -70,7 +70,7 @@ } for (i = 0; i < ARRAY_SIZE(dev->counts); i++) - atomic_set(&dev->counts[i], 0); + atomic_set_unchecked(&dev->counts[i], 0); dev->sigdata.lock = NULL; @@ -134,8 +134,8 @@ retcode = drm_open_helper(inode, filp, dev); if (!retcode) { - atomic_inc(&dev->counts[_DRM_STAT_OPENS]); - if (!dev->open_count++) + atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]); + if (local_inc_return(&dev->open_count) == 1) retcode = drm_setup(dev); } if (!retcode) { @@ -472,7 +472,7 @@ mutex_lock(&drm_global_mutex); - DRM_DEBUG("open_count = %d\n", dev->open_count); + DRM_DEBUG("open_count = %d\n", local_read(&dev->open_count)); if (dev->driver->preclose) dev->driver->preclose(dev, file_priv); @@ -484,7 +484,7 @@ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n", task_pid_nr(current), (long)old_encode_dev(file_priv->minor->device), - dev->open_count); + local_read(&dev->open_count)); /* if the master has gone away we can't do anything with the lock */ if (file_priv->minor->master) @@ -565,8 +565,8 @@ * End inline drm_release */ - atomic_inc(&dev->counts[_DRM_STAT_CLOSES]); - if (!--dev->open_count) { + atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]); + if (local_dec_and_test(&dev->open_count)) { if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); diff -uriN linux-2.6.38.4/drivers/gpu/drm/drm_global.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_global.c --- linux-2.6.38.4/drivers/gpu/drm/drm_global.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_global.c 2011-05-01 17:02:11.000000000 -0500 @@ -36,7 +36,7 @@ struct drm_global_item { struct mutex mutex; void *object; - int refcount; + atomic_t refcount; }; static struct drm_global_item glob[DRM_GLOBAL_NUM]; @@ -49,7 +49,7 @@ struct drm_global_item *item = &glob[i]; mutex_init(&item->mutex); item->object = NULL; - item->refcount = 0; + atomic_set(&item->refcount, 0); } } @@ -59,7 +59,7 @@ for (i = 0; i < DRM_GLOBAL_NUM; ++i) { struct drm_global_item *item = &glob[i]; BUG_ON(item->object != NULL); - BUG_ON(item->refcount != 0); + BUG_ON(atomic_read(&item->refcount) != 0); } } @@ -70,7 +70,7 @@ void *object; mutex_lock(&item->mutex); - if (item->refcount == 0) { + if (atomic_read(&item->refcount) == 0) { item->object = kzalloc(ref->size, GFP_KERNEL); if (unlikely(item->object == NULL)) { ret = -ENOMEM; @@ -83,7 +83,7 @@ goto out_err; } - ++item->refcount; + atomic_inc(&item->refcount); ref->object = item->object; object = item->object; mutex_unlock(&item->mutex); @@ -100,9 +100,9 @@ struct drm_global_item *item = &glob[ref->global_type]; mutex_lock(&item->mutex); - BUG_ON(item->refcount == 0); + BUG_ON(atomic_read(&item->refcount) == 0); BUG_ON(ref->object != item->object); - if (--item->refcount == 0) { + if (atomic_dec_and_test(&item->refcount)) { ref->release(ref); item->object = NULL; } diff -uriN linux-2.6.38.4/drivers/gpu/drm/drm_info.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_info.c --- linux-2.6.38.4/drivers/gpu/drm/drm_info.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_info.c 2011-05-01 17:02:11.000000000 -0500 @@ -86,10 +86,14 @@ struct drm_local_map *map; struct drm_map_list *r_list; - /* Hardcoded from _DRM_FRAME_BUFFER, - _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and - _DRM_SCATTER_GATHER and _DRM_CONSISTENT */ - const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" }; + static const char * const types[] = { + [_DRM_FRAME_BUFFER] = "FB", + [_DRM_REGISTERS] = "REG", + [_DRM_SHM] = "SHM", + [_DRM_AGP] = "AGP", + [_DRM_SCATTER_GATHER] = "SG", + [_DRM_CONSISTENT] = "PCI", + [_DRM_GEM] = "GEM" }; const char *type; int i; @@ -100,7 +104,7 @@ map = r_list->map; if (!map) continue; - if (map->type < 0 || map->type > 5) + if (map->type >= ARRAY_SIZE(types)) type = "??"; else type = types[map->type]; @@ -301,7 +305,11 @@ vma->vm_flags & VM_MAYSHARE ? 's' : 'p', vma->vm_flags & VM_LOCKED ? 'l' : '-', vma->vm_flags & VM_IO ? 'i' : '-', +#ifdef CONFIG_GRKERNSEC_HIDESYM + 0); +#else vma->vm_pgoff); +#endif #if defined(__i386__) pgprot = pgprot_val(vma->vm_page_prot); diff -uriN linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_ioctl.c --- linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_ioctl.c 2011-05-01 17:02:11.000000000 -0500 @@ -353,7 +353,7 @@ stats->data[i].value = (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); else - stats->data[i].value = atomic_read(&dev->counts[i]); + stats->data[i].value = atomic_read_unchecked(&dev->counts[i]); stats->data[i].type = dev->types[i]; } diff -uriN linux-2.6.38.4/drivers/gpu/drm/drm_lock.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_lock.c --- linux-2.6.38.4/drivers/gpu/drm/drm_lock.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/drm_lock.c 2011-05-01 17:02:11.000000000 -0500 @@ -89,7 +89,7 @@ if (drm_lock_take(&master->lock, lock->context)) { master->lock.file_priv = file_priv; master->lock.lock_time = jiffies; - atomic_inc(&dev->counts[_DRM_STAT_LOCKS]); + atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]); break; /* Got lock */ } @@ -160,7 +160,7 @@ return -EINVAL; } - atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]); + atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]); if (drm_lock_free(&master->lock, lock->context)) { /* FIXME: Should really bail out here. */ diff -uriN linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i810/i810_dma.c --- linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i810/i810_dma.c 2011-05-01 17:02:11.000000000 -0500 @@ -953,8 +953,8 @@ dma->buflist[vertex->idx], vertex->discard, vertex->used); - atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]); - atomic_inc(&dev->counts[_DRM_STAT_DMA]); + atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]); + atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]); sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; @@ -1114,8 +1114,8 @@ i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used, mc->last_render); - atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]); - atomic_inc(&dev->counts[_DRM_STAT_DMA]); + atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]); + atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]); sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; diff -uriN linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/dvo_ch7017.c --- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/dvo_ch7017.c 2011-05-01 17:02:11.000000000 -0500 @@ -390,7 +390,7 @@ } } -struct intel_dvo_dev_ops ch7017_ops = { +const struct intel_dvo_dev_ops ch7017_ops = { .init = ch7017_init, .detect = ch7017_detect, .mode_valid = ch7017_mode_valid, diff -uriN linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/dvo_ch7xxx.c --- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-05-01 17:02:11.000000000 -0500 @@ -320,7 +320,7 @@ } } -struct intel_dvo_dev_ops ch7xxx_ops = { +const struct intel_dvo_dev_ops ch7xxx_ops = { .init = ch7xxx_init, .detect = ch7xxx_detect, .mode_valid = ch7xxx_mode_valid, diff -uriN linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/dvo.h --- linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/dvo.h 2011-05-01 17:02:11.000000000 -0500 @@ -122,23 +122,23 @@ * * \return singly-linked list of modes or NULL if no modes found. */ - struct drm_display_mode *(*get_modes)(struct intel_dvo_device *dvo); + struct drm_display_mode *(* const get_modes)(struct intel_dvo_device *dvo); /** * Clean up driver-specific bits of the output */ - void (*destroy) (struct intel_dvo_device *dvo); + void (* const destroy) (struct intel_dvo_device *dvo); /** * Debugging hook to dump device registers to log file */ - void (*dump_regs)(struct intel_dvo_device *dvo); + void (* const dump_regs)(struct intel_dvo_device *dvo); }; -extern struct intel_dvo_dev_ops sil164_ops; -extern struct intel_dvo_dev_ops ch7xxx_ops; -extern struct intel_dvo_dev_ops ivch_ops; -extern struct intel_dvo_dev_ops tfp410_ops; -extern struct intel_dvo_dev_ops ch7017_ops; +extern const struct intel_dvo_dev_ops sil164_ops; +extern const struct intel_dvo_dev_ops ch7xxx_ops; +extern const struct intel_dvo_dev_ops ivch_ops; +extern const struct intel_dvo_dev_ops tfp410_ops; +extern const struct intel_dvo_dev_ops ch7017_ops; #endif /* _INTEL_DVO_H */ diff -uriN linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/dvo_ivch.c --- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/dvo_ivch.c 2011-05-01 17:02:11.000000000 -0500 @@ -410,7 +410,7 @@ } } -struct intel_dvo_dev_ops ivch_ops= { +const struct intel_dvo_dev_ops ivch_ops= { .init = ivch_init, .dpms = ivch_dpms, .mode_valid = ivch_mode_valid, diff -uriN linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/dvo_sil164.c --- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/dvo_sil164.c 2011-05-01 17:02:11.000000000 -0500 @@ -252,7 +252,7 @@ } } -struct intel_dvo_dev_ops sil164_ops = { +const struct intel_dvo_dev_ops sil164_ops = { .init = sil164_init, .detect = sil164_detect, .mode_valid = sil164_mode_valid, diff -uriN linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/dvo_tfp410.c --- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/dvo_tfp410.c 2011-05-01 17:02:11.000000000 -0500 @@ -293,7 +293,7 @@ } } -struct intel_dvo_dev_ops tfp410_ops = { +const struct intel_dvo_dev_ops tfp410_ops = { .init = tfp410_init, .detect = tfp410_detect, .mode_valid = tfp410_mode_valid, diff -uriN linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/i915_dma.c --- linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/i915_dma.c 2011-05-01 17:02:11.000000000 -0500 @@ -1159,7 +1159,7 @@ bool can_switch; spin_lock(&dev->count_lock); - can_switch = (dev->open_count == 0); + can_switch = (local_read(&dev->open_count) == 0); spin_unlock(&dev->count_lock); return can_switch; } diff -uriN linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/i915_drv.c --- linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/i915_drv.c 2011-05-01 17:02:11.000000000 -0500 @@ -673,7 +673,7 @@ .restore = i915_pm_resume, }; -static struct vm_operations_struct i915_gem_vm_ops = { +static const struct vm_operations_struct i915_gem_vm_ops = { .fault = i915_gem_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close, diff -uriN linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/i915_drv.h --- linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/i915/i915_drv.h 2011-05-01 17:02:11.000000000 -0500 @@ -1229,7 +1229,7 @@ extern void intel_teardown_gmbus(struct drm_device *dev); extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed); extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit); -extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter) +static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter) { return container_of(adapter, struct intel_gmbus, adapter)->force_bit; } diff -uriN linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/nouveau/nouveau_state.c --- linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/nouveau/nouveau_state.c 2011-05-01 17:02:11.000000000 -0500 @@ -621,7 +621,7 @@ bool can_switch; spin_lock(&dev->count_lock); - can_switch = (dev->open_count == 0); + can_switch = (local_read(&dev->open_count) == 0); spin_unlock(&dev->count_lock); return can_switch; } diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/mkregtable.c --- linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/mkregtable.c 2011-05-01 17:02:11.000000000 -0500 @@ -637,14 +637,14 @@ regex_t mask_rex; regmatch_t match[4]; char buf[1024]; - size_t end; + long end; int len; int done = 0; int r; unsigned o; struct offset *offset; char last_reg_s[10]; - int last_reg; + unsigned long last_reg; if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/r100_reg_safe.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/r100_reg_safe.h --- linux-2.6.38.4/drivers/gpu/drm/radeon/r100_reg_safe.h 1969-12-31 18:00:00.000000000 -0600 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/r100_reg_safe.h 2011-05-01 17:01:51.000000000 -0500 @@ -0,0 +1,28 @@ +static const unsigned r100_reg_safe_bm[102] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, + 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, + 0xFFFFFFCF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFF9F, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0x38E7FE1F, 0xFFC3FF8E, 0x7FF8FFFF, 0xFFFF803C, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFFFF, 0xFFFFFFFF, + 0x00000000, 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFCFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFEF, +}; diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/r200_reg_safe.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/r200_reg_safe.h --- linux-2.6.38.4/drivers/gpu/drm/radeon/r200_reg_safe.h 1969-12-31 18:00:00.000000000 -0600 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/r200_reg_safe.h 2011-05-01 17:01:51.000000000 -0500 @@ -0,0 +1,28 @@ +static const unsigned r200_reg_safe_bm[102] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, + 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFE7FE1F, 0xF003FFFF, 0x7EFFFFFF, 0xFFFF803C, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFEFCE, 0xFFFEFFFF, 0xFFFFFFFE, + 0x020E0FF0, 0xFFCC83FD, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFBFFFF, 0xEFFCFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xDFDFDFDF, 0x3FFDDFDF, 0xFFFFFFFF, 0xFFFFFF7F, + 0xFFFFFFFF, 0x00FFFFFF, 0x00000000, 0x00000000, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFE3F, 0xFFFFFFEF, +}; diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/r300_reg_safe.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/r300_reg_safe.h --- linux-2.6.38.4/drivers/gpu/drm/radeon/r300_reg_safe.h 1969-12-31 18:00:00.000000000 -0600 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/r300_reg_safe.h 2011-05-01 17:01:51.000000000 -0500 @@ -0,0 +1,42 @@ +static const unsigned r300_reg_safe_bm[159] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, + 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000, + 0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, + 0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF, + 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, + 0x00000000, 0x0000C100, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0xFFFF0000, 0xFFFFFFFF, 0xFF80FFFF, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0003FC01, 0xFFFFFCF8, 0xFF800B19, +}; diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/r420_reg_safe.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/r420_reg_safe.h --- linux-2.6.38.4/drivers/gpu/drm/radeon/r420_reg_safe.h 1969-12-31 18:00:00.000000000 -0600 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/r420_reg_safe.h 2011-05-01 17:01:51.000000000 -0500 @@ -0,0 +1,42 @@ +static const unsigned r420_reg_safe_bm[159] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, + 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000, + 0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, + 0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF, + 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, + 0x00000000, 0x00000100, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0xFF800000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0003FC01, 0xFFFFFCF8, 0xFF800B19, +}; diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/radeon_device.c --- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/radeon_device.c 2011-05-01 17:02:11.000000000 -0500 @@ -673,7 +673,7 @@ bool can_switch; spin_lock(&dev->count_lock); - can_switch = (dev->open_count == 0); + can_switch = (local_read(&dev->open_count) == 0); spin_unlock(&dev->count_lock); return can_switch; } diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/radeon_ioc32.c --- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-05-01 17:02:11.000000000 -0500 @@ -359,7 +359,7 @@ request = compat_alloc_user_space(sizeof(*request)); if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) || __put_user(req32.param, &request->param) - || __put_user((void __user *)(unsigned long)req32.value, + || __put_user((unsigned long)req32.value, &request->value)) return -EFAULT; diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/radeon_state.c --- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/radeon_state.c 2011-05-01 17:02:11.000000000 -0500 @@ -2168,7 +2168,7 @@ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS) sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS; - if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes, + if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes, sarea_priv->nbox * sizeof(depth_boxes[0]))) return -EFAULT; @@ -3031,7 +3031,7 @@ { drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_getparam_t *param = data; - int value; + int value = 0; DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/radeon_ttm.c --- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/radeon_ttm.c 2011-05-01 17:02:11.000000000 -0500 @@ -603,8 +603,9 @@ man->size = size >> PAGE_SHIFT; } -static struct vm_operations_struct radeon_ttm_vm_ops; -static const struct vm_operations_struct *ttm_vm_ops = NULL; +extern int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf); +extern void ttm_bo_vm_open(struct vm_area_struct *vma); +extern void ttm_bo_vm_close(struct vm_area_struct *vma); static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) { @@ -612,17 +613,22 @@ struct radeon_device *rdev; int r; - bo = (struct ttm_buffer_object *)vma->vm_private_data; - if (bo == NULL) { + bo = (struct ttm_buffer_object *)vma->vm_private_data; + if (!bo) return VM_FAULT_NOPAGE; - } rdev = radeon_get_rdev(bo->bdev); mutex_lock(&rdev->vram_mutex); - r = ttm_vm_ops->fault(vma, vmf); + r = ttm_bo_vm_fault(vma, vmf); mutex_unlock(&rdev->vram_mutex); return r; } +static const struct vm_operations_struct radeon_ttm_vm_ops = { + .fault = radeon_ttm_fault, + .open = ttm_bo_vm_open, + .close = ttm_bo_vm_close +}; + int radeon_mmap(struct file *filp, struct vm_area_struct *vma) { struct drm_file *file_priv; @@ -635,18 +641,11 @@ file_priv = filp->private_data; rdev = file_priv->minor->dev->dev_private; - if (rdev == NULL) { + if (!rdev) return -EINVAL; - } r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev); - if (unlikely(r != 0)) { + if (r) return r; - } - if (unlikely(ttm_vm_ops == NULL)) { - ttm_vm_ops = vma->vm_ops; - radeon_ttm_vm_ops = *ttm_vm_ops; - radeon_ttm_vm_ops.fault = &radeon_ttm_fault; - } vma->vm_ops = &radeon_ttm_vm_ops; return 0; } diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/rn50_reg_safe.h --- linux-2.6.38.4/drivers/gpu/drm/radeon/rn50_reg_safe.h 1969-12-31 18:00:00.000000000 -0600 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/rn50_reg_safe.h 2011-05-01 17:01:51.000000000 -0500 @@ -0,0 +1,28 @@ +static const unsigned rn50_reg_safe_bm[102] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, + 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, +}; diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/rs600_reg_safe.h --- linux-2.6.38.4/drivers/gpu/drm/radeon/rs600_reg_safe.h 1969-12-31 18:00:00.000000000 -0600 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/rs600_reg_safe.h 2011-05-01 17:01:51.000000000 -0500 @@ -0,0 +1,57 @@ +static const unsigned rs600_reg_safe_bm[219] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, + 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000, + 0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, + 0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF, + 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, + 0x00000000, 0x00000100, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0xFF800000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0003FC01, 0xFFFFFCF8, 0xFF800B19, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, +}; diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/rs690.c --- linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/rs690.c 2011-05-01 17:02:11.000000000 -0500 @@ -304,9 +304,11 @@ if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full && rdev->pm.sideport_bandwidth.full) rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth; - read_delay_latency.full = dfixed_const(370 * 800 * 1000); + read_delay_latency.full = dfixed_const(800 * 1000); read_delay_latency.full = dfixed_div(read_delay_latency, rdev->pm.igp_sideport_mclk); + a.full = dfixed_const(370); + read_delay_latency.full = dfixed_mul(read_delay_latency, a); } else { if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full && rdev->pm.k8_bandwidth.full) diff -uriN linux-2.6.38.4/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/rv515_reg_safe.h --- linux-2.6.38.4/drivers/gpu/drm/radeon/rv515_reg_safe.h 1969-12-31 18:00:00.000000000 -0600 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/radeon/rv515_reg_safe.h 2011-05-01 17:01:51.000000000 -0500 @@ -0,0 +1,57 @@ +static const unsigned rv515_reg_safe_bm[219] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF, + 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000, + 0xF0000038, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0x1FFFF878, 0xFFFFE000, 0xFFFFFE1E, 0xFFFFFFFF, + 0x388F8F50, 0xFFF88082, 0xFF0000FC, 0xFAE009FF, + 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, + 0xFFFF8CFC, 0xFFFFC1FF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF80FFFF, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0003FC01, 0x3FFFFCF8, 0xFF800B19, 0xFFDFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, +}; diff -uriN linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/ttm/ttm_bo_vm.c --- linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-05-01 17:02:11.000000000 -0500 @@ -69,11 +69,11 @@ return best_bo; } -static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) +int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) { struct ttm_buffer_object *bo = (struct ttm_buffer_object *) vma->vm_private_data; - struct ttm_bo_device *bdev = bo->bdev; + struct ttm_bo_device *bdev; unsigned long page_offset; unsigned long page_last; unsigned long pfn; @@ -83,8 +83,12 @@ int i; unsigned long address = (unsigned long)vmf->virtual_address; int retval = VM_FAULT_NOPAGE; - struct ttm_mem_type_manager *man = - &bdev->man[bo->mem.mem_type]; + struct ttm_mem_type_manager *man; + + if (!bo) + return VM_FAULT_NOPAGE; + bdev = bo->bdev; + man = &bdev->man[bo->mem.mem_type]; /* * Work around locking order reversal in fault / nopfn @@ -219,22 +223,25 @@ ttm_bo_unreserve(bo); return retval; } +EXPORT_SYMBOL(ttm_bo_vm_fault); -static void ttm_bo_vm_open(struct vm_area_struct *vma) +void ttm_bo_vm_open(struct vm_area_struct *vma) { struct ttm_buffer_object *bo = (struct ttm_buffer_object *)vma->vm_private_data; (void)ttm_bo_reference(bo); } +EXPORT_SYMBOL(ttm_bo_vm_open); -static void ttm_bo_vm_close(struct vm_area_struct *vma) +void ttm_bo_vm_close(struct vm_area_struct *vma) { struct ttm_buffer_object *bo = (struct ttm_buffer_object *)vma->vm_private_data; ttm_bo_unref(&bo); vma->vm_private_data = NULL; } +EXPORT_SYMBOL(ttm_bo_vm_close); static const struct vm_operations_struct ttm_bo_vm_ops = { .fault = ttm_bo_vm_fault, diff -uriN linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c --- linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-05-01 17:02:11.000000000 -0500 @@ -534,7 +534,7 @@ return VM_FAULT_SIGBUS; } -static struct vm_operations_struct vmw_fifo_vm_ops = { +static const struct vm_operations_struct vmw_fifo_vm_ops = { .fault = vmw_fifo_vm_fault, .open = NULL, .close = NULL diff -uriN linux-2.6.38.4/drivers/hid/usbhid/hiddev.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/hid/usbhid/hiddev.c --- linux-2.6.38.4/drivers/hid/usbhid/hiddev.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/hid/usbhid/hiddev.c 2011-05-01 17:02:11.000000000 -0500 @@ -613,7 +613,7 @@ break; case HIDIOCAPPLICATION: - if (arg < 0 || arg >= hid->maxapplication) + if (arg >= hid->maxapplication) break; for (i = 0; i < hid->maxcollection; i++) diff -uriN linux-2.6.38.4/drivers/hwmon/w83791d.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/hwmon/w83791d.c --- linux-2.6.38.4/drivers/hwmon/w83791d.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/hwmon/w83791d.c 2011-05-01 17:02:11.000000000 -0500 @@ -329,8 +329,8 @@ struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); -static int w83791d_read(struct i2c_client *client, u8 register); -static int w83791d_write(struct i2c_client *client, u8 register, u8 value); +static int w83791d_read(struct i2c_client *client, u8 reg); +static int w83791d_write(struct i2c_client *client, u8 reg, u8 value); static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG diff -uriN linux-2.6.38.4/drivers/ide/ide-cd.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ide/ide-cd.c --- linux-2.6.38.4/drivers/ide/ide-cd.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/ide/ide-cd.c 2011-05-01 17:02:11.000000000 -0500 @@ -776,7 +776,7 @@ alignment = queue_dma_alignment(q) | q->dma_pad_mask; if ((unsigned long)buf & alignment || blk_rq_bytes(rq) & q->dma_pad_mask - || object_is_on_stack(buf)) + || object_starts_on_stack(buf)) drive->dma = 0; } } diff -uriN linux-2.6.38.4/drivers/infiniband/core/addr.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/infiniband/core/addr.c --- linux-2.6.38.4/drivers/infiniband/core/addr.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/infiniband/core/addr.c 2011-05-01 17:01:51.000000000 -0500 @@ -252,7 +252,7 @@ if (ipv6_addr_any(&fl.fl6_src)) { ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev, - &fl.fl6_dst, 0, &fl.fl6_src); + &fl.fl6_dst, 0, &fl.fl6_src, NULL); if (ret) goto put; diff -uriN linux-2.6.38.4/drivers/infiniband/core/cm.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/infiniband/core/cm.c --- linux-2.6.38.4/drivers/infiniband/core/cm.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/infiniband/core/cm.c 2011-05-01 17:02:11.000000000 -0500 @@ -113,7 +113,7 @@ struct cm_counter_group { struct kobject obj; - atomic_long_t counter[CM_ATTR_COUNT]; + atomic_long_unchecked_t counter[CM_ATTR_COUNT]; }; struct cm_counter_attribute { @@ -1387,7 +1387,7 @@ struct ib_mad_send_buf *msg = NULL; int ret; - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES]. counter[CM_REQ_COUNTER]); /* Quick state check to discard duplicate REQs. */ @@ -1765,7 +1765,7 @@ if (!cm_id_priv) return; - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES]. counter[CM_REP_COUNTER]); ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg); if (ret) @@ -1932,7 +1932,7 @@ if (cm_id_priv->id.state != IB_CM_REP_SENT && cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) { spin_unlock_irq(&cm_id_priv->lock); - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES]. counter[CM_RTU_COUNTER]); goto out; } @@ -2111,7 +2111,7 @@ cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id, dreq_msg->local_comm_id); if (!cm_id_priv) { - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES]. counter[CM_DREQ_COUNTER]); cm_issue_drep(work->port, work->mad_recv_wc); return -EINVAL; @@ -2132,7 +2132,7 @@ case IB_CM_MRA_REP_RCVD: break; case IB_CM_TIMEWAIT: - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES]. counter[CM_DREQ_COUNTER]); if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg)) goto unlock; @@ -2146,7 +2146,7 @@ cm_free_msg(msg); goto deref; case IB_CM_DREQ_RCVD: - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES]. counter[CM_DREQ_COUNTER]); goto unlock; default: @@ -2504,7 +2504,7 @@ ib_modify_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg, timeout)) { if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD) - atomic_long_inc(&work->port-> + atomic_long_inc_unchecked(&work->port-> counter_group[CM_RECV_DUPLICATES]. counter[CM_MRA_COUNTER]); goto out; @@ -2513,7 +2513,7 @@ break; case IB_CM_MRA_REQ_RCVD: case IB_CM_MRA_REP_RCVD: - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES]. counter[CM_MRA_COUNTER]); /* fall through */ default: @@ -2675,7 +2675,7 @@ case IB_CM_LAP_IDLE: break; case IB_CM_MRA_LAP_SENT: - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES]. counter[CM_LAP_COUNTER]); if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg)) goto unlock; @@ -2691,7 +2691,7 @@ cm_free_msg(msg); goto deref; case IB_CM_LAP_RCVD: - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES]. counter[CM_LAP_COUNTER]); goto unlock; default: @@ -2975,7 +2975,7 @@ cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv); if (cur_cm_id_priv) { spin_unlock_irq(&cm.lock); - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES]. counter[CM_SIDR_REQ_COUNTER]); goto out; /* Duplicate message. */ } @@ -3187,10 +3187,10 @@ if (!msg->context[0] && (attr_index != CM_REJ_COUNTER)) msg->retries = 1; - atomic_long_add(1 + msg->retries, + atomic_long_add_unchecked(1 + msg->retries, &port->counter_group[CM_XMIT].counter[attr_index]); if (msg->retries) - atomic_long_add(msg->retries, + atomic_long_add_unchecked(msg->retries, &port->counter_group[CM_XMIT_RETRIES]. counter[attr_index]); @@ -3400,7 +3400,7 @@ } attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id); - atomic_long_inc(&port->counter_group[CM_RECV]. + atomic_long_inc_unchecked(&port->counter_group[CM_RECV]. counter[attr_id - CM_ATTR_ID_OFFSET]); work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths, @@ -3598,7 +3598,7 @@ cm_attr = container_of(attr, struct cm_counter_attribute, attr); return sprintf(buf, "%ld\n", - atomic_long_read(&group->counter[cm_attr->index])); + atomic_long_read_unchecked(&group->counter[cm_attr->index])); } static const struct sysfs_ops cm_counter_ops = { diff -uriN linux-2.6.38.4/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/infiniband/hw/ipath/ipath_user_pages.c --- linux-2.6.38.4/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-01 17:01:51.000000000 -0500 @@ -35,6 +35,7 @@ #include #include #include +#include #include "ipath_kernel.h" diff -uriN linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/infiniband/hw/qib/qib.h --- linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/infiniband/hw/qib/qib.h 2011-05-01 17:02:11.000000000 -0500 @@ -51,6 +51,7 @@ #include #include #include +#include #include "qib_common.h" #include "qib_verbs.h" diff -uriN linux-2.6.38.4/drivers/input/mousedev.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/input/mousedev.c --- linux-2.6.38.4/drivers/input/mousedev.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/input/mousedev.c 2011-05-01 17:02:11.000000000 -0500 @@ -764,7 +764,7 @@ spin_unlock_irq(&client->packet_lock); - if (copy_to_user(buffer, data, count)) + if (count > sizeof(data) || copy_to_user(buffer, data, count)) return -EFAULT; return count; diff -uriN linux-2.6.38.4/drivers/isdn/gigaset/common.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/isdn/gigaset/common.c --- linux-2.6.38.4/drivers/isdn/gigaset/common.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/isdn/gigaset/common.c 2011-05-01 17:02:11.000000000 -0500 @@ -723,7 +723,7 @@ cs->commands_pending = 0; cs->cur_at_seq = 0; cs->gotfwver = -1; - cs->open_count = 0; + local_set(&cs->open_count, 0); cs->dev = NULL; cs->tty = NULL; cs->tty_dev = NULL; diff -uriN linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/isdn/gigaset/gigaset.h --- linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/isdn/gigaset/gigaset.h 2011-05-01 17:02:11.000000000 -0500 @@ -35,6 +35,7 @@ #include #include #include +#include #define GIG_VERSION {0, 5, 0, 0} #define GIG_COMPAT {0, 4, 0, 0} @@ -433,7 +434,7 @@ spinlock_t cmdlock; unsigned curlen, cmdbytes; - unsigned open_count; + local_t open_count; struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; diff -uriN linux-2.6.38.4/drivers/isdn/gigaset/interface.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/isdn/gigaset/interface.c --- linux-2.6.38.4/drivers/isdn/gigaset/interface.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/isdn/gigaset/interface.c 2011-05-01 17:02:11.000000000 -0500 @@ -160,9 +160,7 @@ return -ERESTARTSYS; tty->driver_data = cs; - ++cs->open_count; - - if (cs->open_count == 1) { + if (local_inc_return(&cs->open_count) == 1) { spin_lock_irqsave(&cs->lock, flags); cs->tty = tty; spin_unlock_irqrestore(&cs->lock, flags); @@ -190,10 +188,10 @@ if (!cs->connected) gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */ - else if (!cs->open_count) + else if (!local_read(&cs->open_count)) dev_warn(cs->dev, "%s: device not opened\n", __func__); else { - if (!--cs->open_count) { + if (!local_dec_return(&cs->open_count)) { spin_lock_irqsave(&cs->lock, flags); cs->tty = NULL; spin_unlock_irqrestore(&cs->lock, flags); @@ -228,7 +226,7 @@ if (!cs->connected) { gig_dbg(DEBUG_IF, "not connected"); retval = -ENODEV; - } else if (!cs->open_count) + } else if (!local_read(&cs->open_count)) dev_warn(cs->dev, "%s: device not opened\n", __func__); else { retval = 0; @@ -358,7 +356,7 @@ retval = -ENODEV; goto done; } - if (!cs->open_count) { + if (!local_read(&cs->open_count)) { dev_warn(cs->dev, "%s: device not opened\n", __func__); retval = -ENODEV; goto done; @@ -411,7 +409,7 @@ if (!cs->connected) { gig_dbg(DEBUG_IF, "not connected"); retval = -ENODEV; - } else if (!cs->open_count) + } else if (!local_read(&cs->open_count)) dev_warn(cs->dev, "%s: device not opened\n", __func__); else if (cs->mstate != MS_LOCKED) { dev_warn(cs->dev, "can't write to unlocked device\n"); @@ -441,7 +439,7 @@ if (!cs->connected) gig_dbg(DEBUG_IF, "not connected"); - else if (!cs->open_count) + else if (!local_read(&cs->open_count)) dev_warn(cs->dev, "%s: device not opened\n", __func__); else if (cs->mstate != MS_LOCKED) dev_warn(cs->dev, "can't write to unlocked device\n"); @@ -469,7 +467,7 @@ if (!cs->connected) gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */ - else if (!cs->open_count) + else if (!local_read(&cs->open_count)) dev_warn(cs->dev, "%s: device not opened\n", __func__); else gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__); @@ -493,7 +491,7 @@ if (!cs->connected) gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */ - else if (!cs->open_count) + else if (!local_read(&cs->open_count)) dev_warn(cs->dev, "%s: device not opened\n", __func__); else gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__); @@ -524,7 +522,7 @@ goto out; } - if (!cs->open_count) { + if (!local_read(&cs->open_count)) { dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } diff -uriN linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/isdn/hardware/avm/b1.c --- linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/isdn/hardware/avm/b1.c 2011-05-01 17:02:11.000000000 -0500 @@ -176,7 +176,7 @@ } if (left) { if (t4file->user) { - if (copy_from_user(buf, dp, left)) + if (left > sizeof buf || copy_from_user(buf, dp, left)) return -EFAULT; } else { memcpy(buf, dp, left); @@ -224,7 +224,7 @@ } if (left) { if (config->user) { - if (copy_from_user(buf, dp, left)) + if (left > sizeof buf || copy_from_user(buf, dp, left)) return -EFAULT; } else { memcpy(buf, dp, left); diff -uriN linux-2.6.38.4/drivers/isdn/icn/icn.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/isdn/icn/icn.c --- linux-2.6.38.4/drivers/isdn/icn/icn.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/isdn/icn/icn.c 2011-05-01 17:02:11.000000000 -0500 @@ -1045,7 +1045,7 @@ if (count > len) count = len; if (user) { - if (copy_from_user(msg, buf, count)) + if (count > sizeof msg || copy_from_user(msg, buf, count)) return -EFAULT; } else memcpy(msg, buf, count); diff -uriN linux-2.6.38.4/drivers/lguest/core.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/lguest/core.c --- linux-2.6.38.4/drivers/lguest/core.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/lguest/core.c 2011-05-01 17:02:11.000000000 -0500 @@ -92,9 +92,17 @@ * it's worked so far. The end address needs +1 because __get_vm_area * allocates an extra guard page, so we need space for that. */ + +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) + switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE, + VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR + + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE); +#else switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE, VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE); +#endif + if (!switcher_vma) { err = -ENOMEM; printk("lguest: could not map switcher pages high\n"); @@ -119,7 +127,7 @@ * Now the Switcher is mapped at the right address, we can't fail! * Copy in the compiled-in Switcher code (from _switcher.S). */ - memcpy(switcher_vma->addr, start_switcher_text, + memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text), end_switcher_text - start_switcher_text); printk(KERN_INFO "lguest: mapped switcher at %p\n", diff -uriN linux-2.6.38.4/drivers/lguest/x86/core.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/lguest/x86/core.c --- linux-2.6.38.4/drivers/lguest/x86/core.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/lguest/x86/core.c 2011-05-01 17:02:11.000000000 -0500 @@ -59,7 +59,7 @@ /* Offset from where switcher.S was compiled to where we've copied it */ static unsigned long switcher_offset(void) { - return SWITCHER_ADDR - (unsigned long)start_switcher_text; + return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text); } /* This cpu's struct lguest_pages. */ @@ -100,7 +100,13 @@ * These copies are pretty cheap, so we do them unconditionally: */ /* Save the current Host top-level page directory. */ + +#ifdef CONFIG_PAX_PER_CPU_PGD + pages->state.host_cr3 = read_cr3(); +#else pages->state.host_cr3 = __pa(current->mm->pgd); +#endif + /* * Set up the Guest's page tables to see this CPU's pages (and no * other CPU's pages). @@ -547,7 +553,7 @@ * compiled-in switcher code and the high-mapped copy we just made. */ for (i = 0; i < IDT_ENTRIES; i++) - default_idt_entries[i] += switcher_offset(); + default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset(); /* * Set up the Switcher's per-cpu areas. @@ -630,7 +636,7 @@ * it will be undisturbed when we switch. To change %cs and jump we * need this structure to feed to Intel's "lcall" instruction. */ - lguest_entry.offset = (long)switch_to_guest + switcher_offset(); + lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset(); lguest_entry.segment = LGUEST_CS; /* diff -uriN linux-2.6.38.4/drivers/lguest/x86/switcher_32.S linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/lguest/x86/switcher_32.S --- linux-2.6.38.4/drivers/lguest/x86/switcher_32.S 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/lguest/x86/switcher_32.S 2011-05-01 17:02:11.000000000 -0500 @@ -87,6 +87,7 @@ #include #include #include +#include // We mark the start of the code to copy // It's placed in .text tho it's never run here @@ -149,6 +150,13 @@ // Changes type when we load it: damn Intel! // For after we switch over our page tables // That entry will be read-only: we'd crash. + +#ifdef CONFIG_PAX_KERNEXEC + mov %cr0, %edx + xor $X86_CR0_WP, %edx + mov %edx, %cr0 +#endif + movl $(GDT_ENTRY_TSS*8), %edx ltr %dx @@ -157,9 +165,15 @@ // Let's clear it again for our return. // The GDT descriptor of the Host // Points to the table after two "size" bytes - movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx + movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax // Clear "used" from type field (byte 5, bit 2) - andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx) + andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax) + +#ifdef CONFIG_PAX_KERNEXEC + mov %cr0, %eax + xor $X86_CR0_WP, %eax + mov %eax, %cr0 +#endif // Once our page table's switched, the Guest is live! // The Host fades as we run this final step. @@ -295,13 +309,12 @@ // I consulted gcc, and it gave // These instructions, which I gladly credit: leal (%edx,%ebx,8), %eax - movzwl (%eax),%edx - movl 4(%eax), %eax - xorw %ax, %ax - orl %eax, %edx + movl 4(%eax), %edx + movw (%eax), %dx // Now the address of the handler's in %edx // We call it now: its "iret" drops us home. - jmp *%edx + ljmp $__KERNEL_CS, $1f +1: jmp *%edx // Every interrupt can come to us here // But we must truly tell each apart. diff -uriN linux-2.6.38.4/drivers/md/dm.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/md/dm.c --- linux-2.6.38.4/drivers/md/dm.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/md/dm.c 2011-05-01 17:01:51.000000000 -0500 @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -119,6 +120,7 @@ rwlock_t map_lock; atomic_t holders; atomic_t open_count; + xid_t xid; unsigned long flags; @@ -326,6 +328,7 @@ static int dm_blk_open(struct block_device *bdev, fmode_t mode) { struct mapped_device *md; + int ret = -ENXIO; spin_lock(&_minor_lock); @@ -334,18 +337,19 @@ goto out; if (test_bit(DMF_FREEING, &md->flags) || - dm_deleting_md(md)) { - md = NULL; + dm_deleting_md(md)) + goto out; + + ret = -EACCES; + if (!vx_check(md->xid, VS_IDENT|VS_HOSTID)) goto out; - } dm_get(md); atomic_inc(&md->open_count); - + ret = 0; out: spin_unlock(&_minor_lock); - - return md ? 0 : -ENXIO; + return ret; } static int dm_blk_close(struct gendisk *disk, fmode_t mode) @@ -565,6 +569,14 @@ return 0; } +/* + * Get the xid associated with a dm device + */ +xid_t dm_get_xid(struct mapped_device *md) +{ + return md->xid; +} + /*----------------------------------------------------------------- * CRUD START: * A more elegant soln is in the works that uses the queue @@ -1860,6 +1872,7 @@ INIT_LIST_HEAD(&md->uevent_list); spin_lock_init(&md->uevent_lock); + md->xid = vx_current_xid(); md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad_queue; diff -uriN linux-2.6.38.4/drivers/md/dm.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/md/dm.h --- linux-2.6.38.4/drivers/md/dm.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/md/dm.h 2011-05-01 17:01:51.000000000 -0500 @@ -41,6 +41,8 @@ struct dm_table; struct dm_md_mempools; +xid_t dm_get_xid(struct mapped_device *md); + /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ diff -uriN linux-2.6.38.4/drivers/md/dm-ioctl.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/md/dm-ioctl.c --- linux-2.6.38.4/drivers/md/dm-ioctl.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/md/dm-ioctl.c 2011-05-01 17:02:11.000000000 -0500 @@ -16,6 +16,7 @@ #include #include #include +#include #include @@ -106,7 +107,8 @@ unsigned int h = hash_str(str); list_for_each_entry (hc, _name_buckets + h, name_list) - if (!strcmp(hc->name, str)) { + if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) && + !strcmp(hc->name, str)) { dm_get(hc->md); return hc; } @@ -120,7 +122,8 @@ unsigned int h = hash_str(str); list_for_each_entry (hc, _uuid_buckets + h, uuid_list) - if (!strcmp(hc->uuid, str)) { + if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) && + !strcmp(hc->uuid, str)) { dm_get(hc->md); return hc; } @@ -427,6 +430,9 @@ static int remove_all(struct dm_ioctl *param, size_t param_size) { + if (!vx_check(0, VS_ADMIN)) + return -EPERM; + dm_hash_remove_all(1); param->data_size = 0; return 0; @@ -474,6 +480,8 @@ */ for (i = 0; i < NUM_BUCKETS; i++) { list_for_each_entry (hc, _name_buckets + i, name_list) { + if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT)) + continue; needed += sizeof(struct dm_name_list); needed += strlen(hc->name) + 1; needed += ALIGN_MASK; @@ -497,6 +505,8 @@ */ for (i = 0; i < NUM_BUCKETS; i++) { list_for_each_entry (hc, _name_buckets + i, name_list) { + if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT)) + continue; if (old_nl) old_nl->next = (uint32_t) ((void *) nl - (void *) old_nl); @@ -731,10 +741,11 @@ if (!md) goto out; - mdptr = dm_get_mdptr(md); + if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT)) + mdptr = dm_get_mdptr(md); + if (!mdptr) dm_put(md); - out: return mdptr; } @@ -1541,7 +1552,7 @@ cmd == DM_LIST_VERSIONS_CMD) return 0; - if ((cmd == DM_DEV_CREATE_CMD)) { + if (cmd == DM_DEV_CREATE_CMD) { if (!*param->name) { DMWARN("name not supplied when creating device"); return -EINVAL; @@ -1566,8 +1577,8 @@ ioctl_fn fn = NULL; size_t param_size; - /* only root can play with this */ - if (!capable(CAP_SYS_ADMIN)) + /* only root and certain contexts can play with this */ + if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER)) return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) diff -uriN linux-2.6.38.4/drivers/md/dm-table.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/md/dm-table.c --- linux-2.6.38.4/drivers/md/dm-table.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/md/dm-table.c 2011-05-01 17:02:11.000000000 -0500 @@ -372,7 +372,7 @@ if (!dev_size) return 0; - if ((start >= dev_size) || (start + len > dev_size)) { + if ((start >= dev_size) || (len > dev_size - start)) { DMWARN("%s: %s too small for target: " "start=%llu, len=%llu, dev_size=%llu", dm_device_name(ti->table->md), bdevname(bdev, b), diff -uriN linux-2.6.38.4/drivers/md/md.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/md/md.c --- linux-2.6.38.4/drivers/md/md.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/md/md.c 2011-05-01 17:02:11.000000000 -0500 @@ -6462,7 +6462,7 @@ chunk_kb ? "KB" : "B"); if (bitmap->file) { seq_printf(seq, ", file: "); - seq_path(seq, &bitmap->file->f_path, " \t\n"); + seq_path(seq, &bitmap->file->f_path, " \t\n\\"); } seq_printf(seq, "\n"); @@ -6556,7 +6556,7 @@ struct gendisk *disk = rdev->bdev->bd_contains->bd_disk; curr_events = (int)part_stat_read(&disk->part0, sectors[0]) + (int)part_stat_read(&disk->part0, sectors[1]) - - atomic_read(&disk->sync_io); + atomic_read_unchecked(&disk->sync_io); /* sync IO will cause sync_io to increase before the disk_stats * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. diff -uriN linux-2.6.38.4/drivers/md/md.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/md/md.h --- linux-2.6.38.4/drivers/md/md.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/md/md.h 2011-05-01 17:02:11.000000000 -0500 @@ -360,7 +360,7 @@ static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) { - atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io); + atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io); } struct mdk_personality diff -uriN linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/media/dvb/dvb-core/dvbdev.c --- linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/media/dvb/dvb-core/dvbdev.c 2011-05-01 17:02:11.000000000 -0500 @@ -192,7 +192,7 @@ const struct dvb_device *template, void *priv, int type) { struct dvb_device *dvbdev; - struct file_operations *dvbdevfops; + struct file_operations *dvbdevfops; /* cannot be const, see this function */ struct device *clsdev; int minor; int id; diff -uriN linux-2.6.38.4/drivers/media/radio/radio-cadet.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/media/radio/radio-cadet.c --- linux-2.6.38.4/drivers/media/radio/radio-cadet.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/media/radio/radio-cadet.c 2011-05-01 17:02:11.000000000 -0500 @@ -349,7 +349,7 @@ readbuf[i++] = dev->rdsbuf[dev->rdsout++]; mutex_unlock(&dev->lock); - if (copy_to_user(data, readbuf, i)) + if (i > sizeof readbuf || copy_to_user(data, readbuf, i)) return -EFAULT; return i; } diff -uriN linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/media/rc/ir-lirc-codec.c --- linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/media/rc/ir-lirc-codec.c 2011-05-01 17:02:11.000000000 -0500 @@ -277,7 +277,7 @@ return; } -static struct file_operations lirc_fops = { +static const struct file_operations lirc_fops = { .owner = THIS_MODULE, .write = ir_lirc_transmit_ir, .unlocked_ioctl = ir_lirc_ioctl, diff -uriN linux-2.6.38.4/drivers/media/rc/lirc_dev.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/media/rc/lirc_dev.c --- linux-2.6.38.4/drivers/media/rc/lirc_dev.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/media/rc/lirc_dev.c 2011-05-01 17:02:11.000000000 -0500 @@ -151,7 +151,7 @@ } -static struct file_operations lirc_dev_fops = { +static const struct file_operations lirc_dev_fops = { .owner = THIS_MODULE, .read = lirc_dev_fop_read, .write = lirc_dev_fop_write, diff -uriN linux-2.6.38.4/drivers/message/fusion/mptbase.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/message/fusion/mptbase.c --- linux-2.6.38.4/drivers/message/fusion/mptbase.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/message/fusion/mptbase.c 2011-05-01 17:02:11.000000000 -0500 @@ -6683,8 +6683,13 @@ seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth); seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize); +#ifdef CONFIG_GRKERNSEC_HIDESYM + seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL); +#else seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma); +#endif + /* * Rounding UP to nearest 4-kB boundary here... */ diff -uriN linux-2.6.38.4/drivers/message/fusion/mptsas.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/message/fusion/mptsas.c --- linux-2.6.38.4/drivers/message/fusion/mptsas.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/message/fusion/mptsas.c 2011-05-01 17:02:11.000000000 -0500 @@ -439,6 +439,23 @@ return 0; } +static inline void +mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy) +{ + if (phy_info->port_details) { + phy_info->port_details->rphy = rphy; + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n", + ioc->name, rphy)); + } + + if (rphy) { + dsaswideprintk(ioc, dev_printk(KERN_DEBUG, + &rphy->dev, MYIOC_s_FMT "add:", ioc->name)); + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n", + ioc->name, rphy, rphy->dev.release)); + } +} + /* no mutex */ static void mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details) @@ -477,23 +494,6 @@ return NULL; } -static inline void -mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy) -{ - if (phy_info->port_details) { - phy_info->port_details->rphy = rphy; - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n", - ioc->name, rphy)); - } - - if (rphy) { - dsaswideprintk(ioc, dev_printk(KERN_DEBUG, - &rphy->dev, MYIOC_s_FMT "add:", ioc->name)); - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n", - ioc->name, rphy, rphy->dev.release)); - } -} - static inline struct sas_port * mptsas_get_port(struct mptsas_phyinfo *phy_info) { diff -uriN linux-2.6.38.4/drivers/message/fusion/mptscsih.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/message/fusion/mptscsih.c --- linux-2.6.38.4/drivers/message/fusion/mptscsih.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/message/fusion/mptscsih.c 2011-05-01 17:02:11.000000000 -0500 @@ -1268,15 +1268,16 @@ h = shost_priv(SChost); - if (h) { - if (h->info_kbuf == NULL) - if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL) - return h->info_kbuf; - h->info_kbuf[0] = '\0'; + if (!h) + return NULL; - mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0); - h->info_kbuf[size-1] = '\0'; - } + if (h->info_kbuf == NULL) + if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL) + return h->info_kbuf; + h->info_kbuf[0] = '\0'; + + mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0); + h->info_kbuf[size-1] = '\0'; return h->info_kbuf; } diff -uriN linux-2.6.38.4/drivers/message/i2o/i2o_proc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/message/i2o/i2o_proc.c --- linux-2.6.38.4/drivers/message/i2o/i2o_proc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/message/i2o/i2o_proc.c 2011-05-01 17:02:11.000000000 -0500 @@ -255,13 +255,6 @@ "Array Controller Device" }; -static char *chtostr(u8 * chars, int n) -{ - char tmp[256]; - tmp[0] = 0; - return strncat(tmp, (char *)chars, n); -} - static int i2o_report_query_status(struct seq_file *seq, int block_status, char *group) { @@ -838,8 +831,7 @@ seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id); seq_printf(seq, "%-#8x", ddm_table.module_id); - seq_printf(seq, "%-29s", - chtostr(ddm_table.module_name_version, 28)); + seq_printf(seq, "%-.28s", ddm_table.module_name_version); seq_printf(seq, "%9d ", ddm_table.data_size); seq_printf(seq, "%8d", ddm_table.code_size); @@ -940,8 +932,8 @@ seq_printf(seq, "%-#7x", dst->i2o_vendor_id); seq_printf(seq, "%-#8x", dst->module_id); - seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28)); - seq_printf(seq, "%-9s", chtostr(dst->date, 8)); + seq_printf(seq, "%-.28s", dst->module_name_version); + seq_printf(seq, "%-.8s", dst->date); seq_printf(seq, "%8d ", dst->module_size); seq_printf(seq, "%8d ", dst->mpb_size); seq_printf(seq, "0x%04x", dst->module_flags); @@ -1272,14 +1264,10 @@ seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0])); seq_printf(seq, "Owner TID : %0#5x\n", work16[2]); seq_printf(seq, "Parent TID : %0#5x\n", work16[3]); - seq_printf(seq, "Vendor info : %s\n", - chtostr((u8 *) (work32 + 2), 16)); - seq_printf(seq, "Product info : %s\n", - chtostr((u8 *) (work32 + 6), 16)); - seq_printf(seq, "Description : %s\n", - chtostr((u8 *) (work32 + 10), 16)); - seq_printf(seq, "Product rev. : %s\n", - chtostr((u8 *) (work32 + 14), 8)); + seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2)); + seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6)); + seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10)); + seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14)); seq_printf(seq, "Serial number : "); print_serial_number(seq, (u8 *) (work32 + 16), @@ -1324,10 +1312,8 @@ } seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid); - seq_printf(seq, "Module name : %s\n", - chtostr(result.module_name, 24)); - seq_printf(seq, "Module revision : %s\n", - chtostr(result.module_rev, 8)); + seq_printf(seq, "Module name : %.24s\n", result.module_name); + seq_printf(seq, "Module revision : %.8s\n", result.module_rev); seq_printf(seq, "Serial number : "); print_serial_number(seq, result.serial_number, sizeof(result) - 36); @@ -1358,14 +1344,10 @@ return 0; } - seq_printf(seq, "Device name : %s\n", - chtostr(result.device_name, 64)); - seq_printf(seq, "Service name : %s\n", - chtostr(result.service_name, 64)); - seq_printf(seq, "Physical name : %s\n", - chtostr(result.physical_location, 64)); - seq_printf(seq, "Instance number : %s\n", - chtostr(result.instance_number, 4)); + seq_printf(seq, "Device name : %.64s\n", result.device_name); + seq_printf(seq, "Service name : %.64s\n", result.service_name); + seq_printf(seq, "Physical name : %.64s\n", result.physical_location); + seq_printf(seq, "Instance number : %.4s\n", result.instance_number); return 0; } diff -uriN linux-2.6.38.4/drivers/mfd/janz-cmodio.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/mfd/janz-cmodio.c --- linux-2.6.38.4/drivers/mfd/janz-cmodio.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/mfd/janz-cmodio.c 2011-05-01 17:02:11.000000000 -0500 @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff -uriN linux-2.6.38.4/drivers/misc/kgdbts.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/misc/kgdbts.c --- linux-2.6.38.4/drivers/misc/kgdbts.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/misc/kgdbts.c 2011-05-01 17:02:11.000000000 -0500 @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 -static struct kgdb_io kgdbts_io_ops; +static const struct kgdb_io kgdbts_io_ops; static char get_buf[BUFMAX]; static int get_buf_cnt; static char put_buf[BUFMAX]; @@ -1103,7 +1103,7 @@ module_put(THIS_MODULE); } -static struct kgdb_io kgdbts_io_ops = { +static const struct kgdb_io kgdbts_io_ops = { .name = "kgdbts", .read_char = kgdbts_get_char, .write_char = kgdbts_put_char, diff -uriN linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/misc/sgi-gru/gruhandles.c --- linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/misc/sgi-gru/gruhandles.c 2011-05-01 17:02:11.000000000 -0500 @@ -44,8 +44,8 @@ unsigned long nsec; nsec = CLKS2NSEC(clks); - atomic_long_inc(&mcs_op_statistics[op].count); - atomic_long_add(nsec, &mcs_op_statistics[op].total); + atomic_long_inc_unchecked(&mcs_op_statistics[op].count); + atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total); if (mcs_op_statistics[op].max < nsec) mcs_op_statistics[op].max = nsec; } diff -uriN linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/misc/sgi-gru/gruprocfs.c --- linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/misc/sgi-gru/gruprocfs.c 2011-05-01 17:02:11.000000000 -0500 @@ -32,9 +32,9 @@ #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) -static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id) +static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id) { - unsigned long val = atomic_long_read(v); + unsigned long val = atomic_long_read_unchecked(v); seq_printf(s, "%16lu %s\n", val, id); } @@ -134,8 +134,8 @@ seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks"); for (op = 0; op < mcsop_last; op++) { - count = atomic_long_read(&mcs_op_statistics[op].count); - total = atomic_long_read(&mcs_op_statistics[op].total); + count = atomic_long_read_unchecked(&mcs_op_statistics[op].count); + total = atomic_long_read_unchecked(&mcs_op_statistics[op].total); max = mcs_op_statistics[op].max; seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, count ? total / count : 0, max); diff -uriN linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/misc/sgi-gru/grutables.h --- linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/misc/sgi-gru/grutables.h 2011-05-01 17:02:11.000000000 -0500 @@ -167,82 +167,82 @@ * GRU statistics. */ struct gru_stats_s { - atomic_long_t vdata_alloc; - atomic_long_t vdata_free; - atomic_long_t gts_alloc; - atomic_long_t gts_free; - atomic_long_t gms_alloc; - atomic_long_t gms_free; - atomic_long_t gts_double_allocate; - atomic_long_t assign_context; - atomic_long_t assign_context_failed; - atomic_long_t free_context; - atomic_long_t load_user_context; - atomic_long_t load_kernel_context; - atomic_long_t lock_kernel_context; - atomic_long_t unlock_kernel_context; - atomic_long_t steal_user_context; - atomic_long_t steal_kernel_context; - atomic_long_t steal_context_failed; - atomic_long_t nopfn; - atomic_long_t asid_new; - atomic_long_t asid_next; - atomic_long_t asid_wrap; - atomic_long_t asid_reuse; - atomic_long_t intr; - atomic_long_t intr_cbr; - atomic_long_t intr_tfh; - atomic_long_t intr_spurious; - atomic_long_t intr_mm_lock_failed; - atomic_long_t call_os; - atomic_long_t call_os_wait_queue; - atomic_long_t user_flush_tlb; - atomic_long_t user_unload_context; - atomic_long_t user_exception; - atomic_long_t set_context_option; - atomic_long_t check_context_retarget_intr; - atomic_long_t check_context_unload; - atomic_long_t tlb_dropin; - atomic_long_t tlb_preload_page; - atomic_long_t tlb_dropin_fail_no_asid; - atomic_long_t tlb_dropin_fail_upm; - atomic_long_t tlb_dropin_fail_invalid; - atomic_long_t tlb_dropin_fail_range_active; - atomic_long_t tlb_dropin_fail_idle; - atomic_long_t tlb_dropin_fail_fmm; - atomic_long_t tlb_dropin_fail_no_exception; - atomic_long_t tfh_stale_on_fault; - atomic_long_t mmu_invalidate_range; - atomic_long_t mmu_invalidate_page; - atomic_long_t flush_tlb; - atomic_long_t flush_tlb_gru; - atomic_long_t flush_tlb_gru_tgh; - atomic_long_t flush_tlb_gru_zero_asid; - - atomic_long_t copy_gpa; - atomic_long_t read_gpa; - - atomic_long_t mesq_receive; - atomic_long_t mesq_receive_none; - atomic_long_t mesq_send; - atomic_long_t mesq_send_failed; - atomic_long_t mesq_noop; - atomic_long_t mesq_send_unexpected_error; - atomic_long_t mesq_send_lb_overflow; - atomic_long_t mesq_send_qlimit_reached; - atomic_long_t mesq_send_amo_nacked; - atomic_long_t mesq_send_put_nacked; - atomic_long_t mesq_page_overflow; - atomic_long_t mesq_qf_locked; - atomic_long_t mesq_qf_noop_not_full; - atomic_long_t mesq_qf_switch_head_failed; - atomic_long_t mesq_qf_unexpected_error; - atomic_long_t mesq_noop_unexpected_error; - atomic_long_t mesq_noop_lb_overflow; - atomic_long_t mesq_noop_qlimit_reached; - atomic_long_t mesq_noop_amo_nacked; - atomic_long_t mesq_noop_put_nacked; - atomic_long_t mesq_noop_page_overflow; + atomic_long_unchecked_t vdata_alloc; + atomic_long_unchecked_t vdata_free; + atomic_long_unchecked_t gts_alloc; + atomic_long_unchecked_t gts_free; + atomic_long_unchecked_t gms_alloc; + atomic_long_unchecked_t gms_free; + atomic_long_unchecked_t gts_double_allocate; + atomic_long_unchecked_t assign_context; + atomic_long_unchecked_t assign_context_failed; + atomic_long_unchecked_t free_context; + atomic_long_unchecked_t load_user_context; + atomic_long_unchecked_t load_kernel_context; + atomic_long_unchecked_t lock_kernel_context; + atomic_long_unchecked_t unlock_kernel_context; + atomic_long_unchecked_t steal_user_context; + atomic_long_unchecked_t steal_kernel_context; + atomic_long_unchecked_t steal_context_failed; + atomic_long_unchecked_t nopfn; + atomic_long_unchecked_t asid_new; + atomic_long_unchecked_t asid_next; + atomic_long_unchecked_t asid_wrap; + atomic_long_unchecked_t asid_reuse; + atomic_long_unchecked_t intr; + atomic_long_unchecked_t intr_cbr; + atomic_long_unchecked_t intr_tfh; + atomic_long_unchecked_t intr_spurious; + atomic_long_unchecked_t intr_mm_lock_failed; + atomic_long_unchecked_t call_os; + atomic_long_unchecked_t call_os_wait_queue; + atomic_long_unchecked_t user_flush_tlb; + atomic_long_unchecked_t user_unload_context; + atomic_long_unchecked_t user_exception; + atomic_long_unchecked_t set_context_option; + atomic_long_unchecked_t check_context_retarget_intr; + atomic_long_unchecked_t check_context_unload; + atomic_long_unchecked_t tlb_dropin; + atomic_long_unchecked_t tlb_preload_page; + atomic_long_unchecked_t tlb_dropin_fail_no_asid; + atomic_long_unchecked_t tlb_dropin_fail_upm; + atomic_long_unchecked_t tlb_dropin_fail_invalid; + atomic_long_unchecked_t tlb_dropin_fail_range_active; + atomic_long_unchecked_t tlb_dropin_fail_idle; + atomic_long_unchecked_t tlb_dropin_fail_fmm; + atomic_long_unchecked_t tlb_dropin_fail_no_exception; + atomic_long_unchecked_t tfh_stale_on_fault; + atomic_long_unchecked_t mmu_invalidate_range; + atomic_long_unchecked_t mmu_invalidate_page; + atomic_long_unchecked_t flush_tlb; + atomic_long_unchecked_t flush_tlb_gru; + atomic_long_unchecked_t flush_tlb_gru_tgh; + atomic_long_unchecked_t flush_tlb_gru_zero_asid; + + atomic_long_unchecked_t copy_gpa; + atomic_long_unchecked_t read_gpa; + + atomic_long_unchecked_t mesq_receive; + atomic_long_unchecked_t mesq_receive_none; + atomic_long_unchecked_t mesq_send; + atomic_long_unchecked_t mesq_send_failed; + atomic_long_unchecked_t mesq_noop; + atomic_long_unchecked_t mesq_send_unexpected_error; + atomic_long_unchecked_t mesq_send_lb_overflow; + atomic_long_unchecked_t mesq_send_qlimit_reached; + atomic_long_unchecked_t mesq_send_amo_nacked; + atomic_long_unchecked_t mesq_send_put_nacked; + atomic_long_unchecked_t mesq_page_overflow; + atomic_long_unchecked_t mesq_qf_locked; + atomic_long_unchecked_t mesq_qf_noop_not_full; + atomic_long_unchecked_t mesq_qf_switch_head_failed; + atomic_long_unchecked_t mesq_qf_unexpected_error; + atomic_long_unchecked_t mesq_noop_unexpected_error; + atomic_long_unchecked_t mesq_noop_lb_overflow; + atomic_long_unchecked_t mesq_noop_qlimit_reached; + atomic_long_unchecked_t mesq_noop_amo_nacked; + atomic_long_unchecked_t mesq_noop_put_nacked; + atomic_long_unchecked_t mesq_noop_page_overflow; }; @@ -251,8 +251,8 @@ tghop_invalidate, mcsop_last}; struct mcs_op_statistic { - atomic_long_t count; - atomic_long_t total; + atomic_long_unchecked_t count; + atomic_long_unchecked_t total; unsigned long max; }; @@ -275,7 +275,7 @@ #define STAT(id) do { \ if (gru_options & OPT_STATS) \ - atomic_long_inc(&gru_stats.id); \ + atomic_long_inc_unchecked(&gru_stats.id); \ } while (0) #ifdef CONFIG_SGI_GRU_DEBUG diff -uriN linux-2.6.38.4/drivers/mtd/devices/doc2000.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/mtd/devices/doc2000.c --- linux-2.6.38.4/drivers/mtd/devices/doc2000.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/mtd/devices/doc2000.c 2011-05-01 17:02:11.000000000 -0500 @@ -776,7 +776,7 @@ /* The ECC will not be calculated correctly if less than 512 is written */ /* DBB- - if (len != 0x200 && eccbuf) + if (len != 0x200) printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); diff -uriN linux-2.6.38.4/drivers/mtd/devices/doc2001.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/mtd/devices/doc2001.c --- linux-2.6.38.4/drivers/mtd/devices/doc2001.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/mtd/devices/doc2001.c 2011-05-01 17:02:11.000000000 -0500 @@ -393,7 +393,7 @@ struct Nand *mychip = &this->chips[from >> (this->chipshift)]; /* Don't allow read past end of device */ - if (from >= this->totlen) + if (from >= this->totlen || !len) return -EINVAL; /* Don't allow a single read to cross a 512-byte block boundary */ diff -uriN linux-2.6.38.4/drivers/mtd/nand/denali.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/mtd/nand/denali.c --- linux-2.6.38.4/drivers/mtd/nand/denali.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/mtd/nand/denali.c 2011-05-01 17:02:11.000000000 -0500 @@ -25,6 +25,7 @@ #include #include #include +#include #include "denali.h" diff -uriN linux-2.6.38.4/drivers/mtd/ubi/build.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/mtd/ubi/build.c --- linux-2.6.38.4/drivers/mtd/ubi/build.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/mtd/ubi/build.c 2011-05-01 17:02:11.000000000 -0500 @@ -1285,7 +1285,7 @@ static int __init bytes_str_to_int(const char *str) { char *endp; - unsigned long result; + unsigned long result, scale = 1; result = simple_strtoul(str, &endp, 0); if (str == endp || result >= INT_MAX) { @@ -1296,11 +1296,11 @@ switch (*endp) { case 'G': - result *= 1024; + scale *= 1024; case 'M': - result *= 1024; + scale *= 1024; case 'K': - result *= 1024; + scale *= 1024; if (endp[1] == 'i' && endp[2] == 'B') endp += 2; case '\0': @@ -1311,7 +1311,13 @@ return -EINVAL; } - return result; + if ((intoverflow_t)result*scale >= INT_MAX) { + printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n", + str); + return -EINVAL; + } + + return result*scale; } /** diff -uriN linux-2.6.38.4/drivers/net/e1000e/82571.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/e1000e/82571.c --- linux-2.6.38.4/drivers/net/e1000e/82571.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/e1000e/82571.c 2011-05-01 17:02:11.000000000 -0500 @@ -239,7 +239,7 @@ { struct e1000_hw *hw = &adapter->hw; struct e1000_mac_info *mac = &hw->mac; - struct e1000_mac_operations *func = &mac->ops; + struct e1000_mac_operations *func = &mac->ops; /* cannot be const */ u32 swsm = 0; u32 swsm2 = 0; bool force_clear_smbi = false; @@ -1930,7 +1930,7 @@ er32(ICRXDMTC); } -static struct e1000_mac_operations e82571_mac_ops = { +static const struct e1000_mac_operations e82571_mac_ops = { /* .check_mng_mode: mac type dependent */ /* .check_for_link: media type dependent */ .id_led_init = e1000e_id_led_init, @@ -1952,7 +1952,7 @@ .read_mac_addr = e1000_read_mac_addr_82571, }; -static struct e1000_phy_operations e82_phy_ops_igp = { +static const struct e1000_phy_operations e82_phy_ops_igp = { .acquire = e1000_get_hw_semaphore_82571, .check_polarity = e1000_check_polarity_igp, .check_reset_block = e1000e_check_reset_block_generic, @@ -1970,7 +1970,7 @@ .cfg_on_link_up = NULL, }; -static struct e1000_phy_operations e82_phy_ops_m88 = { +static const struct e1000_phy_operations e82_phy_ops_m88 = { .acquire = e1000_get_hw_semaphore_82571, .check_polarity = e1000_check_polarity_m88, .check_reset_block = e1000e_check_reset_block_generic, @@ -1988,7 +1988,7 @@ .cfg_on_link_up = NULL, }; -static struct e1000_phy_operations e82_phy_ops_bm = { +static const struct e1000_phy_operations e82_phy_ops_bm = { .acquire = e1000_get_hw_semaphore_82571, .check_polarity = e1000_check_polarity_m88, .check_reset_block = e1000e_check_reset_block_generic, @@ -2006,7 +2006,7 @@ .cfg_on_link_up = NULL, }; -static struct e1000_nvm_operations e82571_nvm_ops = { +static const struct e1000_nvm_operations e82571_nvm_ops = { .acquire = e1000_acquire_nvm_82571, .read = e1000e_read_nvm_eerd, .release = e1000_release_nvm_82571, diff -uriN linux-2.6.38.4/drivers/net/e1000e/e1000.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/e1000e/e1000.h --- linux-2.6.38.4/drivers/net/e1000e/e1000.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/e1000e/e1000.h 2011-05-01 17:02:11.000000000 -0500 @@ -408,9 +408,9 @@ u32 pba; u32 max_hw_frame_size; s32 (*get_variants)(struct e1000_adapter *); - struct e1000_mac_operations *mac_ops; - struct e1000_phy_operations *phy_ops; - struct e1000_nvm_operations *nvm_ops; + const struct e1000_mac_operations *mac_ops; + const struct e1000_phy_operations *phy_ops; + const struct e1000_nvm_operations *nvm_ops; }; /* hardware capability, feature, and workaround flags */ diff -uriN linux-2.6.38.4/drivers/net/e1000e/es2lan.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/e1000e/es2lan.c --- linux-2.6.38.4/drivers/net/e1000e/es2lan.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/e1000e/es2lan.c 2011-05-01 17:02:11.000000000 -0500 @@ -205,7 +205,7 @@ { struct e1000_hw *hw = &adapter->hw; struct e1000_mac_info *mac = &hw->mac; - struct e1000_mac_operations *func = &mac->ops; + struct e1000_mac_operations *func = &mac->ops; /* cannot be const */ /* Set media type */ switch (adapter->pdev->device) { @@ -1431,7 +1431,7 @@ er32(ICRXDMTC); } -static struct e1000_mac_operations es2_mac_ops = { +static const struct e1000_mac_operations es2_mac_ops = { .read_mac_addr = e1000_read_mac_addr_80003es2lan, .id_led_init = e1000e_id_led_init, .check_mng_mode = e1000e_check_mng_mode_generic, @@ -1453,7 +1453,7 @@ .setup_led = e1000e_setup_led_generic, }; -static struct e1000_phy_operations es2_phy_ops = { +static const struct e1000_phy_operations es2_phy_ops = { .acquire = e1000_acquire_phy_80003es2lan, .check_polarity = e1000_check_polarity_m88, .check_reset_block = e1000e_check_reset_block_generic, @@ -1471,7 +1471,7 @@ .cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan, }; -static struct e1000_nvm_operations es2_nvm_ops = { +static const struct e1000_nvm_operations es2_nvm_ops = { .acquire = e1000_acquire_nvm_80003es2lan, .read = e1000e_read_nvm_eerd, .release = e1000_release_nvm_80003es2lan, diff -uriN linux-2.6.38.4/drivers/net/e1000e/hw.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/e1000e/hw.h --- linux-2.6.38.4/drivers/net/e1000e/hw.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/e1000e/hw.h 2011-05-01 17:02:11.000000000 -0500 @@ -801,16 +801,17 @@ /* Function pointers for the NVM. */ struct e1000_nvm_operations { - s32 (*acquire)(struct e1000_hw *); - s32 (*read)(struct e1000_hw *, u16, u16, u16 *); - void (*release)(struct e1000_hw *); - s32 (*update)(struct e1000_hw *); - s32 (*valid_led_default)(struct e1000_hw *, u16 *); - s32 (*validate)(struct e1000_hw *); - s32 (*write)(struct e1000_hw *, u16, u16, u16 *); + s32 (* acquire)(struct e1000_hw *); /* cannot be const, see drivers/net/e1000e/82571.c e1000_init_nvm_params_82571() */ + s32 (* const read)(struct e1000_hw *, u16, u16, u16 *); + void (* release)(struct e1000_hw *); /* cannot be const, see drivers/net/e1000e/82571.c e1000_init_nvm_params_82571() */ + s32 (* const update)(struct e1000_hw *); + s32 (* const valid_led_default)(struct e1000_hw *, u16 *); + s32 (* const validate)(struct e1000_hw *); + s32 (* const write)(struct e1000_hw *, u16, u16, u16 *); }; struct e1000_mac_info { + /* cannot be const see e1000_init_mac_params_ich8lan */ struct e1000_mac_operations ops; u8 addr[6]; @@ -853,6 +854,7 @@ }; struct e1000_phy_info { + /* Cannot be const see e1000_init_phy_params_82571() */ struct e1000_phy_operations ops; enum e1000_phy_type type; @@ -887,6 +889,7 @@ }; struct e1000_nvm_info { + /* cannot be const */ struct e1000_nvm_operations ops; enum e1000_nvm_type type; diff -uriN linux-2.6.38.4/drivers/net/e1000e/ich8lan.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/e1000e/ich8lan.c --- linux-2.6.38.4/drivers/net/e1000e/ich8lan.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/e1000e/ich8lan.c 2011-05-01 17:02:11.000000000 -0500 @@ -3840,7 +3840,7 @@ } } -static struct e1000_mac_operations ich8_mac_ops = { +static const struct e1000_mac_operations ich8_mac_ops = { .id_led_init = e1000e_id_led_init, /* check_mng_mode dependent on mac type */ .check_for_link = e1000_check_for_copper_link_ich8lan, @@ -3859,7 +3859,7 @@ /* id_led_init dependent on mac type */ }; -static struct e1000_phy_operations ich8_phy_ops = { +static const struct e1000_phy_operations ich8_phy_ops = { .acquire = e1000_acquire_swflag_ich8lan, .check_reset_block = e1000_check_reset_block_ich8lan, .commit = NULL, @@ -3873,7 +3873,7 @@ .write_reg = e1000e_write_phy_reg_igp, }; -static struct e1000_nvm_operations ich8_nvm_ops = { +static const struct e1000_nvm_operations ich8_nvm_ops = { .acquire = e1000_acquire_nvm_ich8lan, .read = e1000_read_nvm_ich8lan, .release = e1000_release_nvm_ich8lan, diff -uriN linux-2.6.38.4/drivers/net/igb/e1000_82575.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/igb/e1000_82575.c --- linux-2.6.38.4/drivers/net/igb/e1000_82575.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/igb/e1000_82575.c 2011-05-01 17:02:11.000000000 -0500 @@ -1747,7 +1747,7 @@ return ret_val; } -static struct e1000_mac_operations e1000_mac_ops_82575 = { +static const struct e1000_mac_operations e1000_mac_ops_82575 = { .init_hw = igb_init_hw_82575, .check_for_link = igb_check_for_link_82575, .rar_set = igb_rar_set, @@ -1755,13 +1755,13 @@ .get_speed_and_duplex = igb_get_speed_and_duplex_copper, }; -static struct e1000_phy_operations e1000_phy_ops_82575 = { +static const struct e1000_phy_operations e1000_phy_ops_82575 = { .acquire = igb_acquire_phy_82575, .get_cfg_done = igb_get_cfg_done_82575, .release = igb_release_phy_82575, }; -static struct e1000_nvm_operations e1000_nvm_ops_82575 = { +static const struct e1000_nvm_operations e1000_nvm_ops_82575 = { .acquire = igb_acquire_nvm_82575, .read = igb_read_nvm_eerd, .release = igb_release_nvm_82575, diff -uriN linux-2.6.38.4/drivers/net/igb/e1000_hw.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/igb/e1000_hw.h --- linux-2.6.38.4/drivers/net/igb/e1000_hw.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/igb/e1000_hw.h 2011-05-01 17:02:11.000000000 -0500 @@ -327,22 +327,23 @@ }; struct e1000_nvm_operations { - s32 (*acquire)(struct e1000_hw *); - s32 (*read)(struct e1000_hw *, u16, u16, u16 *); - void (*release)(struct e1000_hw *); - s32 (*write)(struct e1000_hw *, u16, u16, u16 *); + s32 (* const acquire)(struct e1000_hw *); + s32 (* const read)(struct e1000_hw *, u16, u16, u16 *); + void (* const release)(struct e1000_hw *); + s32 (* const write)(struct e1000_hw *, u16, u16, u16 *); }; struct e1000_info { s32 (*get_invariants)(struct e1000_hw *); - struct e1000_mac_operations *mac_ops; - struct e1000_phy_operations *phy_ops; - struct e1000_nvm_operations *nvm_ops; + const struct e1000_mac_operations *mac_ops; + const struct e1000_phy_operations *phy_ops; + const struct e1000_nvm_operations *nvm_ops; }; extern const struct e1000_info e1000_82575_info; struct e1000_mac_info { + /* cannot be const see igb_get_invariants_82575() */ struct e1000_mac_operations ops; u8 addr[6]; @@ -381,6 +382,7 @@ }; struct e1000_phy_info { + /* cannot be const see igb_get_invariants_82575() */ struct e1000_phy_operations ops; enum e1000_phy_type type; @@ -416,6 +418,7 @@ }; struct e1000_nvm_info { + /* cannot be const */ struct e1000_nvm_operations ops; enum e1000_nvm_type type; diff -uriN linux-2.6.38.4/drivers/net/igbvf/vf.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/igbvf/vf.h --- linux-2.6.38.4/drivers/net/igbvf/vf.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/igbvf/vf.h 2011-05-01 17:02:11.000000000 -0500 @@ -191,6 +191,7 @@ }; struct e1000_mac_info { + /* cannot be const see e1000_init_mac_params_vf() */ struct e1000_mac_operations ops; u8 addr[6]; u8 perm_addr[6]; diff -uriN linux-2.6.38.4/drivers/net/pcnet32.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/pcnet32.c --- linux-2.6.38.4/drivers/net/pcnet32.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/pcnet32.c 2011-05-01 17:02:11.000000000 -0500 @@ -82,7 +82,7 @@ /* * VLB I/O addresses */ -static unsigned int pcnet32_portlist[] __initdata = +static unsigned int pcnet32_portlist[] __devinitdata = { 0x300, 0x320, 0x340, 0x360, 0 }; static int pcnet32_debug; diff -uriN linux-2.6.38.4/drivers/net/ppp_generic.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/ppp_generic.c --- linux-2.6.38.4/drivers/net/ppp_generic.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/ppp_generic.c 2011-05-01 17:02:11.000000000 -0500 @@ -986,7 +986,6 @@ void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data; struct ppp_stats stats; struct ppp_comp_stats cstats; - char *vers; switch (cmd) { case SIOCGPPPSTATS: @@ -1008,8 +1007,7 @@ break; case SIOCGPPPVER: - vers = PPP_VERSION; - if (copy_to_user(addr, vers, strlen(vers) + 1)) + if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION))) break; err = 0; break; diff -uriN linux-2.6.38.4/drivers/net/tg3.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/tg3.h --- linux-2.6.38.4/drivers/net/tg3.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/tg3.h 2011-05-01 17:02:11.000000000 -0500 @@ -131,6 +131,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 #define CHIPREV_ID_5750_A3 0x4003 +#define CHIPREV_ID_5750_C1 0x4201 #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 diff -uriN linux-2.6.38.4/drivers/net/tulip/de4x5.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/tulip/de4x5.c --- linux-2.6.38.4/drivers/net/tulip/de4x5.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/tulip/de4x5.c 2011-05-01 17:02:11.000000000 -0500 @@ -5401,7 +5401,7 @@ for (i=0; idev_addr[i]; } - if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT; + if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT; break; case DE4X5_SET_HWADDR: /* Set the hardware address */ @@ -5441,7 +5441,7 @@ spin_lock_irqsave(&lp->lock, flags); memcpy(&statbuf, &lp->pktStats, ioc->len); spin_unlock_irqrestore(&lp->lock, flags); - if (copy_to_user(ioc->data, &statbuf, ioc->len)) + if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len)) return -EFAULT; break; } diff -uriN linux-2.6.38.4/drivers/net/tun.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/tun.c --- linux-2.6.38.4/drivers/net/tun.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/tun.c 2011-05-01 17:01:51.000000000 -0500 @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -103,6 +104,7 @@ unsigned int flags; uid_t owner; gid_t group; + nid_t nid; struct net_device *dev; struct fasync_struct *fasync; @@ -853,6 +855,7 @@ tun->owner = -1; tun->group = -1; + tun->nid = current->nid; dev->ethtool_ops = &tun_ethtool_ops; dev->destructor = tun_free_netdev; @@ -1003,7 +1006,7 @@ if (((tun->owner != -1 && cred->euid != tun->owner) || (tun->group != -1 && !in_egroup_p(tun->group))) && - !capable(CAP_NET_ADMIN)) + !cap_raised(current_cap(), CAP_NET_ADMIN)) return -EPERM; err = security_tun_dev_attach(tun->socket.sk); if (err < 0) @@ -1017,7 +1020,7 @@ char *name; unsigned long flags = 0; - if (!capable(CAP_NET_ADMIN)) + if (!nx_capable(CAP_NET_ADMIN, NXC_TUN_CREATE)) return -EPERM; err = security_tun_dev_create(); if (err < 0) @@ -1087,6 +1090,9 @@ sk->sk_destruct = tun_sock_destruct; + if (!nx_check(tun->nid, VS_IDENT | VS_HOSTID | VS_ADMIN_P)) + return -EPERM; + err = tun_attach(tun, file); if (err < 0) goto failed; @@ -1278,6 +1284,16 @@ DBG(KERN_INFO "%s: group set to %d\n", tun->dev->name, tun->group); break; + case TUNSETNID: + if (!capable(CAP_CONTEXT)) + return -EPERM; + + /* Set nid owner of the device */ + tun->nid = (nid_t) arg; + + DBG(KERN_INFO "%s: nid owner set to %u\n", tun->dev->name, tun->nid); + break; + case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { diff -uriN linux-2.6.38.4/drivers/net/usb/hso.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/usb/hso.c --- linux-2.6.38.4/drivers/net/usb/hso.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/usb/hso.c 2011-05-01 17:02:11.000000000 -0500 @@ -71,7 +71,7 @@ #include #include #include - +#include #define MOD_AUTHOR "Option Wireless" #define MOD_DESCRIPTION "USB High Speed Option driver" @@ -257,7 +257,7 @@ /* from usb_serial_port */ struct tty_struct *tty; - int open_count; + local_t open_count; spinlock_t serial_lock; int (*write_data) (struct hso_serial *serial); @@ -1190,7 +1190,7 @@ struct urb *urb; urb = serial->rx_urb[0]; - if (serial->open_count > 0) { + if (local_read(&serial->open_count) > 0) { count = put_rxbuf_data(urb, serial); if (count == -1) return; @@ -1226,7 +1226,7 @@ DUMP1(urb->transfer_buffer, urb->actual_length); /* Anyone listening? */ - if (serial->open_count == 0) + if (local_read(&serial->open_count) == 0) return; if (status == 0) { @@ -1311,8 +1311,7 @@ spin_unlock_irq(&serial->serial_lock); /* check for port already opened, if not set the termios */ - serial->open_count++; - if (serial->open_count == 1) { + if (local_inc_return(&serial->open_count) == 1) { serial->rx_state = RX_IDLE; /* Force default termio settings */ _hso_serial_set_termios(tty, NULL); @@ -1324,7 +1323,7 @@ result = hso_start_serial_device(serial->parent, GFP_KERNEL); if (result) { hso_stop_serial_device(serial->parent); - serial->open_count--; + local_dec(&serial->open_count); kref_put(&serial->parent->ref, hso_serial_ref_free); } } else { @@ -1361,10 +1360,10 @@ /* reset the rts and dtr */ /* do the actual close */ - serial->open_count--; + local_dec(&serial->open_count); - if (serial->open_count <= 0) { - serial->open_count = 0; + if (local_read(&serial->open_count) <= 0) { + local_set(&serial->open_count, 0); spin_lock_irq(&serial->serial_lock); if (serial->tty == tty) { serial->tty->driver_data = NULL; @@ -1446,7 +1445,7 @@ /* the actual setup */ spin_lock_irqsave(&serial->serial_lock, flags); - if (serial->open_count) + if (local_read(&serial->open_count)) _hso_serial_set_termios(tty, old); else tty->termios = old; @@ -1905,7 +1904,7 @@ D1("Pending read interrupt on port %d\n", i); spin_lock(&serial->serial_lock); if (serial->rx_state == RX_IDLE && - serial->open_count > 0) { + local_read(&serial->open_count) > 0) { /* Setup and send a ctrl req read on * port i */ if (!serial->rx_urb_filled[0]) { @@ -3097,7 +3096,7 @@ /* Start all serial ports */ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) { if (serial_table[i] && (serial_table[i]->interface == iface)) { - if (dev2ser(serial_table[i])->open_count) { + if (local_read(&dev2ser(serial_table[i])->open_count)) { result = hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); diff -uriN linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/vmxnet3/vmxnet3_ethtool.c --- linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-05-01 17:02:11.000000000 -0500 @@ -628,8 +628,7 @@ * Return with error code if any of the queue indices * is out of range */ - if (p->ring_index[i] < 0 || - p->ring_index[i] >= adapter->num_rx_queues) + if (p->ring_index[i] >= adapter->num_rx_queues) return -EINVAL; } diff -uriN linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/wireless/b43/debugfs.c --- linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/wireless/b43/debugfs.c 2011-05-01 17:02:11.000000000 -0500 @@ -43,7 +43,7 @@ struct b43_debugfs_fops { ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); int (*write)(struct b43_wldev *dev, const char *buf, size_t count); - struct file_operations fops; + const struct file_operations fops; /* Offset of struct b43_dfs_file in struct b43_dfsentry */ size_t file_struct_offset; }; diff -uriN linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/wireless/b43legacy/debugfs.c --- linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/wireless/b43legacy/debugfs.c 2011-05-01 17:02:11.000000000 -0500 @@ -44,7 +44,7 @@ struct b43legacy_debugfs_fops { ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); int (*write)(struct b43legacy_wldev *dev, const char *buf, size_t count); - struct file_operations fops; + const struct file_operations fops; /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ size_t file_struct_offset; /* Take wl->irq_lock before calling read/write? */ diff -uriN linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/wireless/iwlwifi/iwl-debug.h --- linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-05-01 17:02:11.000000000 -0500 @@ -68,8 +68,8 @@ } while (0) #else -#define IWL_DEBUG(__priv, level, fmt, args...) -#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) +#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0) +#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0) static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, const void *p, u32 len) {} diff -uriN linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/wireless/libertas/debugfs.c --- linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/wireless/libertas/debugfs.c 2011-05-01 17:02:11.000000000 -0500 @@ -702,7 +702,7 @@ struct lbs_debugfs_files { const char *name; int perm; - struct file_operations fops; + const struct file_operations fops; }; static const struct lbs_debugfs_files debugfs_files[] = { diff -uriN linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/wireless/rndis_wlan.c --- linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/net/wireless/rndis_wlan.c 2011-05-01 17:02:11.000000000 -0500 @@ -1277,7 +1277,7 @@ netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold); - if (rts_threshold < 0 || rts_threshold > 2347) + if (rts_threshold > 2347) rts_threshold = 2347; tmp = cpu_to_le32(rts_threshold); diff -uriN linux-2.6.38.4/drivers/oprofile/buffer_sync.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/oprofile/buffer_sync.c --- linux-2.6.38.4/drivers/oprofile/buffer_sync.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/oprofile/buffer_sync.c 2011-05-01 17:02:11.000000000 -0500 @@ -342,7 +342,7 @@ if (cookie == NO_COOKIE) offset = pc; if (cookie == INVALID_COOKIE) { - atomic_inc(&oprofile_stats.sample_lost_no_mapping); + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping); offset = pc; } if (cookie != last_cookie) { @@ -386,14 +386,14 @@ /* add userspace sample */ if (!mm) { - atomic_inc(&oprofile_stats.sample_lost_no_mm); + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm); return 0; } cookie = lookup_dcookie(mm, s->eip, &offset); if (cookie == INVALID_COOKIE) { - atomic_inc(&oprofile_stats.sample_lost_no_mapping); + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping); return 0; } @@ -562,7 +562,7 @@ /* ignore backtraces if failed to add a sample */ if (state == sb_bt_start) { state = sb_bt_ignore; - atomic_inc(&oprofile_stats.bt_lost_no_mapping); + atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping); } } release_mm(mm); diff -uriN linux-2.6.38.4/drivers/oprofile/event_buffer.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/oprofile/event_buffer.c --- linux-2.6.38.4/drivers/oprofile/event_buffer.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/oprofile/event_buffer.c 2011-05-01 17:02:11.000000000 -0500 @@ -53,7 +53,7 @@ } if (buffer_pos == buffer_size) { - atomic_inc(&oprofile_stats.event_lost_overflow); + atomic_inc_unchecked(&oprofile_stats.event_lost_overflow); return; } diff -uriN linux-2.6.38.4/drivers/oprofile/oprof.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/oprofile/oprof.c --- linux-2.6.38.4/drivers/oprofile/oprof.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/oprofile/oprof.c 2011-05-01 17:02:11.000000000 -0500 @@ -110,7 +110,7 @@ if (oprofile_ops.switch_events()) return; - atomic_inc(&oprofile_stats.multiplex_counter); + atomic_inc_unchecked(&oprofile_stats.multiplex_counter); start_switch_worker(); } diff -uriN linux-2.6.38.4/drivers/oprofile/oprofilefs.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/oprofile/oprofilefs.c --- linux-2.6.38.4/drivers/oprofile/oprofilefs.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/oprofile/oprofilefs.c 2011-05-01 17:02:11.000000000 -0500 @@ -186,7 +186,7 @@ int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root, - char const *name, atomic_t *val) + char const *name, atomic_unchecked_t *val) { return __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444, val); diff -uriN linux-2.6.38.4/drivers/oprofile/oprofile_stats.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/oprofile/oprofile_stats.c --- linux-2.6.38.4/drivers/oprofile/oprofile_stats.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/oprofile/oprofile_stats.c 2011-05-01 17:02:11.000000000 -0500 @@ -30,11 +30,11 @@ cpu_buf->sample_invalid_eip = 0; } - atomic_set(&oprofile_stats.sample_lost_no_mm, 0); - atomic_set(&oprofile_stats.sample_lost_no_mapping, 0); - atomic_set(&oprofile_stats.event_lost_overflow, 0); - atomic_set(&oprofile_stats.bt_lost_no_mapping, 0); - atomic_set(&oprofile_stats.multiplex_counter, 0); + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0); + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0); + atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0); + atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0); + atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0); } diff -uriN linux-2.6.38.4/drivers/oprofile/oprofile_stats.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/oprofile/oprofile_stats.h --- linux-2.6.38.4/drivers/oprofile/oprofile_stats.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/oprofile/oprofile_stats.h 2011-05-01 17:02:11.000000000 -0500 @@ -13,11 +13,11 @@ #include struct oprofile_stat_struct { - atomic_t sample_lost_no_mm; - atomic_t sample_lost_no_mapping; - atomic_t bt_lost_no_mapping; - atomic_t event_lost_overflow; - atomic_t multiplex_counter; + atomic_unchecked_t sample_lost_no_mm; + atomic_unchecked_t sample_lost_no_mapping; + atomic_unchecked_t bt_lost_no_mapping; + atomic_unchecked_t event_lost_overflow; + atomic_unchecked_t multiplex_counter; }; extern struct oprofile_stat_struct oprofile_stats; diff -uriN linux-2.6.38.4/drivers/parport/procfs.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/parport/procfs.c --- linux-2.6.38.4/drivers/parport/procfs.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/parport/procfs.c 2011-05-01 17:02:11.000000000 -0500 @@ -64,7 +64,7 @@ *ppos += len; - return copy_to_user(result, buffer, len) ? -EFAULT : 0; + return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0; } #ifdef CONFIG_PARPORT_1284 @@ -106,7 +106,7 @@ *ppos += len; - return copy_to_user (result, buffer, len) ? -EFAULT : 0; + return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0; } #endif /* IEEE1284.3 support. */ diff -uriN linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pci/hotplug/acpiphp_glue.c --- linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pci/hotplug/acpiphp_glue.c 2011-05-01 17:02:11.000000000 -0500 @@ -110,7 +110,7 @@ } -static struct acpi_dock_ops acpiphp_dock_ops = { +static const struct acpi_dock_ops acpiphp_dock_ops = { .handler = handle_hotplug_event_func, }; diff -uriN linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pci/hotplug/cpqphp_nvram.c --- linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pci/hotplug/cpqphp_nvram.c 2011-05-01 17:02:11.000000000 -0500 @@ -428,9 +428,13 @@ void compaq_nvram_init (void __iomem *rom_start) { + +#ifndef CONFIG_PAX_KERNEXEC if (rom_start) { compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR); } +#endif + dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ diff -uriN linux-2.6.38.4/drivers/pci/intel-iommu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pci/intel-iommu.c --- linux-2.6.38.4/drivers/pci/intel-iommu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pci/intel-iommu.c 2011-05-01 17:02:11.000000000 -0500 @@ -2934,7 +2934,7 @@ return !dma_addr; } -struct dma_map_ops intel_dma_ops = { +const struct dma_map_ops intel_dma_ops = { .alloc_coherent = intel_alloc_coherent, .free_coherent = intel_free_coherent, .map_sg = intel_map_sg, diff -uriN linux-2.6.38.4/drivers/pci/pcie/aspm.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pci/pcie/aspm.c --- linux-2.6.38.4/drivers/pci/pcie/aspm.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pci/pcie/aspm.c 2011-05-01 17:02:11.000000000 -0500 @@ -27,9 +27,9 @@ #define MODULE_PARAM_PREFIX "pcie_aspm." /* Note: those are not register definitions */ -#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */ -#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */ -#define ASPM_STATE_L1 (4) /* L1 state */ +#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */ +#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */ +#define ASPM_STATE_L1 (4U) /* L1 state */ #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW) #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) diff -uriN linux-2.6.38.4/drivers/pci/probe.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pci/probe.c --- linux-2.6.38.4/drivers/pci/probe.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pci/probe.c 2011-05-01 17:02:11.000000000 -0500 @@ -62,14 +62,14 @@ return ret; } -static ssize_t inline pci_bus_show_cpumaskaffinity(struct device *dev, +static inline ssize_t pci_bus_show_cpumaskaffinity(struct device *dev, struct device_attribute *attr, char *buf) { return pci_bus_show_cpuaffinity(dev, 0, attr, buf); } -static ssize_t inline pci_bus_show_cpulistaffinity(struct device *dev, +static inline ssize_t pci_bus_show_cpulistaffinity(struct device *dev, struct device_attribute *attr, char *buf) { @@ -165,7 +165,7 @@ u32 l, sz, mask; u16 orig_cmd; - mask = type ? PCI_ROM_ADDRESS_MASK : ~0; + mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0; if (!dev->mmio_always_on) { pci_read_config_word(dev, PCI_COMMAND, &orig_cmd); diff -uriN linux-2.6.38.4/drivers/pci/proc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pci/proc.c --- linux-2.6.38.4/drivers/pci/proc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pci/proc.c 2011-05-01 17:02:11.000000000 -0500 @@ -476,7 +476,16 @@ static int __init pci_proc_init(void) { struct pci_dev *dev = NULL; + +#ifdef CONFIG_GRKERNSEC_PROC_ADD +#ifdef CONFIG_GRKERNSEC_PROC_USER + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL); +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP) + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL); +#endif +#else proc_bus_pci_dir = proc_mkdir("bus/pci", NULL); +#endif proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized = 1; diff -uriN linux-2.6.38.4/drivers/platform/x86/asus-laptop.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/platform/x86/asus-laptop.c --- linux-2.6.38.4/drivers/platform/x86/asus-laptop.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/platform/x86/asus-laptop.c 2011-05-01 17:02:11.000000000 -0500 @@ -243,7 +243,6 @@ struct asus_led gled; struct asus_led kled; struct workqueue_struct *led_workqueue; - int wireless_status; bool have_rsts; int lcd_state; diff -uriN linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pnp/pnpbios/bioscalls.c --- linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pnp/pnpbios/bioscalls.c 2011-05-01 17:02:11.000000000 -0500 @@ -59,7 +59,7 @@ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092, +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093, (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1); /* @@ -96,7 +96,10 @@ cpu = get_cpu(); save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8]; + + pax_open_kernel(); get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc; + pax_close_kernel(); /* On some boxes IRQ's during PnP BIOS calls are deadly. */ spin_lock_irqsave(&pnp_bios_lock, flags); @@ -134,7 +137,10 @@ :"memory"); spin_unlock_irqrestore(&pnp_bios_lock, flags); + pax_open_kernel(); get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40; + pax_close_kernel(); + put_cpu(); /* If we get here and this is set then the PnP BIOS faulted on us. */ @@ -468,7 +474,7 @@ return status; } -void pnpbios_calls_init(union pnp_bios_install_struct *header) +void __init pnpbios_calls_init(union pnp_bios_install_struct *header) { int i; @@ -476,6 +482,8 @@ pnp_bios_callpoint.offset = header->fields.pm16offset; pnp_bios_callpoint.segment = PNP_CS16; + pax_open_kernel(); + for_each_possible_cpu(i) { struct desc_struct *gdt = get_cpu_gdt_table(i); if (!gdt) @@ -487,4 +495,6 @@ set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS], (unsigned long)__va(header->fields.pm16dseg)); } + + pax_close_kernel(); } diff -uriN linux-2.6.38.4/drivers/pnp/resource.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pnp/resource.c --- linux-2.6.38.4/drivers/pnp/resource.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/pnp/resource.c 2011-05-01 17:02:11.000000000 -0500 @@ -360,7 +360,7 @@ return 1; /* check if the resource is valid */ - if (*irq < 0 || *irq > 15) + if (*irq > 15) return 0; /* check if the resource is reserved */ @@ -424,7 +424,7 @@ return 1; /* check if the resource is valid */ - if (*dma < 0 || *dma == 4 || *dma > 7) + if (*dma == 4 || *dma > 7) return 0; /* check if the resource is reserved */ diff -uriN linux-2.6.38.4/drivers/rtc/rtc-dev.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/rtc/rtc-dev.c --- linux-2.6.38.4/drivers/rtc/rtc-dev.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/rtc/rtc-dev.c 2011-05-01 17:02:11.000000000 -0500 @@ -14,6 +14,7 @@ #include #include #include +#include #include "rtc-core.h" static dev_t rtc_devt; @@ -345,6 +346,8 @@ if (copy_from_user(&tm, uarg, sizeof(tm))) return -EFAULT; + gr_log_timechange(); + return rtc_set_time(rtc, &tm); case RTC_PIE_ON: diff -uriN linux-2.6.38.4/drivers/s390/cio/qdio_debug.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/s390/cio/qdio_debug.c --- linux-2.6.38.4/drivers/s390/cio/qdio_debug.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/s390/cio/qdio_debug.c 2011-05-01 17:02:11.000000000 -0500 @@ -225,7 +225,7 @@ filp->f_path.dentry->d_inode->i_private); } -static struct file_operations debugfs_perf_fops = { +static const struct file_operations debugfs_perf_fops = { .owner = THIS_MODULE, .open = qperf_seq_open, .read = seq_read, diff -uriN linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/aic94xx/aic94xx_init.c --- linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/aic94xx/aic94xx_init.c 2011-05-01 17:02:11.000000000 -0500 @@ -486,7 +486,7 @@ flash_error_table[i].reason); } -static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUGO, +static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUSR, asd_show_update_bios, asd_store_update_bios); static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) diff -uriN linux-2.6.38.4/drivers/scsi/hpsa.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/hpsa.c --- linux-2.6.38.4/drivers/scsi/hpsa.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/hpsa.c 2011-05-01 17:02:11.000000000 -0500 @@ -2281,6 +2281,8 @@ int err; u32 cp; + memset(&arg64, 0, sizeof(arg64)); + err = 0; err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info, sizeof(arg64.LUN_info)); diff -uriN linux-2.6.38.4/drivers/scsi/ipr.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/ipr.c --- linux-2.6.38.4/drivers/scsi/ipr.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/ipr.c 2011-05-01 17:02:11.000000000 -0500 @@ -6207,7 +6207,7 @@ return true; } -static struct ata_port_operations ipr_sata_ops = { +static const struct ata_port_operations ipr_sata_ops = { .phy_reset = ipr_ata_phy_reset, .hardreset = ipr_sata_reset, .post_internal_cmd = ipr_ata_post_internal, diff -uriN linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/libfc/fc_exch.c --- linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/libfc/fc_exch.c 2011-05-01 17:02:11.000000000 -0500 @@ -105,12 +105,12 @@ * all together if not used XXX */ struct { - atomic_t no_free_exch; - atomic_t no_free_exch_xid; - atomic_t xid_not_found; - atomic_t xid_busy; - atomic_t seq_not_found; - atomic_t non_bls_resp; + atomic_unchecked_t no_free_exch; + atomic_unchecked_t no_free_exch_xid; + atomic_unchecked_t xid_not_found; + atomic_unchecked_t xid_busy; + atomic_unchecked_t seq_not_found; + atomic_unchecked_t non_bls_resp; } stats; }; @@ -687,7 +687,7 @@ /* allocate memory for exchange */ ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC); if (!ep) { - atomic_inc(&mp->stats.no_free_exch); + atomic_inc_unchecked(&mp->stats.no_free_exch); goto out; } memset(ep, 0, sizeof(*ep)); @@ -748,7 +748,7 @@ return ep; err: spin_unlock_bh(&pool->lock); - atomic_inc(&mp->stats.no_free_exch_xid); + atomic_inc_unchecked(&mp->stats.no_free_exch_xid); mempool_free(ep, mp->ep_pool); return NULL; } @@ -893,7 +893,7 @@ xid = ntohs(fh->fh_ox_id); /* we originated exch */ ep = fc_exch_find(mp, xid); if (!ep) { - atomic_inc(&mp->stats.xid_not_found); + atomic_inc_unchecked(&mp->stats.xid_not_found); reject = FC_RJT_OX_ID; goto out; } @@ -923,7 +923,7 @@ ep = fc_exch_find(mp, xid); if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) { if (ep) { - atomic_inc(&mp->stats.xid_busy); + atomic_inc_unchecked(&mp->stats.xid_busy); reject = FC_RJT_RX_ID; goto rel; } @@ -934,7 +934,7 @@ } xid = ep->xid; /* get our XID */ } else if (!ep) { - atomic_inc(&mp->stats.xid_not_found); + atomic_inc_unchecked(&mp->stats.xid_not_found); reject = FC_RJT_RX_ID; /* XID not found */ goto out; } @@ -951,7 +951,7 @@ } else { sp = &ep->seq; if (sp->id != fh->fh_seq_id) { - atomic_inc(&mp->stats.seq_not_found); + atomic_inc_unchecked(&mp->stats.seq_not_found); reject = FC_RJT_SEQ_ID; /* sequence/exch should exist */ goto rel; } @@ -1368,22 +1368,22 @@ ep = fc_exch_find(mp, ntohs(fh->fh_ox_id)); if (!ep) { - atomic_inc(&mp->stats.xid_not_found); + atomic_inc_unchecked(&mp->stats.xid_not_found); goto out; } if (ep->esb_stat & ESB_ST_COMPLETE) { - atomic_inc(&mp->stats.xid_not_found); + atomic_inc_unchecked(&mp->stats.xid_not_found); goto rel; } if (ep->rxid == FC_XID_UNKNOWN) ep->rxid = ntohs(fh->fh_rx_id); if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) { - atomic_inc(&mp->stats.xid_not_found); + atomic_inc_unchecked(&mp->stats.xid_not_found); goto rel; } if (ep->did != ntoh24(fh->fh_s_id) && ep->did != FC_FID_FLOGI) { - atomic_inc(&mp->stats.xid_not_found); + atomic_inc_unchecked(&mp->stats.xid_not_found); goto rel; } sof = fr_sof(fp); @@ -1392,7 +1392,7 @@ sp->ssb_stat |= SSB_ST_RESP; sp->id = fh->fh_seq_id; } else if (sp->id != fh->fh_seq_id) { - atomic_inc(&mp->stats.seq_not_found); + atomic_inc_unchecked(&mp->stats.seq_not_found); goto rel; } @@ -1455,9 +1455,9 @@ sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */ if (!sp) - atomic_inc(&mp->stats.xid_not_found); + atomic_inc_unchecked(&mp->stats.xid_not_found); else - atomic_inc(&mp->stats.non_bls_resp); + atomic_inc_unchecked(&mp->stats.non_bls_resp); fc_frame_free(fp); } diff -uriN linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/libsas/sas_ata.c --- linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/libsas/sas_ata.c 2011-05-01 17:02:11.000000000 -0500 @@ -348,7 +348,7 @@ } } -static struct ata_port_operations sas_sata_ops = { +static const struct ata_port_operations sas_sata_ops = { .phy_reset = sas_ata_phy_reset, .post_internal_cmd = sas_ata_post_internal, .qc_defer = ata_std_qc_defer, diff -uriN linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/qla2xxx/qla_os.c --- linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/qla2xxx/qla_os.c 2011-05-01 17:02:11.000000000 -0500 @@ -4096,7 +4096,7 @@ .err_handler = &qla2xxx_err_handler, }; -static struct file_operations apidev_fops = { +static const struct file_operations apidev_fops = { .owner = THIS_MODULE, .llseek = noop_llseek, }; diff -uriN linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/scsi_transport_fc.c --- linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/scsi_transport_fc.c 2011-05-01 17:02:11.000000000 -0500 @@ -836,7 +836,7 @@ char *cp; *val = simple_strtoul(buf, &cp, 0); - if ((*cp && (*cp != '\n')) || (*val < 0)) + if (*cp && (*cp != '\n')) return -EINVAL; /* * Check for overflow; dev_loss_tmo is u32 diff -uriN linux-2.6.38.4/drivers/scsi/sg.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/sg.c --- linux-2.6.38.4/drivers/scsi/sg.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/scsi/sg.c 2011-05-01 17:02:11.000000000 -0500 @@ -2310,7 +2310,7 @@ const struct file_operations * fops; }; -static struct sg_proc_leaf sg_proc_leaf_arr[] = { +static const struct sg_proc_leaf sg_proc_leaf_arr[] = { {"allow_dio", &adio_fops}, {"debug", &debug_fops}, {"def_reserved_size", &dressz_fops}, @@ -2325,7 +2325,7 @@ { int k, mask; int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr); - struct sg_proc_leaf * leaf; + const struct sg_proc_leaf * leaf; sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) diff -uriN linux-2.6.38.4/drivers/staging/autofs/root.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/autofs/root.c --- linux-2.6.38.4/drivers/staging/autofs/root.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/autofs/root.c 2011-05-01 17:02:11.000000000 -0500 @@ -311,7 +311,8 @@ set_bit(n,sbi->symlink_bitmap); sl = &sbi->symlink[n]; sl->len = strlen(symname); - sl->data = kmalloc(slsize = sl->len+1, GFP_KERNEL); + slsize = sl->len+1; + sl->data = kmalloc(slsize, GFP_KERNEL); if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); diff -uriN linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/bcm/Bcmchar.c --- linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/bcm/Bcmchar.c 2011-05-01 17:02:11.000000000 -0500 @@ -2093,7 +2093,7 @@ } -static struct file_operations bcm_fops = { +static const struct file_operations bcm_fops = { .owner = THIS_MODULE, .open = bcm_char_open, .release = bcm_char_release, diff -uriN linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/brcm80211/brcmfmac/dhd_linux.c --- linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-05-01 17:02:11.000000000 -0500 @@ -863,14 +863,14 @@ free_netdev(ifp->net); } /* Allocate etherdev, including space for private structure */ - ifp->net = alloc_etherdev(sizeof(dhd)); + ifp->net = alloc_etherdev(sizeof(*dhd)); if (!ifp->net) { DHD_ERROR(("%s: OOM - alloc_etherdev\n", __func__)); ret = -ENOMEM; } if (ret == 0) { strcpy(ifp->net->name, ifp->name); - memcpy(netdev_priv(ifp->net), &dhd, sizeof(dhd)); + memcpy(netdev_priv(ifp->net), dhd, sizeof(*dhd)); err = dhd_net_attach(&dhd->pub, ifp->idx); if (err != 0) { DHD_ERROR(("%s: dhd_net_attach failed, " @@ -1969,25 +1969,23 @@ strcpy(nv_path, nvram_path); /* Allocate etherdev, including space for private structure */ - net = alloc_etherdev(sizeof(dhd)); + net = alloc_etherdev(sizeof(*dhd)); if (!net) { DHD_ERROR(("%s: OOM - alloc_etherdev\n", __func__)); goto fail; } /* Allocate primary dhd_info */ - dhd = kmalloc(sizeof(dhd_info_t), GFP_ATOMIC); + dhd = kzalloc(sizeof(dhd_info_t), GFP_ATOMIC); if (!dhd) { DHD_ERROR(("%s: OOM - alloc dhd_info\n", __func__)); goto fail; } - memset(dhd, 0, sizeof(dhd_info_t)); - /* * Save the dhd_info into the priv */ - memcpy(netdev_priv(net), &dhd, sizeof(dhd)); + memcpy(netdev_priv(net), dhd, sizeof(*dhd)); dhd->pub.osh = osh; /* Set network interface name if it was provided as module parameter */ @@ -2105,7 +2103,7 @@ /* * Save the dhd_info into the priv */ - memcpy(netdev_priv(net), &dhd, sizeof(dhd)); + memcpy(netdev_priv(net), dhd, sizeof(*dhd)); #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC) g_bus = bus; diff -uriN linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/brcm80211/brcmfmac/wl_iw.c --- linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-05-01 17:02:11.000000000 -0500 @@ -513,7 +513,7 @@ list = (wl_u32_list_t *) channels; dwrq->length = sizeof(struct iw_range); - memset(range, 0, sizeof(range)); + memset(range, 0, sizeof(*range)); range->min_nwid = range->max_nwid = 0; diff -uriN linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/comedi/comedi_fops.c --- linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/comedi/comedi_fops.c 2011-05-01 17:02:11.000000000 -0500 @@ -1426,7 +1426,7 @@ mutex_unlock(&dev->mutex); } -static struct vm_operations_struct comedi_vm_ops = { +static const struct vm_operations_struct comedi_vm_ops = { .close = comedi_unmap, }; diff -uriN linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c --- linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-05-01 17:02:11.000000000 -0500 @@ -55,7 +55,7 @@ // // Table of entry-point routines for char device // -static struct file_operations ft1000fops = +static const struct file_operations ft1000fops = { .unlocked_ioctl = ft1000_ioctl, .poll = ft1000_poll_dev, diff -uriN linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/go7007/go7007-v4l2.c --- linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/go7007/go7007-v4l2.c 2011-05-01 17:02:11.000000000 -0500 @@ -1672,7 +1672,7 @@ return 0; } -static struct vm_operations_struct go7007_vm_ops = { +static const struct vm_operations_struct go7007_vm_ops = { .open = go7007_vm_open, .close = go7007_vm_close, .fault = go7007_vm_fault, diff -uriN linux-2.6.38.4/drivers/staging/hv/hv.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/hv/hv.c --- linux-2.6.38.4/drivers/staging/hv/hv.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/hv/hv.c 2011-05-01 17:02:11.000000000 -0500 @@ -163,7 +163,7 @@ u64 output_address = (output) ? virt_to_phys(output) : 0; u32 output_address_hi = output_address >> 32; u32 output_address_lo = output_address & 0xFFFFFFFF; - volatile void *hypercall_page = hv_context.hypercall_page; + volatile void *hypercall_page = ktva_ktla(hv_context.hypercall_page); DPRINT_DBG(VMBUS, "Hypercall ", control, input, output); diff -uriN linux-2.6.38.4/drivers/staging/phison/phison.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/phison/phison.c --- linux-2.6.38.4/drivers/staging/phison/phison.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/phison/phison.c 2011-05-01 17:02:11.000000000 -0500 @@ -43,7 +43,7 @@ ATA_BMDMA_SHT(DRV_NAME), }; -static struct ata_port_operations phison_ops = { +static const struct ata_port_operations phison_ops = { .inherits = &ata_bmdma_port_ops, .prereset = phison_pre_reset, }; diff -uriN linux-2.6.38.4/drivers/staging/pohmelfs/inode.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/pohmelfs/inode.c --- linux-2.6.38.4/drivers/staging/pohmelfs/inode.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/pohmelfs/inode.c 2011-05-01 17:02:11.000000000 -0500 @@ -1855,7 +1855,7 @@ mutex_init(&psb->mcache_lock); psb->mcache_root = RB_ROOT; psb->mcache_timeout = msecs_to_jiffies(5000); - atomic_long_set(&psb->mcache_gen, 0); + atomic_long_set_unchecked(&psb->mcache_gen, 0); psb->trans_max_pages = 100; diff -uriN linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/pohmelfs/mcache.c --- linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/pohmelfs/mcache.c 2011-05-01 17:02:11.000000000 -0500 @@ -121,7 +121,7 @@ m->data = data; m->start = start; m->size = size; - m->gen = atomic_long_inc_return(&psb->mcache_gen); + m->gen = atomic_long_inc_return_unchecked(&psb->mcache_gen); mutex_lock(&psb->mcache_lock); err = pohmelfs_mcache_insert(psb, m); diff -uriN linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/pohmelfs/netfs.h --- linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/pohmelfs/netfs.h 2011-05-01 17:02:11.000000000 -0500 @@ -571,7 +571,7 @@ struct pohmelfs_sb { struct rb_root mcache_root; struct mutex mcache_lock; - atomic_long_t mcache_gen; + atomic_long_unchecked_t mcache_gen; unsigned long mcache_timeout; unsigned int idx; diff -uriN linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/rtl8192u/ieee80211/proc.c --- linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/rtl8192u/ieee80211/proc.c 2011-05-01 17:02:11.000000000 -0500 @@ -99,7 +99,7 @@ return seq_open(file, &crypto_seq_ops); } -static struct file_operations proc_crypto_ops = { +static const struct file_operations proc_crypto_ops = { .open = crypto_info_open, .read = seq_read, .llseek = seq_lseek, diff -uriN linux-2.6.38.4/drivers/staging/spectra/ffsport.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/spectra/ffsport.c --- linux-2.6.38.4/drivers/staging/spectra/ffsport.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/spectra/ffsport.c 2011-05-01 17:02:11.000000000 -0500 @@ -604,7 +604,7 @@ return ret; } -static struct block_device_operations GLOB_SBD_ops = { +static const struct block_device_operations GLOB_SBD_ops = { .owner = THIS_MODULE, .open = GLOB_SBD_open, .release = GLOB_SBD_release, diff -uriN linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/vme/devices/vme_user.c --- linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/vme/devices/vme_user.c 2011-05-01 17:02:11.000000000 -0500 @@ -138,7 +138,7 @@ static int __devinit vme_user_probe(struct device *, int, int); static int __devexit vme_user_remove(struct device *, int, int); -static struct file_operations vme_user_fops = { +static const struct file_operations vme_user_fops = { .open = vme_user_open, .release = vme_user_release, .read = vme_user_read, diff -uriN linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c --- linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-05-01 17:02:11.000000000 -0500 @@ -426,7 +426,7 @@ /*standard block device driver interface */ -static struct block_device_operations cyasblkdev_bdops = { +static const struct block_device_operations cyasblkdev_bdops = { .open = cyasblkdev_blk_open, .release = cyasblkdev_blk_release, .ioctl = cyasblkdev_blk_ioctl, diff -uriN linux-2.6.38.4/drivers/tty/hvc/hvc_console.h linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/hvc/hvc_console.h --- linux-2.6.38.4/drivers/tty/hvc/hvc_console.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/hvc/hvc_console.h 2011-05-01 17:02:11.000000000 -0500 @@ -82,6 +82,7 @@ /* register a vterm for hvc tty operation (module_init or hotplug add) */ extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data, const struct hv_ops *ops, int outbuf_size); + /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ extern int hvc_remove(struct hvc_struct *hp); diff -uriN linux-2.6.38.4/drivers/tty/hvc/hvcs.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/hvc/hvcs.c --- linux-2.6.38.4/drivers/tty/hvc/hvcs.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/hvc/hvcs.c 2011-05-01 17:02:11.000000000 -0500 @@ -83,6 +83,7 @@ #include #include #include +#include /* * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00). @@ -270,7 +271,7 @@ unsigned int index; struct tty_struct *tty; - int open_count; + local_t open_count; /* * Used to tell the driver kernel_thread what operations need to take @@ -420,7 +421,7 @@ spin_lock_irqsave(&hvcsd->lock, flags); - if (hvcsd->open_count > 0) { + if (local_read(&hvcsd->open_count) > 0) { spin_unlock_irqrestore(&hvcsd->lock, flags); printk(KERN_INFO "HVCS: vterm state unchanged. " "The hvcs device node is still in use.\n"); @@ -1136,7 +1137,7 @@ if ((retval = hvcs_partner_connect(hvcsd))) goto error_release; - hvcsd->open_count = 1; + local_set(&hvcsd->open_count, 1); hvcsd->tty = tty; tty->driver_data = hvcsd; @@ -1170,7 +1171,7 @@ spin_lock_irqsave(&hvcsd->lock, flags); kref_get(&hvcsd->kref); - hvcsd->open_count++; + local_inc(&hvcsd->open_count); hvcsd->todo_mask |= HVCS_SCHED_READ; spin_unlock_irqrestore(&hvcsd->lock, flags); @@ -1214,7 +1215,7 @@ hvcsd = tty->driver_data; spin_lock_irqsave(&hvcsd->lock, flags); - if (--hvcsd->open_count == 0) { + if (local_dec_and_test(&hvcsd->open_count)) { vio_disable_interrupts(hvcsd->vdev); @@ -1240,10 +1241,10 @@ free_irq(irq, hvcsd); kref_put(&hvcsd->kref, destroy_hvcs_struct); return; - } else if (hvcsd->open_count < 0) { + } else if (local_read(&hvcsd->open_count) < 0) { printk(KERN_ERR "HVCS: vty-server@%X open_count: %d" " is missmanaged.\n", - hvcsd->vdev->unit_address, hvcsd->open_count); + hvcsd->vdev->unit_address, local_read(&hvcsd->open_count)); } spin_unlock_irqrestore(&hvcsd->lock, flags); @@ -1259,7 +1260,7 @@ spin_lock_irqsave(&hvcsd->lock, flags); /* Preserve this so that we know how many kref refs to put */ - temp_open_count = hvcsd->open_count; + temp_open_count = local_read(&hvcsd->open_count); /* * Don't kref put inside the spinlock because the destruction @@ -1274,7 +1275,7 @@ hvcsd->tty->driver_data = NULL; hvcsd->tty = NULL; - hvcsd->open_count = 0; + local_set(&hvcsd->open_count, 0); /* This will drop any buffered data on the floor which is OK in a hangup * scenario. */ @@ -1345,7 +1346,7 @@ * the middle of a write operation? This is a crummy place to do this * but we want to keep it all in the spinlock. */ - if (hvcsd->open_count <= 0) { + if (local_read(&hvcsd->open_count) <= 0) { spin_unlock_irqrestore(&hvcsd->lock, flags); return -ENODEV; } @@ -1419,7 +1420,7 @@ { struct hvcs_struct *hvcsd = tty->driver_data; - if (!hvcsd || hvcsd->open_count <= 0) + if (!hvcsd || local_read(&hvcsd->open_count) <= 0) return 0; return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; diff -uriN linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/hvc/hvc_xen.c --- linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/hvc/hvc_xen.c 2011-05-01 17:02:11.000000000 -0500 @@ -123,7 +123,7 @@ return recv; } -static struct hv_ops domU_hvc_ops = { +static const struct hv_ops domU_hvc_ops = { .get_chars = domU_read_console, .put_chars = domU_write_console, .notifier_add = notifier_add_irq, @@ -149,7 +149,7 @@ return len; } -static struct hv_ops dom0_hvc_ops = { +static const struct hv_ops dom0_hvc_ops = { .get_chars = dom0_read_console, .put_chars = dom0_write_console, .notifier_add = notifier_add_irq, @@ -160,7 +160,7 @@ static int __init xen_hvc_init(void) { struct hvc_struct *hp; - struct hv_ops *ops; + const struct hv_ops *ops; if (!xen_pv_domain()) return -ENODEV; @@ -203,7 +203,7 @@ static int xen_cons_init(void) { - struct hv_ops *ops; + const struct hv_ops *ops; if (!xen_pv_domain()) return 0; diff -uriN linux-2.6.38.4/drivers/tty/n_gsm.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/n_gsm.c --- linux-2.6.38.4/drivers/tty/n_gsm.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/n_gsm.c 2011-05-01 17:02:11.000000000 -0500 @@ -1589,7 +1589,7 @@ return NULL; spin_lock_init(&dlci->lock); dlci->fifo = &dlci->_fifo; - if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) { + if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) { kfree(dlci); return NULL; } diff -uriN linux-2.6.38.4/drivers/tty/n_tty.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/n_tty.c --- linux-2.6.38.4/drivers/tty/n_tty.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/n_tty.c 2011-05-01 17:02:11.000000000 -0500 @@ -2116,6 +2116,7 @@ { *ops = tty_ldisc_N_TTY; ops->owner = NULL; - ops->refcount = ops->flags = 0; + atomic_set(&ops->refcount, 0); + ops->flags = 0; } EXPORT_SYMBOL_GPL(n_tty_inherit_ops); diff -uriN linux-2.6.38.4/drivers/tty/pty.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/pty.c --- linux-2.6.38.4/drivers/tty/pty.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/pty.c 2011-05-01 17:02:11.000000000 -0500 @@ -700,7 +700,18 @@ return retval; } -static struct file_operations ptmx_fops; +static const struct file_operations ptmx_fops = { + .llseek = no_llseek, + .read = tty_read, + .write = tty_write, + .poll = tty_poll, + .unlocked_ioctl = tty_ioctl, + .compat_ioctl = tty_compat_ioctl, + .open = ptmx_open, + .release = tty_release, + .fasync = tty_fasync, +}; + static void __init unix98_pty_init(void) { @@ -753,10 +764,6 @@ register_sysctl_table(pty_root_table); - /* Now create the /dev/ptmx special device */ - tty_default_fops(&ptmx_fops); - ptmx_fops.open = ptmx_open; - cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) diff -uriN linux-2.6.38.4/drivers/tty/serial/kgdboc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/serial/kgdboc.c --- linux-2.6.38.4/drivers/tty/serial/kgdboc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/serial/kgdboc.c 2011-05-01 17:02:11.000000000 -0500 @@ -22,7 +22,7 @@ #define MAX_CONFIG_LEN 40 -static struct kgdb_io kgdboc_io_ops; +static struct kgdb_io kgdboc_io_ops; /* cannot be const, see configure_kgdboc() */ /* -1 = init not run yet, 0 = unconfigured, 1 = configured. */ static int configured = -1; @@ -293,7 +293,7 @@ kgdboc_restore_input(); } -static struct kgdb_io kgdboc_io_ops = { +static struct kgdb_io kgdboc_io_ops = { /* cannot be const, see configure_kgdboc() */ .name = "kgdboc", .read_char = kgdboc_get_char, .write_char = kgdboc_put_char, diff -uriN linux-2.6.38.4/drivers/tty/sysrq.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/sysrq.c --- linux-2.6.38.4/drivers/tty/sysrq.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/sysrq.c 2011-05-01 17:01:51.000000000 -0500 @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -395,6 +396,21 @@ .enable_mask = SYSRQ_ENABLE_RTNICE, }; + +#ifdef CONFIG_VSERVER_DEBUG +static void sysrq_handle_vxinfo(int key) +{ + dump_vx_info_inactive((key == 'x') ? 0 : 1); +} + +static struct sysrq_key_op sysrq_showvxinfo_op = { + .handler = sysrq_handle_vxinfo, + .help_msg = "conteXt", + .action_msg = "Show Context Info", + .enable_mask = SYSRQ_ENABLE_DUMP, +}; +#endif + /* Key Operations table and lock */ static DEFINE_SPINLOCK(sysrq_key_table_lock); @@ -449,7 +465,11 @@ NULL, /* v */ &sysrq_showstate_blocked_op, /* w */ /* x: May be registered on ppc/powerpc for xmon */ +#ifdef CONFIG_VSERVER_DEBUG + &sysrq_showvxinfo_op, /* x */ +#else NULL, /* x */ +#endif /* y: May be registered on sparc64 for global register dump */ NULL, /* y */ &sysrq_ftrace_dump_op, /* z */ @@ -464,6 +484,8 @@ retval = key - '0'; else if ((key >= 'a') && (key <= 'z')) retval = key + 10 - 'a'; + else if ((key >= 'A') && (key <= 'Z')) + retval = key + 10 - 'A'; else retval = -1; return retval; diff -uriN linux-2.6.38.4/drivers/tty/tty_io.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/tty_io.c --- linux-2.6.38.4/drivers/tty/tty_io.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/tty_io.c 2011-05-01 17:02:11.000000000 -0500 @@ -107,6 +107,7 @@ #include #include +#include #undef TTY_DEBUG_HANGUP @@ -140,21 +141,11 @@ /* Spinlock to protect the tty->tty_files list */ DEFINE_SPINLOCK(tty_files_lock); -static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *); -static ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *); ssize_t redirected_tty_write(struct file *, const char __user *, size_t, loff_t *); -static unsigned int tty_poll(struct file *, poll_table *); static int tty_open(struct inode *, struct file *); long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg); -#ifdef CONFIG_COMPAT -static long tty_compat_ioctl(struct file *file, unsigned int cmd, - unsigned long arg); -#else -#define tty_compat_ioctl NULL -#endif static int __tty_fasync(int fd, struct file *filp, int on); -static int tty_fasync(int fd, struct file *filp, int on); static void release_tty(struct tty_struct *tty, int idx); static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty); static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty); @@ -938,7 +929,7 @@ * read calls may be outstanding in parallel. */ -static ssize_t tty_read(struct file *file, char __user *buf, size_t count, +ssize_t tty_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { int i; @@ -964,6 +955,8 @@ return i; } +EXPORT_SYMBOL(tty_read); + void tty_write_unlock(struct tty_struct *tty) { mutex_unlock(&tty->atomic_write_lock); @@ -1113,7 +1106,7 @@ * write method will not be invoked in parallel for each device. */ -static ssize_t tty_write(struct file *file, const char __user *buf, +ssize_t tty_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { struct inode *inode = file->f_path.dentry->d_inode; @@ -1139,6 +1132,8 @@ return ret; } +EXPORT_SYMBOL(tty_write); + ssize_t redirected_tty_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { @@ -1778,6 +1773,8 @@ return 0; } +EXPORT_SYMBOL(tty_release); + /** * tty_open - open a tty device * @inode: inode of device file @@ -1969,7 +1966,7 @@ * may be re-entered freely by other callers. */ -static unsigned int tty_poll(struct file *filp, poll_table *wait) +unsigned int tty_poll(struct file *filp, poll_table *wait) { struct tty_struct *tty = file_tty(filp); struct tty_ldisc *ld; @@ -1985,6 +1982,8 @@ return ret; } +EXPORT_SYMBOL(tty_poll); + static int __tty_fasync(int fd, struct file *filp, int on) { struct tty_struct *tty = file_tty(filp); @@ -2026,7 +2025,7 @@ return retval; } -static int tty_fasync(int fd, struct file *filp, int on) +int tty_fasync(int fd, struct file *filp, int on) { int retval; tty_lock(); @@ -2035,6 +2034,8 @@ return retval; } +EXPORT_SYMBOL(tty_fasync); + /** * tiocsti - fake input character * @tty: tty to fake input into @@ -2057,7 +2058,8 @@ char ch, mbz = 0; struct tty_ldisc *ld; - if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN)) + if (((current->signal->tty != tty) && + !vx_capable(CAP_SYS_ADMIN, VXC_TIOCSTI))) return -EPERM; if (get_user(ch, p)) return -EFAULT; @@ -2345,6 +2347,7 @@ return -ENOTTY; if (get_user(pgrp_nr, p)) return -EFAULT; + pgrp_nr = vx_rmap_pid(pgrp_nr); if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); @@ -2692,8 +2695,10 @@ return retval; } +EXPORT_SYMBOL(tty_ioctl); + #ifdef CONFIG_COMPAT -static long tty_compat_ioctl(struct file *file, unsigned int cmd, +long tty_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct inode *inode = file->f_dentry->d_inode; @@ -2717,6 +2722,9 @@ return retval; } + +EXPORT_SYMBOL(tty_compat_ioctl); + #endif /* @@ -3195,11 +3203,6 @@ } EXPORT_SYMBOL_GPL(get_current_tty); -void tty_default_fops(struct file_operations *fops) -{ - *fops = tty_fops; -} - /* * Initialize the console device. This is called *early*, so * we can't necessarily depend on lots of kernel help here. diff -uriN linux-2.6.38.4/drivers/tty/tty_ldisc.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/tty_ldisc.c --- linux-2.6.38.4/drivers/tty/tty_ldisc.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/tty_ldisc.c 2011-05-01 17:02:11.000000000 -0500 @@ -76,7 +76,7 @@ if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { struct tty_ldisc_ops *ldo = ld->ops; - ldo->refcount--; + atomic_dec(&ldo->refcount); module_put(ldo->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); @@ -111,7 +111,7 @@ spin_lock_irqsave(&tty_ldisc_lock, flags); tty_ldiscs[disc] = new_ldisc; new_ldisc->num = disc; - new_ldisc->refcount = 0; + atomic_set(&new_ldisc->refcount, 0); spin_unlock_irqrestore(&tty_ldisc_lock, flags); return ret; @@ -139,7 +139,7 @@ return -EINVAL; spin_lock_irqsave(&tty_ldisc_lock, flags); - if (tty_ldiscs[disc]->refcount) + if (atomic_read(&tty_ldiscs[disc]->refcount)) ret = -EBUSY; else tty_ldiscs[disc] = NULL; @@ -160,7 +160,7 @@ if (ldops) { ret = ERR_PTR(-EAGAIN); if (try_module_get(ldops->owner)) { - ldops->refcount++; + atomic_inc(&ldops->refcount); ret = ldops; } } @@ -173,7 +173,7 @@ unsigned long flags; spin_lock_irqsave(&tty_ldisc_lock, flags); - ldops->refcount--; + atomic_dec(&ldops->refcount); module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } diff -uriN linux-2.6.38.4/drivers/tty/vt/keyboard.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/vt/keyboard.c --- linux-2.6.38.4/drivers/tty/vt/keyboard.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/vt/keyboard.c 2011-05-01 17:02:11.000000000 -0500 @@ -657,6 +657,16 @@ kbd->kbdmode == VC_MEDIUMRAW) && value != KVAL(K_SAK)) return; /* SAK is allowed even in raw mode */ + +#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP) + { + void *func = fn_handler[value]; + if (func == fn_show_state || func == fn_show_ptregs || + func == fn_show_mem) + return; + } +#endif + fn_handler[value](vc); } diff -uriN linux-2.6.38.4/drivers/tty/vt/vt.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/vt/vt.c --- linux-2.6.38.4/drivers/tty/vt/vt.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/vt/vt.c 2011-05-01 17:02:11.000000000 -0500 @@ -262,7 +262,7 @@ static void notify_write(struct vc_data *vc, unsigned int unicode) { - struct vt_notifier_param param = { .vc = vc, unicode = unicode }; + struct vt_notifier_param param = { .vc = vc, .c = unicode }; atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m); } diff -uriN linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/vt/vt_ioctl.c --- linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/tty/vt/vt_ioctl.c 2011-05-01 17:02:11.000000000 -0500 @@ -210,9 +210,6 @@ if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) return -EFAULT; - if (!capable(CAP_SYS_TTY_CONFIG)) - perm = 0; - switch (cmd) { case KDGKBENT: key_map = key_maps[s]; @@ -224,6 +221,9 @@ val = (i ? K_HOLE : K_NOSUCHMAP); return put_user(val, &user_kbe->kb_value); case KDSKBENT: + if (!capable(CAP_SYS_TTY_CONFIG)) + perm = 0; + if (!perm) return -EPERM; if (!i && v == K_NOSUCHMAP) { @@ -325,9 +325,6 @@ int i, j, k; int ret; - if (!capable(CAP_SYS_TTY_CONFIG)) - perm = 0; - kbs = kmalloc(sizeof(*kbs), GFP_KERNEL); if (!kbs) { ret = -ENOMEM; @@ -361,6 +358,9 @@ kfree(kbs); return ((p && *p) ? -EOVERFLOW : 0); case KDSKBSENT: + if (!capable(CAP_SYS_TTY_CONFIG)) + perm = 0; + if (!perm) { ret = -EPERM; goto reterr; diff -uriN linux-2.6.38.4/drivers/uio/uio.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/uio/uio.c --- linux-2.6.38.4/drivers/uio/uio.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/uio/uio.c 2011-05-01 17:02:11.000000000 -0500 @@ -25,6 +25,7 @@ #include #include #include +#include #define UIO_MAX_DEVICES (1U << MINORBITS) @@ -35,7 +36,7 @@ atomic_t event; struct fasync_struct *async_queue; wait_queue_head_t wait; - int vma_count; + local_t vma_count; struct uio_info *info; struct kobject *map_dir; struct kobject *portio_dir; @@ -602,13 +603,13 @@ static void uio_vma_open(struct vm_area_struct *vma) { struct uio_device *idev = vma->vm_private_data; - idev->vma_count++; + local_inc(&idev->vma_count); } static void uio_vma_close(struct vm_area_struct *vma) { struct uio_device *idev = vma->vm_private_data; - idev->vma_count--; + local_dec(&idev->vma_count); } static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) diff -uriN linux-2.6.38.4/drivers/usb/atm/cxacru.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/usb/atm/cxacru.c --- linux-2.6.38.4/drivers/usb/atm/cxacru.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/usb/atm/cxacru.c 2011-05-01 17:02:11.000000000 -0500 @@ -473,7 +473,7 @@ ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp); if (ret < 2) return -EINVAL; - if (index < 0 || index > 0x7f) + if (index > 0x7f) return -EINVAL; pos += tmp; diff -uriN linux-2.6.38.4/drivers/usb/atm/usbatm.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/usb/atm/usbatm.c --- linux-2.6.38.4/drivers/usb/atm/usbatm.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/usb/atm/usbatm.c 2011-05-01 17:02:11.000000000 -0500 @@ -332,7 +332,7 @@ if (printk_ratelimit()) atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", __func__, vpi, vci); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); return; } @@ -360,7 +360,7 @@ if (length > ATM_MAX_AAL5_PDU) { atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n", __func__, length, vcc); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); goto out; } @@ -369,14 +369,14 @@ if (sarb->len < pdu_length) { atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n", __func__, pdu_length, sarb->len, vcc); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); goto out; } if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) { atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n", __func__, vcc); - atomic_inc(&vcc->stats->rx_err); + atomic_inc_unchecked(&vcc->stats->rx_err); goto out; } @@ -386,7 +386,7 @@ if (printk_ratelimit()) atm_err(instance, "%s: no memory for skb (length: %u)!\n", __func__, length); - atomic_inc(&vcc->stats->rx_drop); + atomic_inc_unchecked(&vcc->stats->rx_drop); goto out; } @@ -411,7 +411,7 @@ vcc->push(vcc, skb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); out: skb_trim(sarb, 0); } @@ -614,7 +614,7 @@ struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc; usbatm_pop(vcc, skb); - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); skb = skb_dequeue(&instance->sndqueue); } @@ -773,11 +773,11 @@ if (!left--) return sprintf(page, "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n", - atomic_read(&atm_dev->stats.aal5.tx), - atomic_read(&atm_dev->stats.aal5.tx_err), - atomic_read(&atm_dev->stats.aal5.rx), - atomic_read(&atm_dev->stats.aal5.rx_err), - atomic_read(&atm_dev->stats.aal5.rx_drop)); + atomic_read_unchecked(&atm_dev->stats.aal5.tx), + atomic_read_unchecked(&atm_dev->stats.aal5.tx_err), + atomic_read_unchecked(&atm_dev->stats.aal5.rx), + atomic_read_unchecked(&atm_dev->stats.aal5.rx_err), + atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop)); if (!left--) { if (instance->disconnected) diff -uriN linux-2.6.38.4/drivers/usb/core/hcd.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/usb/core/hcd.c --- linux-2.6.38.4/drivers/usb/core/hcd.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/usb/core/hcd.c 2011-05-01 17:02:17.000000000 -0500 @@ -2457,7 +2457,7 @@ #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) -struct usb_mon_operations *mon_ops; +const struct usb_mon_operations *mon_ops; /* * The registration is unlocked. @@ -2467,7 +2467,7 @@ * symbols from usbcore, usbcore gets referenced and cannot be unloaded first. */ -int usb_mon_register (struct usb_mon_operations *ops) +int usb_mon_register (const struct usb_mon_operations *ops) { if (mon_ops) diff -uriN linux-2.6.38.4/drivers/usb/core/message.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/usb/core/message.c --- linux-2.6.38.4/drivers/usb/core/message.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/usb/core/message.c 2011-05-01 17:02:17.000000000 -0500 @@ -869,8 +869,8 @@ buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE); - if (len > 0) { - smallbuf = kmalloc(++len, GFP_NOIO); + if (len++ > 0) { + smallbuf = kmalloc(len, GFP_NOIO); if (!smallbuf) return buf; memcpy(smallbuf, buf, len); diff -uriN linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/usb/early/ehci-dbgp.c --- linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/usb/early/ehci-dbgp.c 2011-05-01 17:02:17.000000000 -0500 @@ -96,7 +96,7 @@ } #ifdef CONFIG_KGDB -static struct kgdb_io kgdbdbgp_io_ops; +static struct kgdb_io kgdbdbgp_io_ops; /* cannot be const, see kgdbdbgp_parse_config */ #define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops) #else #define dbgp_kgdb_mode (0) @@ -1026,7 +1026,7 @@ early_dbgp_write(NULL, &chr, 1); } -static struct kgdb_io kgdbdbgp_io_ops = { +static struct kgdb_io kgdbdbgp_io_ops = { /* cannot be const, see kgdbdbgp_parse_config() */ .name = "kgdbdbgp", .read_char = kgdbdbgp_read_char, .write_char = kgdbdbgp_write_char, diff -uriN linux-2.6.38.4/drivers/usb/mon/mon_main.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/usb/mon/mon_main.c --- linux-2.6.38.4/drivers/usb/mon/mon_main.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/usb/mon/mon_main.c 2011-05-01 17:02:17.000000000 -0500 @@ -238,7 +238,7 @@ /* * Ops */ -static struct usb_mon_operations mon_ops_0 = { +static const struct usb_mon_operations mon_ops_0 = { .urb_submit = mon_submit, .urb_submit_error = mon_submit_error, .urb_complete = mon_complete, diff -uriN linux-2.6.38.4/drivers/vhost/vhost.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/vhost/vhost.c --- linux-2.6.38.4/drivers/vhost/vhost.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/vhost/vhost.c 2011-05-01 17:02:17.000000000 -0500 @@ -565,7 +565,7 @@ return get_user(vq->last_used_idx, &used->idx); } -static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp) +static long vhost_set_vring(struct vhost_dev *d, unsigned int ioctl, void __user *argp) { struct file *eventfp, *filep = NULL, *pollstart = NULL, *pollstop = NULL; diff -uriN linux-2.6.38.4/drivers/video/fbcmap.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/video/fbcmap.c --- linux-2.6.38.4/drivers/video/fbcmap.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/video/fbcmap.c 2011-05-01 17:02:17.000000000 -0500 @@ -285,8 +285,7 @@ rc = -ENODEV; goto out; } - if (cmap->start < 0 || (!info->fbops->fb_setcolreg && - !info->fbops->fb_setcmap)) { + if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) { rc = -EINVAL; goto out1; } diff -uriN linux-2.6.38.4/drivers/video/fbmem.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/video/fbmem.c --- linux-2.6.38.4/drivers/video/fbmem.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/video/fbmem.c 2011-05-01 17:02:17.000000000 -0500 @@ -403,7 +403,7 @@ image->dx += image->width + 8; } } else if (rotate == FB_ROTATE_UD) { - for (x = 0; x < num && image->dx >= 0; x++) { + for (x = 0; x < num && (__s32)image->dx >= 0; x++) { info->fbops->fb_imageblit(info, image); image->dx -= image->width + 8; } @@ -415,7 +415,7 @@ image->dy += image->height + 8; } } else if (rotate == FB_ROTATE_CCW) { - for (x = 0; x < num && image->dy >= 0; x++) { + for (x = 0; x < num && (__s32)image->dy >= 0; x++) { info->fbops->fb_imageblit(info, image); image->dy -= image->height + 8; } @@ -1101,7 +1101,7 @@ return -EFAULT; if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES) return -EINVAL; - if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX) + if (con2fb.framebuffer >= FB_MAX) return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); diff -uriN linux-2.6.38.4/drivers/video/i810/i810_accel.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/video/i810/i810_accel.c --- linux-2.6.38.4/drivers/video/i810/i810_accel.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/video/i810/i810_accel.c 2011-05-01 17:02:17.000000000 -0500 @@ -73,6 +73,7 @@ } } printk("ringbuffer lockup!!!\n"); + printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space); i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; diff -uriN linux-2.6.38.4/drivers/video/pxa3xx-gcu.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/video/pxa3xx-gcu.c --- linux-2.6.38.4/drivers/video/pxa3xx-gcu.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/video/pxa3xx-gcu.c 2011-05-01 17:02:17.000000000 -0500 @@ -103,7 +103,7 @@ dma_addr_t shared_phys; struct resource *resource_mem; struct miscdevice misc_dev; - struct file_operations misc_fops; + const struct file_operations misc_fops; wait_queue_head_t wait_idle; wait_queue_head_t wait_free; spinlock_t spinlock; diff -uriN linux-2.6.38.4/drivers/video/uvesafb.c linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/video/uvesafb.c --- linux-2.6.38.4/drivers/video/uvesafb.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.4-vs2.3.0.37-rc15-grsec-2.2.2-201104232142/drivers/video/uvesafb.c 2011-05-01 17:02:17.000000000 -0500 @@ -19,6 +19,7 @@ #include #include #include +#include #include