diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/Documentation/dontdiff linux-2.6.39-pax/Documentation/dontdiff --- linux-2.6.39/Documentation/dontdiff 2011-03-15 19:31:50.000000000 +0100 +++ linux-2.6.39-pax/Documentation/dontdiff 2011-05-19 13:45:26.000000000 +0200 @@ -1,13 +1,16 @@ *.a *.aux *.bin +*.cis *.cpio *.csp +*.dbg *.dsp *.dvi *.elf *.eps *.fw +*.gcno *.gen.S *.gif *.grep @@ -38,8 +41,10 @@ *.tab.h *.tex *.ver +*.vim *.xml *_MODULES +*_reg_safe.h *_vga16.c *~ *.9 @@ -49,11 +54,16 @@ 53c700_d.h CVS ChangeSet +GPATH +GRTAGS +GSYMS +GTAGS Image Kerntypes Module.markers Module.symvers PENDING +PERF* SCCS System.map* TAGS @@ -80,8 +90,11 @@ btfixupprep build bvmlinux bzImage* +capability_names.h capflags.c classlist.h* +clut_vga16.c +common-cmds.h comp*.log compile.h* conf @@ -106,16 +119,19 @@ fore200e_mkfirm 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 +141,6 @@ int32.c int4.c int8.c kallsyms -kconfig keywords.c ksym.c* ksym.h* @@ -149,7 +164,9 @@ mkboot mkbugboot mkcpustr mkdep +mkpiggy mkprep +mkregtable mktables mktree modpost @@ -165,6 +182,7 @@ parse.h patches* pca200e.bin pca200e_ecd.bin2 +perf-archive piggy.gz piggyback piggy.S @@ -180,7 +198,9 @@ r600_reg_safe.h raid6altivec*.c raid6int*.c raid6tables.c +regdb.c relocs +rlim_names.h rn50_reg_safe.h rs600_reg_safe.h rv515_reg_safe.h @@ -189,6 +209,7 @@ setup setup.bin setup.elf sImage +slabinfo sm_tbl* split-include syscalltab.h @@ -213,13 +234,17 @@ version.h* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/Documentation/filesystems/configfs/configfs_example_macros.c linux-2.6.39-pax/Documentation/filesystems/configfs/configfs_example_macros.c --- linux-2.6.39/Documentation/filesystems/configfs/configfs_example_macros.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/Documentation/filesystems/configfs/configfs_example_macros.c 2011-05-19 14:23:27.000000000 +0200 @@ -368,7 +368,7 @@ static struct configfs_item_operations g * Note that, since no extra work is required on ->drop_item(), * no ->drop_item() is provided. */ -static struct configfs_group_operations group_children_group_ops = { +static const struct configfs_group_operations group_children_group_ops = { .make_group = group_children_make_group, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/Documentation/filesystems/sysfs.txt linux-2.6.39-pax/Documentation/filesystems/sysfs.txt --- linux-2.6.39/Documentation/filesystems/sysfs.txt 2011-05-19 10:20:47.000000000 +0200 +++ linux-2.6.39-pax/Documentation/filesystems/sysfs.txt 2011-05-19 14:23:27.000000000 +0200 @@ -125,8 +125,8 @@ set of sysfs operations for forwarding r 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/Documentation/kernel-parameters.txt linux-2.6.39-pax/Documentation/kernel-parameters.txt --- linux-2.6.39/Documentation/kernel-parameters.txt 2011-05-19 10:20:47.000000000 +0200 +++ linux-2.6.39-pax/Documentation/kernel-parameters.txt 2011-05-19 13:45:26.000000000 +0200 @@ -1879,6 +1879,13 @@ bytes respectively. Such letter suffixes 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/Makefile linux-2.6.39-pax/Makefile --- linux-2.6.39/Makefile 2011-05-19 10:20:48.000000000 +0200 +++ linux-2.6.39-pax/Makefile 2011-05-19 13:45:26.000000000 +0200 @@ -237,8 +237,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" HOSTCC = gcc HOSTCXX = g++ -HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -HOSTCXXFLAGS = -O2 +HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks +HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks # Decide whether to build built-in, modular, or both. # Normally, just do built-in. @@ -356,6 +356,7 @@ LINUXINCLUDE := -I$(srctree)/arch/$(h KBUILD_CPPFLAGS := -D__KERNEL__ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ + -W -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initializers \ -fno-strict-aliasing -fno-common \ -Werror-implicit-function-declaration \ -Wno-format-security \ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/include/asm/dma-mapping.h linux-2.6.39-pax/arch/alpha/include/asm/dma-mapping.h --- linux-2.6.39/arch/alpha/include/asm/dma-mapping.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/include/asm/dma-mapping.h 2011-05-19 14:23:27.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/include/asm/elf.h linux-2.6.39-pax/arch/alpha/include/asm/elf.h --- linux-2.6.39/arch/alpha/include/asm/elf.h 2011-05-19 10:20:48.000000000 +0200 +++ linux-2.6.39-pax/arch/alpha/include/asm/elf.h 2011-05-19 13:45:26.000000000 +0200 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/include/asm/pgtable.h linux-2.6.39-pax/arch/alpha/include/asm/pgtable.h --- linux-2.6.39/arch/alpha/include/asm/pgtable.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/include/asm/pgtable.h 2011-05-19 13:45:26.000000000 +0200 @@ -101,6 +101,17 @@ struct vm_area_struct; #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/core_apecs.c linux-2.6.39-pax/arch/alpha/kernel/core_apecs.c --- linux-2.6.39/arch/alpha/kernel/core_apecs.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/core_apecs.c 2011-05-19 14:26:51.000000000 +0200 @@ -305,7 +305,7 @@ apecs_write_config(struct pci_bus *bus, return PCIBIOS_SUCCESSFUL; } -struct pci_ops apecs_pci_ops = +const struct pci_ops apecs_pci_ops = { .read = apecs_read_config, .write = apecs_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/core_cia.c linux-2.6.39-pax/arch/alpha/kernel/core_cia.c --- linux-2.6.39/arch/alpha/kernel/core_cia.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/core_cia.c 2011-05-19 14:27:06.000000000 +0200 @@ -239,7 +239,7 @@ cia_write_config(struct pci_bus *bus, un return PCIBIOS_SUCCESSFUL; } -struct pci_ops cia_pci_ops = +const struct pci_ops cia_pci_ops = { .read = cia_read_config, .write = cia_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/core_irongate.c linux-2.6.39-pax/arch/alpha/kernel/core_irongate.c --- linux-2.6.39/arch/alpha/kernel/core_irongate.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/core_irongate.c 2011-05-19 14:27:18.000000000 +0200 @@ -155,7 +155,7 @@ irongate_write_config(struct pci_bus *bu return PCIBIOS_SUCCESSFUL; } -struct pci_ops irongate_pci_ops = +const struct pci_ops irongate_pci_ops = { .read = irongate_read_config, .write = irongate_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/core_lca.c linux-2.6.39-pax/arch/alpha/kernel/core_lca.c --- linux-2.6.39/arch/alpha/kernel/core_lca.c 2011-05-19 10:20:49.000000000 +0200 +++ linux-2.6.39-pax/arch/alpha/kernel/core_lca.c 2011-05-19 14:27:27.000000000 +0200 @@ -231,7 +231,7 @@ lca_write_config(struct pci_bus *bus, un return PCIBIOS_SUCCESSFUL; } -struct pci_ops lca_pci_ops = +const struct pci_ops lca_pci_ops = { .read = lca_read_config, .write = lca_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/core_marvel.c linux-2.6.39-pax/arch/alpha/kernel/core_marvel.c --- linux-2.6.39/arch/alpha/kernel/core_marvel.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/core_marvel.c 2011-05-19 14:26:14.000000000 +0200 @@ -588,7 +588,7 @@ marvel_write_config(struct pci_bus *bus, return PCIBIOS_SUCCESSFUL; } -struct pci_ops marvel_pci_ops = +const struct pci_ops marvel_pci_ops = { .read = marvel_read_config, .write = marvel_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/core_mcpcia.c linux-2.6.39-pax/arch/alpha/kernel/core_mcpcia.c --- linux-2.6.39/arch/alpha/kernel/core_mcpcia.c 2011-05-19 10:20:49.000000000 +0200 +++ linux-2.6.39-pax/arch/alpha/kernel/core_mcpcia.c 2011-05-19 14:23:27.000000000 +0200 @@ -235,7 +235,7 @@ mcpcia_write_config(struct pci_bus *bus, return PCIBIOS_SUCCESSFUL; } -struct pci_ops mcpcia_pci_ops = +const struct pci_ops mcpcia_pci_ops = { .read = mcpcia_read_config, .write = mcpcia_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/core_polaris.c linux-2.6.39-pax/arch/alpha/kernel/core_polaris.c --- linux-2.6.39/arch/alpha/kernel/core_polaris.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/core_polaris.c 2011-05-19 14:23:27.000000000 +0200 @@ -136,7 +136,7 @@ polaris_write_config(struct pci_bus *bus return PCIBIOS_SUCCESSFUL; } -struct pci_ops polaris_pci_ops = +const struct pci_ops polaris_pci_ops = { .read = polaris_read_config, .write = polaris_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/core_t2.c linux-2.6.39-pax/arch/alpha/kernel/core_t2.c --- linux-2.6.39/arch/alpha/kernel/core_t2.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/core_t2.c 2011-05-19 14:23:27.000000000 +0200 @@ -314,7 +314,7 @@ t2_write_config(struct pci_bus *bus, uns return PCIBIOS_SUCCESSFUL; } -struct pci_ops t2_pci_ops = +const struct pci_ops t2_pci_ops = { .read = t2_read_config, .write = t2_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/core_titan.c linux-2.6.39-pax/arch/alpha/kernel/core_titan.c --- linux-2.6.39/arch/alpha/kernel/core_titan.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/core_titan.c 2011-05-19 14:23:27.000000000 +0200 @@ -191,7 +191,7 @@ titan_write_config(struct pci_bus *bus, return PCIBIOS_SUCCESSFUL; } -struct pci_ops titan_pci_ops = +const struct pci_ops titan_pci_ops = { .read = titan_read_config, .write = titan_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/core_tsunami.c linux-2.6.39-pax/arch/alpha/kernel/core_tsunami.c --- linux-2.6.39/arch/alpha/kernel/core_tsunami.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/core_tsunami.c 2011-05-19 14:23:27.000000000 +0200 @@ -166,7 +166,7 @@ tsunami_write_config(struct pci_bus *bus return PCIBIOS_SUCCESSFUL; } -struct pci_ops tsunami_pci_ops = +const struct pci_ops tsunami_pci_ops = { .read = tsunami_read_config, .write = tsunami_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/core_wildfire.c linux-2.6.39-pax/arch/alpha/kernel/core_wildfire.c --- linux-2.6.39/arch/alpha/kernel/core_wildfire.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/core_wildfire.c 2011-05-19 14:23:27.000000000 +0200 @@ -431,7 +431,7 @@ wildfire_write_config(struct pci_bus *bu return PCIBIOS_SUCCESSFUL; } -struct pci_ops wildfire_pci_ops = +const struct pci_ops wildfire_pci_ops = { .read = wildfire_read_config, .write = wildfire_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/module.c linux-2.6.39-pax/arch/alpha/kernel/module.c --- linux-2.6.39/arch/alpha/kernel/module.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/module.c 2011-05-19 13:45:26.000000000 +0200 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/osf_sys.c linux-2.6.39-pax/arch/alpha/kernel/osf_sys.c --- linux-2.6.39/arch/alpha/kernel/osf_sys.c 2011-05-19 10:20:49.000000000 +0200 +++ linux-2.6.39-pax/arch/alpha/kernel/osf_sys.c 2011-05-19 13:45:26.000000000 +0200 @@ -1142,7 +1142,7 @@ arch_get_unmapped_area_1(unsigned long a /* 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; @@ -1178,6 +1178,10 @@ arch_get_unmapped_area(struct file *filp 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) @@ -1185,8 +1189,8 @@ arch_get_unmapped_area(struct file *filp } /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/pci-noop.c linux-2.6.39-pax/arch/alpha/kernel/pci-noop.c --- linux-2.6.39/arch/alpha/kernel/pci-noop.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/pci-noop.c 2011-05-19 14:23:27.000000000 +0200 @@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de 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 @@ struct dma_map_ops alpha_noop_ops = { .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/pci_iommu.c linux-2.6.39-pax/arch/alpha/kernel/pci_iommu.c --- linux-2.6.39/arch/alpha/kernel/pci_iommu.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/pci_iommu.c 2011-05-19 14:23:27.000000000 +0200 @@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev 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 @@ struct dma_map_ops alpha_pci_ops = { .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/kernel/proto.h linux-2.6.39-pax/arch/alpha/kernel/proto.h --- linux-2.6.39/arch/alpha/kernel/proto.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/kernel/proto.h 2011-05-19 14:23:27.000000000 +0200 @@ -17,14 +17,14 @@ struct pci_dev; struct pci_controller; /* core_apecs.c */ -extern struct pci_ops apecs_pci_ops; +extern const struct pci_ops apecs_pci_ops; extern void apecs_init_arch(void); extern void apecs_pci_clr_err(void); extern void apecs_machine_check(unsigned long vector, unsigned long la_ptr); extern void apecs_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t); /* core_cia.c */ -extern struct pci_ops cia_pci_ops; +extern const struct pci_ops cia_pci_ops; extern void cia_init_pci(void); extern void cia_init_arch(void); extern void pyxis_init_arch(void); @@ -33,19 +33,19 @@ extern void cia_machine_check(unsigned l extern void cia_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t); /* core_irongate.c */ -extern struct pci_ops irongate_pci_ops; +extern const struct pci_ops irongate_pci_ops; extern int irongate_pci_clr_err(void); extern void irongate_init_arch(void); #define irongate_pci_tbi ((void *)0) /* core_lca.c */ -extern struct pci_ops lca_pci_ops; +extern const struct pci_ops lca_pci_ops; extern void lca_init_arch(void); extern void lca_machine_check(unsigned long vector, unsigned long la_ptr); extern void lca_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t); /* core_marvel.c */ -extern struct pci_ops marvel_pci_ops; +extern const struct pci_ops marvel_pci_ops; extern void marvel_init_arch(void); extern void marvel_kill_arch(int); extern void marvel_machine_check(unsigned long, unsigned long); @@ -60,14 +60,14 @@ struct io7 *marvel_next_io7(struct io7 * void io7_clear_errors(struct io7 *io7); /* core_mcpcia.c */ -extern struct pci_ops mcpcia_pci_ops; +extern const struct pci_ops mcpcia_pci_ops; extern void mcpcia_init_arch(void); extern void mcpcia_init_hoses(void); extern void mcpcia_machine_check(unsigned long vector, unsigned long la_ptr); extern void mcpcia_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t); /* core_polaris.c */ -extern struct pci_ops polaris_pci_ops; +extern const struct pci_ops polaris_pci_ops; extern int polaris_read_config_dword(struct pci_dev *, int, u32 *); extern int polaris_write_config_dword(struct pci_dev *, int, u32); extern void polaris_init_arch(void); @@ -75,14 +75,14 @@ extern void polaris_machine_check(unsign #define polaris_pci_tbi ((void *)0) /* core_t2.c */ -extern struct pci_ops t2_pci_ops; +extern const struct pci_ops t2_pci_ops; extern void t2_init_arch(void); extern void t2_kill_arch(int); extern void t2_machine_check(unsigned long vector, unsigned long la_ptr); extern void t2_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t); /* core_titan.c */ -extern struct pci_ops titan_pci_ops; +extern const struct pci_ops titan_pci_ops; extern void titan_init_arch(void); extern void titan_kill_arch(int); extern void titan_machine_check(unsigned long, unsigned long); @@ -90,14 +90,14 @@ extern void titan_pci_tbi(struct pci_con extern struct _alpha_agp_info *titan_agp_info(void); /* core_tsunami.c */ -extern struct pci_ops tsunami_pci_ops; +extern const struct pci_ops tsunami_pci_ops; extern void tsunami_init_arch(void); extern void tsunami_kill_arch(int); extern void tsunami_machine_check(unsigned long vector, unsigned long la_ptr); extern void tsunami_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t); /* core_wildfire.c */ -extern struct pci_ops wildfire_pci_ops; +extern const struct pci_ops wildfire_pci_ops; extern void wildfire_init_arch(void); extern void wildfire_kill_arch(int); extern void wildfire_machine_check(unsigned long vector, unsigned long la_ptr); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/alpha/mm/fault.c linux-2.6.39-pax/arch/alpha/mm/fault.c --- linux-2.6.39/arch/alpha/mm/fault.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/alpha/mm/fault.c 2011-05-19 13:45:26.000000000 +0200 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __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 @@ do_page_fault(unsigned long address, uns 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/common/it8152.c linux-2.6.39-pax/arch/arm/common/it8152.c --- linux-2.6.39/arch/arm/common/it8152.c 2011-05-19 10:20:49.000000000 +0200 +++ linux-2.6.39-pax/arch/arm/common/it8152.c 2011-05-19 14:23:27.000000000 +0200 @@ -221,7 +221,7 @@ static int it8152_pci_write_config(struc return PCIBIOS_SUCCESSFUL; } -static struct pci_ops it8152_ops = { +static const struct pci_ops it8152_ops = { .read = it8152_pci_read_config, .write = it8152_pci_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/common/via82c505.c linux-2.6.39-pax/arch/arm/common/via82c505.c --- linux-2.6.39/arch/arm/common/via82c505.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/common/via82c505.c 2011-05-19 14:23:27.000000000 +0200 @@ -52,7 +52,7 @@ via82c505_write_config(struct pci_bus *b return PCIBIOS_SUCCESSFUL; } -static struct pci_ops via82c505_ops = { +static const struct pci_ops via82c505_ops = { .read = via82c505_read_config, .write = via82c505_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/include/asm/cacheflush.h linux-2.6.39-pax/arch/arm/include/asm/cacheflush.h --- linux-2.6.39/arch/arm/include/asm/cacheflush.h 2011-05-19 10:20:49.000000000 +0200 +++ linux-2.6.39-pax/arch/arm/include/asm/cacheflush.h 2011-05-19 14:23:27.000000000 +0200 @@ -115,7 +115,7 @@ struct cpu_cache_fns { */ #ifdef MULTI_CACHE -extern struct cpu_cache_fns cpu_cache; +extern const struct cpu_cache_fns cpu_cache; #define __cpuc_flush_icache_all cpu_cache.flush_icache_all #define __cpuc_flush_kern_all cpu_cache.flush_kern_all diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/include/asm/elf.h linux-2.6.39-pax/arch/arm/include/asm/elf.h --- linux-2.6.39/arch/arm/include/asm/elf.h 2011-03-15 19:32:02.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/include/asm/elf.h 2011-05-19 13:45:26.000000000 +0200 @@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t 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 @@ int dump_task_regs(struct task_struct *t 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/include/asm/kmap_types.h linux-2.6.39-pax/arch/arm/include/asm/kmap_types.h --- linux-2.6.39/arch/arm/include/asm/kmap_types.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/include/asm/kmap_types.h 2011-05-19 13:45:26.000000000 +0200 @@ -21,6 +21,7 @@ enum km_type { KM_L1_CACHE, KM_L2_CACHE, KM_KDB, + KM_CLEARPAGE, KM_TYPE_NR }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/include/asm/outercache.h linux-2.6.39-pax/arch/arm/include/asm/outercache.h --- linux-2.6.39/arch/arm/include/asm/outercache.h 2011-05-19 10:20:49.000000000 +0200 +++ linux-2.6.39-pax/arch/arm/include/asm/outercache.h 2011-05-19 14:23:27.000000000 +0200 @@ -38,7 +38,7 @@ struct outer_cache_fns { #ifdef CONFIG_OUTER_CACHE -extern struct outer_cache_fns outer_cache; +extern const struct outer_cache_fns outer_cache; static inline void outer_inv_range(phys_addr_t start, phys_addr_t end) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/include/asm/page.h linux-2.6.39-pax/arch/arm/include/asm/page.h --- linux-2.6.39/arch/arm/include/asm/page.h 2011-03-15 19:32:03.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/include/asm/page.h 2011-05-19 14:23:27.000000000 +0200 @@ -126,7 +126,7 @@ struct cpu_user_fns { }; #ifdef MULTI_USER -extern struct cpu_user_fns cpu_user; +extern const struct cpu_user_fns cpu_user; #define __cpu_clear_user_highpage cpu_user.cpu_clear_user_highpage #define __cpu_copy_user_highpage cpu_user.cpu_copy_user_highpage diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/include/asm/uaccess.h linux-2.6.39-pax/arch/arm/include/asm/uaccess.h --- linux-2.6.39/arch/arm/include/asm/uaccess.h 2011-03-15 19:32:03.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/include/asm/uaccess.h 2011-05-19 13:45:26.000000000 +0200 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn 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 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/kernel/kgdb.c linux-2.6.39-pax/arch/arm/kernel/kgdb.c --- linux-2.6.39/arch/arm/kernel/kgdb.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/kernel/kgdb.c 2011-05-19 14:23:27.000000000 +0200 @@ -246,7 +246,7 @@ void kgdb_arch_exit(void) * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/kernel/process.c linux-2.6.39-pax/arch/arm/kernel/process.c --- linux-2.6.39/arch/arm/kernel/process.c 2011-05-19 10:20:50.000000000 +0200 +++ linux-2.6.39-pax/arch/arm/kernel/process.c 2011-05-19 13:45:26.000000000 +0200 @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -479,12 +478,6 @@ unsigned long get_wchan(struct task_stru 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-cns3xxx/pcie.c linux-2.6.39-pax/arch/arm/mach-cns3xxx/pcie.c --- linux-2.6.39/arch/arm/mach-cns3xxx/pcie.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-cns3xxx/pcie.c 2011-05-19 14:23:27.000000000 +0200 @@ -162,7 +162,7 @@ static int cns3xxx_pci_setup(int nr, str return 1; } -static struct pci_ops cns3xxx_pcie_ops = { +static const struct pci_ops cns3xxx_pcie_ops = { .read = cns3xxx_pci_read_config, .write = cns3xxx_pci_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-dove/pcie.c linux-2.6.39-pax/arch/arm/mach-dove/pcie.c --- linux-2.6.39/arch/arm/mach-dove/pcie.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-dove/pcie.c 2011-05-19 14:23:27.000000000 +0200 @@ -155,7 +155,7 @@ static int pcie_wr_conf(struct pci_bus * return ret; } -static struct pci_ops pcie_ops = { +static const struct pci_ops pcie_ops = { .read = pcie_rd_conf, .write = pcie_wr_conf, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-footbridge/dc21285.c linux-2.6.39-pax/arch/arm/mach-footbridge/dc21285.c --- linux-2.6.39/arch/arm/mach-footbridge/dc21285.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-footbridge/dc21285.c 2011-05-19 14:23:27.000000000 +0200 @@ -129,7 +129,7 @@ dc21285_write_config(struct pci_bus *bus return PCIBIOS_SUCCESSFUL; } -static struct pci_ops dc21285_ops = { +static const struct pci_ops dc21285_ops = { .read = dc21285_read_config, .write = dc21285_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-integrator/pci_v3.c linux-2.6.39-pax/arch/arm/mach-integrator/pci_v3.c --- linux-2.6.39/arch/arm/mach-integrator/pci_v3.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-integrator/pci_v3.c 2011-05-19 14:23:27.000000000 +0200 @@ -340,7 +340,7 @@ static int v3_write_config(struct pci_bu return PCIBIOS_SUCCESSFUL; } -static struct pci_ops pci_v3_ops = { +static const struct pci_ops pci_v3_ops = { .read = v3_read_config, .write = v3_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-iop13xx/pci.c linux-2.6.39-pax/arch/arm/mach-iop13xx/pci.c --- linux-2.6.39/arch/arm/mach-iop13xx/pci.c 2011-05-19 10:20:51.000000000 +0200 +++ linux-2.6.39-pax/arch/arm/mach-iop13xx/pci.c 2011-05-19 14:23:27.000000000 +0200 @@ -324,7 +324,7 @@ iop13xx_atux_write_config(struct pci_bus return PCIBIOS_SUCCESSFUL; } -static struct pci_ops iop13xx_atux_ops = { +static const struct pci_ops iop13xx_atux_ops = { .read = iop13xx_atux_read_config, .write = iop13xx_atux_write_config, }; @@ -471,7 +471,7 @@ iop13xx_atue_write_config(struct pci_bus return PCIBIOS_SUCCESSFUL; } -static struct pci_ops iop13xx_atue_ops = { +static const struct pci_ops iop13xx_atue_ops = { .read = iop13xx_atue_read_config, .write = iop13xx_atue_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-ixp2000/enp2611.c linux-2.6.39-pax/arch/arm/mach-ixp2000/enp2611.c --- linux-2.6.39/arch/arm/mach-ixp2000/enp2611.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-ixp2000/enp2611.c 2011-05-19 14:23:27.000000000 +0200 @@ -137,7 +137,7 @@ static int enp2611_pci_write_config(stru return PCIBIOS_DEVICE_NOT_FOUND; } -static struct pci_ops enp2611_pci_ops = { +static const struct pci_ops enp2611_pci_ops = { .read = enp2611_pci_read_config, .write = enp2611_pci_write_config }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-ixp2000/pci.c linux-2.6.39-pax/arch/arm/mach-ixp2000/pci.c --- linux-2.6.39/arch/arm/mach-ixp2000/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-ixp2000/pci.c 2011-05-19 14:23:27.000000000 +0200 @@ -125,7 +125,7 @@ int ixp2000_pci_write_config(struct pci_ } -static struct pci_ops ixp2000_pci_ops = { +static const struct pci_ops ixp2000_pci_ops = { .read = ixp2000_pci_read_config, .write = ixp2000_pci_write_config }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-ixp23xx/pci.c linux-2.6.39-pax/arch/arm/mach-ixp23xx/pci.c --- linux-2.6.39/arch/arm/mach-ixp23xx/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-ixp23xx/pci.c 2011-05-19 14:23:27.000000000 +0200 @@ -136,7 +136,7 @@ static int ixp23xx_pci_write_config(stru return PCIBIOS_SUCCESSFUL; } -struct pci_ops ixp23xx_pci_ops = { +const struct pci_ops ixp23xx_pci_ops = { .read = ixp23xx_pci_read_config, .write = ixp23xx_pci_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-ixp4xx/common-pci.c linux-2.6.39-pax/arch/arm/mach-ixp4xx/common-pci.c --- linux-2.6.39/arch/arm/mach-ixp4xx/common-pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-ixp4xx/common-pci.c 2011-05-19 14:23:27.000000000 +0200 @@ -283,7 +283,7 @@ static int ixp4xx_pci_write_config(struc return PCIBIOS_SUCCESSFUL; } -struct pci_ops ixp4xx_ops = { +const struct pci_ops ixp4xx_ops = { .read = ixp4xx_pci_read_config, .write = ixp4xx_pci_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-kirkwood/pcie.c linux-2.6.39-pax/arch/arm/mach-kirkwood/pcie.c --- linux-2.6.39/arch/arm/mach-kirkwood/pcie.c 2011-05-19 10:20:53.000000000 +0200 +++ linux-2.6.39-pax/arch/arm/mach-kirkwood/pcie.c 2011-05-19 14:23:27.000000000 +0200 @@ -111,7 +111,7 @@ static int pcie_wr_conf(struct pci_bus * return ret; } -static struct pci_ops pcie_ops = { +static const struct pci_ops pcie_ops = { .read = pcie_rd_conf, .write = pcie_wr_conf, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-ks8695/pci.c linux-2.6.39-pax/arch/arm/mach-ks8695/pci.c --- linux-2.6.39/arch/arm/mach-ks8695/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-ks8695/pci.c 2011-05-19 14:23:27.000000000 +0200 @@ -136,7 +136,7 @@ static void ks8695_local_writeconfig(int __raw_writel(value, KS8695_PCI_VA + KS8695_PBCD); } -static struct pci_ops ks8695_pci_ops = { +static const struct pci_ops ks8695_pci_ops = { .read = ks8695_pci_readconfig, .write = ks8695_pci_writeconfig, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-mmp/clock.c linux-2.6.39-pax/arch/arm/mach-mmp/clock.c --- linux-2.6.39/arch/arm/mach-mmp/clock.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-mmp/clock.c 2011-05-19 14:23:27.000000000 +0200 @@ -29,7 +29,7 @@ static void apbc_clk_disable(struct clk __raw_writel(0, clk->clk_rst); } -struct clkops apbc_clk_ops = { +const struct clkops apbc_clk_ops = { .enable = apbc_clk_enable, .disable = apbc_clk_disable, }; @@ -44,7 +44,7 @@ static void apmu_clk_disable(struct clk __raw_writel(0, clk->clk_rst); } -struct clkops apmu_clk_ops = { +const struct clkops apmu_clk_ops = { .enable = apmu_clk_enable, .disable = apmu_clk_disable, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-msm/iommu.c linux-2.6.39-pax/arch/arm/mach-msm/iommu.c --- linux-2.6.39/arch/arm/mach-msm/iommu.c 2011-05-19 10:20:54.000000000 +0200 +++ linux-2.6.39-pax/arch/arm/mach-msm/iommu.c 2011-05-19 14:23:27.000000000 +0200 @@ -669,7 +669,7 @@ fail: return 0; } -static struct iommu_ops msm_iommu_ops = { +static const struct iommu_ops msm_iommu_ops = { .domain_init = msm_iommu_domain_init, .domain_destroy = msm_iommu_domain_destroy, .attach_dev = msm_iommu_attach_dev, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-msm/last_radio_log.c linux-2.6.39-pax/arch/arm/mach-msm/last_radio_log.c --- linux-2.6.39/arch/arm/mach-msm/last_radio_log.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-msm/last_radio_log.c 2011-05-19 14:23:27.000000000 +0200 @@ -48,6 +48,7 @@ static ssize_t last_radio_log_read(struc } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-mv78xx0/pcie.c linux-2.6.39-pax/arch/arm/mach-mv78xx0/pcie.c --- linux-2.6.39/arch/arm/mach-mv78xx0/pcie.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-mv78xx0/pcie.c 2011-05-19 14:23:27.000000000 +0200 @@ -222,7 +222,7 @@ static int pcie_wr_conf(struct pci_bus * return ret; } -static struct pci_ops pcie_ops = { +static const struct pci_ops pcie_ops = { .read = pcie_rd_conf, .write = pcie_wr_conf, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-orion5x/pci.c linux-2.6.39-pax/arch/arm/mach-orion5x/pci.c --- linux-2.6.39/arch/arm/mach-orion5x/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-orion5x/pci.c 2011-05-19 14:23:27.000000000 +0200 @@ -130,7 +130,7 @@ static int pcie_wr_conf(struct pci_bus * return ret; } -static struct pci_ops pcie_ops = { +static const struct pci_ops pcie_ops = { .read = pcie_rd_conf, .write = pcie_wr_conf, }; @@ -368,7 +368,7 @@ static int orion5x_pci_wr_conf(struct pc PCI_FUNC(devfn), where, size, val); } -static struct pci_ops pci_ops = { +static const struct pci_ops pci_ops = { .read = orion5x_pci_rd_conf, .write = orion5x_pci_wr_conf, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-sa1100/pci-nanoengine.c linux-2.6.39-pax/arch/arm/mach-sa1100/pci-nanoengine.c --- linux-2.6.39/arch/arm/mach-sa1100/pci-nanoengine.c 2011-03-15 19:32:30.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-sa1100/pci-nanoengine.c 2011-05-19 14:23:27.000000000 +0200 @@ -117,7 +117,7 @@ static int nanoengine_write_config(struc return PCIBIOS_SUCCESSFUL; } -static struct pci_ops pci_nano_ops = { +static const struct pci_ops pci_nano_ops = { .read = nanoengine_read_config, .write = nanoengine_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-tegra/pcie.c linux-2.6.39-pax/arch/arm/mach-tegra/pcie.c --- linux-2.6.39/arch/arm/mach-tegra/pcie.c 2011-05-19 10:20:59.000000000 +0200 +++ linux-2.6.39-pax/arch/arm/mach-tegra/pcie.c 2011-05-19 14:23:27.000000000 +0200 @@ -336,7 +336,7 @@ static int tegra_pcie_write_conf(struct return PCIBIOS_SUCCESSFUL; } -static struct pci_ops tegra_pcie_ops = { +static const struct pci_ops tegra_pcie_ops = { .read = tegra_pcie_read_conf, .write = tegra_pcie_write_conf, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mach-versatile/pci.c linux-2.6.39-pax/arch/arm/mach-versatile/pci.c --- linux-2.6.39/arch/arm/mach-versatile/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/mach-versatile/pci.c 2011-05-19 14:23:27.000000000 +0200 @@ -165,7 +165,7 @@ static int versatile_write_config(struct return PCIBIOS_SUCCESSFUL; } -static struct pci_ops pci_versatile_ops = { +static const struct pci_ops pci_versatile_ops = { .read = versatile_read_config, .write = versatile_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mm/fault.c linux-2.6.39-pax/arch/arm/mm/fault.c --- linux-2.6.39/arch/arm/mm/fault.c 2011-05-19 10:20:59.000000000 +0200 +++ linux-2.6.39-pax/arch/arm/mm/fault.c 2011-05-19 13:45:26.000000000 +0200 @@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk, } #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; @@ -379,6 +386,33 @@ do_page_fault(unsigned long addr, unsign } #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/mm/mmap.c linux-2.6.39-pax/arch/arm/mm/mmap.c --- linux-2.6.39/arch/arm/mm/mmap.c 2011-05-19 10:20:59.000000000 +0200 +++ linux-2.6.39-pax/arch/arm/mm/mmap.c 2011-05-19 13:45:26.000000000 +0200 @@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp 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); @@ -72,15 +76,14 @@ arch_get_unmapped_area(struct file *filp 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) && @@ -100,14 +103,14 @@ full_search: * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/arm/plat-iop/pci.c linux-2.6.39-pax/arch/arm/plat-iop/pci.c --- linux-2.6.39/arch/arm/plat-iop/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/arm/plat-iop/pci.c 2011-05-19 14:23:27.000000000 +0200 @@ -161,7 +161,7 @@ iop3xx_write_config(struct pci_bus *bus, return PCIBIOS_SUCCESSFUL; } -static struct pci_ops iop3xx_ops = { +static const struct pci_ops iop3xx_ops = { .read = iop3xx_read_config, .write = iop3xx_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/avr32/include/asm/elf.h linux-2.6.39-pax/arch/avr32/include/asm/elf.h --- linux-2.6.39/arch/avr32/include/asm/elf.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/avr32/include/asm/elf.h 2011-05-19 13:45:26.000000000 +0200 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/avr32/include/asm/kmap_types.h linux-2.6.39-pax/arch/avr32/include/asm/kmap_types.h --- linux-2.6.39/arch/avr32/include/asm/kmap_types.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/avr32/include/asm/kmap_types.h 2011-05-19 13:45:26.000000000 +0200 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/avr32/mm/fault.c linux-2.6.39-pax/arch/avr32/mm/fault.c --- linux-2.6.39/arch/avr32/mm/fault.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/avr32/mm/fault.c 2011-05-19 13:45:26.000000000 +0200 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru 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 @@ bad_area: 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/blackfin/kernel/kgdb.c linux-2.6.39-pax/arch/blackfin/kernel/kgdb.c --- linux-2.6.39/arch/blackfin/kernel/kgdb.c 2011-05-19 10:21:01.000000000 +0200 +++ linux-2.6.39-pax/arch/blackfin/kernel/kgdb.c 2011-05-19 14:23:27.000000000 +0200 @@ -420,7 +420,7 @@ int kgdb_arch_handle_exception(int vecto 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}, .flags = KGDB_HW_BREAKPOINT, .set_hw_breakpoint = bfin_set_hw_break, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/blackfin/mm/maccess.c linux-2.6.39-pax/arch/blackfin/mm/maccess.c --- linux-2.6.39/arch/blackfin/mm/maccess.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/blackfin/mm/maccess.c 2011-05-19 14:23:27.000000000 +0200 @@ -16,7 +16,7 @@ static int validate_memory_access_addres 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 @@ long probe_kernel_read(void *dst, void * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/frv/include/asm/kmap_types.h linux-2.6.39-pax/arch/frv/include/asm/kmap_types.h --- linux-2.6.39/arch/frv/include/asm/kmap_types.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/frv/include/asm/kmap_types.h 2011-05-19 13:45:26.000000000 +0200 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, KM_SOFTIRQ1, + KM_CLEARPAGE, KM_TYPE_NR }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/frv/mb93090-mb00/pci-frv.h linux-2.6.39-pax/arch/frv/mb93090-mb00/pci-frv.h --- linux-2.6.39/arch/frv/mb93090-mb00/pci-frv.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/frv/mb93090-mb00/pci-frv.h 2011-05-19 14:23:27.000000000 +0200 @@ -34,7 +34,7 @@ void pcibios_resource_survey(void); extern int __nongpreldata pcibios_last_bus; extern struct pci_bus *__nongpreldata pci_root_bus; -extern struct pci_ops *__nongpreldata pci_root_ops; +extern const struct pci_ops *__nongpreldata pci_root_ops; /* pci-irq.c */ extern unsigned int pcibios_irq_mask; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/frv/mb93090-mb00/pci-vdk.c linux-2.6.39-pax/arch/frv/mb93090-mb00/pci-vdk.c --- linux-2.6.39/arch/frv/mb93090-mb00/pci-vdk.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/frv/mb93090-mb00/pci-vdk.c 2011-05-19 14:23:27.000000000 +0200 @@ -27,7 +27,7 @@ unsigned int __nongpreldata pci_probe = int __nongpreldata pcibios_last_bus = -1; struct pci_bus *__nongpreldata pci_root_bus; -struct pci_ops *__nongpreldata pci_root_ops; +const struct pci_ops *__nongpreldata pci_root_ops; /* * The accessible PCI window does not cover the entire CPU address space, but @@ -169,7 +169,7 @@ static int pci_frv_write_config(struct p return PCIBIOS_SUCCESSFUL; } -static struct pci_ops pci_direct_frv = { +static const struct pci_ops pci_direct_frv = { pci_frv_read_config, pci_frv_write_config, }; @@ -356,7 +356,7 @@ void __init pcibios_fixup_bus(struct pci int __init pcibios_init(void) { - struct pci_ops *dir = NULL; + const struct pci_ops *dir = NULL; if (!mb93090_mb00_detected) return -ENXIO; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/frv/mm/elf-fdpic.c linux-2.6.39-pax/arch/frv/mm/elf-fdpic.c --- linux-2.6.39/arch/frv/mm/elf-fdpic.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/frv/mm/elf-fdpic.c 2011-05-19 13:45:26.000000000 +0200 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str 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 @@ unsigned long arch_get_unmapped_area(str 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 @@ unsigned long arch_get_unmapped_area(str 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.39-pax/arch/ia64/hp/common/hwsw_iommu.c --- linux-2.6.39/arch/ia64/hp/common/hwsw_iommu.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/hp/common/hwsw_iommu.c 2011-05-19 14:23:27.000000000 +0200 @@ -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 @@ static inline int use_swiotlb(struct dev !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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/hp/common/sba_iommu.c linux-2.6.39-pax/arch/ia64/hp/common/sba_iommu.c --- linux-2.6.39/arch/ia64/hp/common/sba_iommu.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/hp/common/sba_iommu.c 2011-05-19 14:23:27.000000000 +0200 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d }, }; -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 @@ sba_page_override(char *str) __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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/include/asm/dma-mapping.h linux-2.6.39-pax/arch/ia64/include/asm/dma-mapping.h --- linux-2.6.39/arch/ia64/include/asm/dma-mapping.h 2011-05-19 10:21:02.000000000 +0200 +++ linux-2.6.39-pax/arch/ia64/include/asm/dma-mapping.h 2011-05-19 14:23:27.000000000 +0200 @@ -14,7 +14,7 @@ #define DMA_ERROR_CODE 0 -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); @@ -26,7 +26,7 @@ extern void machvec_dma_sync_sg(struct d 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); @@ -37,7 +37,7 @@ static inline void *dma_alloc_coherent(s 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); } @@ -51,13 +51,13 @@ static inline void dma_free_coherent(str 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/include/asm/elf.h linux-2.6.39-pax/arch/ia64/include/asm/elf.h --- linux-2.6.39/arch/ia64/include/asm/elf.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/include/asm/elf.h 2011-05-19 13:45:26.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/include/asm/machvec.h linux-2.6.39-pax/arch/ia64/include/asm/machvec.h --- linux-2.6.39/arch/ia64/include/asm/machvec.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/include/asm/machvec.h 2011-05-19 14:23:27.000000000 +0200 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event /* 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 @@ extern void machvec_init_from_cmdline(co # 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/include/asm/pgtable.h linux-2.6.39-pax/arch/ia64/include/asm/pgtable.h --- linux-2.6.39/arch/ia64/include/asm/pgtable.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/include/asm/pgtable.h 2011-05-19 13:45:26.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/include/asm/spinlock.h linux-2.6.39-pax/arch/ia64/include/asm/spinlock.h --- linux-2.6.39/arch/ia64/include/asm/spinlock.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/include/asm/spinlock.h 2011-05-19 13:45:26.000000000 +0200 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/include/asm/uaccess.h linux-2.6.39-pax/arch/ia64/include/asm/uaccess.h --- linux-2.6.39/arch/ia64/include/asm/uaccess.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/include/asm/uaccess.h 2011-05-19 13:45:26.000000000 +0200 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ 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 @@ __copy_from_user (void *to, const void _ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/kernel/dma-mapping.c linux-2.6.39-pax/arch/ia64/kernel/dma-mapping.c --- linux-2.6.39/arch/ia64/kernel/dma-mapping.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/kernel/dma-mapping.c 2011-05-19 14:23:27.000000000 +0200 @@ -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 @@ static int __init dma_init(void) } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/kernel/module.c linux-2.6.39-pax/arch/ia64/kernel/module.c --- linux-2.6.39/arch/ia64/kernel/module.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/kernel/module.c 2011-05-19 13:45:26.000000000 +0200 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) 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 @@ module_frob_arch_sections (Elf_Ehdr *ehd } 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 @@ do_reloc (struct module *mod, uint8_t r_ 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 @@ apply_relocate_add (Elf64_Shdr *sechdrs, * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/kernel/pci-dma.c linux-2.6.39-pax/arch/ia64/kernel/pci-dma.c --- linux-2.6.39/arch/ia64/kernel/pci-dma.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/kernel/pci-dma.c 2011-05-19 14:23:27.000000000 +0200 @@ -43,7 +43,7 @@ struct device fallback_dev = { .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/kernel/pci-swiotlb.c linux-2.6.39-pax/arch/ia64/kernel/pci-swiotlb.c --- linux-2.6.39/arch/ia64/kernel/pci-swiotlb.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/kernel/pci-swiotlb.c 2011-05-19 14:23:27.000000000 +0200 @@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/kernel/sys_ia64.c linux-2.6.39-pax/arch/ia64/kernel/sys_ia64.c --- linux-2.6.39/arch/ia64/kernel/sys_ia64.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/kernel/sys_ia64.c 2011-05-19 13:45:26.000000000 +0200 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil 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 @@ arch_get_unmapped_area (struct file *fil 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/kernel/vmlinux.lds.S linux-2.6.39-pax/arch/ia64/kernel/vmlinux.lds.S --- linux-2.6.39/arch/ia64/kernel/vmlinux.lds.S 2011-05-19 10:21:02.000000000 +0200 +++ linux-2.6.39-pax/arch/ia64/kernel/vmlinux.lds.S 2011-05-19 13:45:26.000000000 +0200 @@ -199,7 +199,7 @@ SECTIONS { /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); PERCPU_VADDR(SMP_CACHE_BYTES, 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/mm/fault.c linux-2.6.39-pax/arch/ia64/mm/fault.c --- linux-2.6.39/arch/ia64/mm/fault.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/mm/fault.c 2011-05-19 13:45:26.000000000 +0200 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 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 +162,23 @@ ia64_do_page_fault (unsigned long addres 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/mm/hugetlbpage.c linux-2.6.39-pax/arch/ia64/mm/hugetlbpage.c --- linux-2.6.39/arch/ia64/mm/hugetlbpage.c 2011-03-15 19:32:53.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/mm/hugetlbpage.c 2011-05-19 13:45:26.000000000 +0200 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area( /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/mm/init.c linux-2.6.39-pax/arch/ia64/mm/init.c --- linux-2.6.39/arch/ia64/mm/init.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/mm/init.c 2011-05-19 13:45:26.000000000 +0200 @@ -122,6 +122,19 @@ ia64_init_addr_space (void) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/pci/pci.c linux-2.6.39-pax/arch/ia64/pci/pci.c --- linux-2.6.39/arch/ia64/pci/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/pci/pci.c 2011-05-19 14:23:27.000000000 +0200 @@ -109,7 +109,7 @@ static int pci_write(struct pci_bus *bus devfn, where, size, value); } -struct pci_ops pci_root_ops = { +const struct pci_ops pci_root_ops = { .read = pci_read, .write = pci_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/ia64/sn/pci/pci_dma.c linux-2.6.39-pax/arch/ia64/sn/pci/pci_dma.c --- linux-2.6.39/arch/ia64/sn/pci/pci_dma.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/ia64/sn/pci/pci_dma.c 2011-05-19 14:23:27.000000000 +0200 @@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/m32r/lib/usercopy.c linux-2.6.39-pax/arch/m32r/lib/usercopy.c --- linux-2.6.39/arch/m32r/lib/usercopy.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/m32r/lib/usercopy.c 2011-05-19 13:45:26.000000000 +0200 @@ -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 @@ __generic_copy_to_user(void __user *to, 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/microblaze/include/asm/device.h linux-2.6.39-pax/arch/microblaze/include/asm/device.h --- linux-2.6.39/arch/microblaze/include/asm/device.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/microblaze/include/asm/device.h 2011-05-19 14:23:27.000000000 +0200 @@ -13,7 +13,7 @@ struct device_node; 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/microblaze/include/asm/dma-mapping.h linux-2.6.39-pax/arch/microblaze/include/asm/dma-mapping.h --- linux-2.6.39/arch/microblaze/include/asm/dma-mapping.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/microblaze/include/asm/dma-mapping.h 2011-05-19 14:23:27.000000000 +0200 @@ -43,14 +43,14 @@ static inline unsigned long device_to_ma 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 @@ static inline struct dma_map_ops *get_dm 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_supported(struct d 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_set_mask(struct de 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 int dma_mapping_error(stru 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_alloc_coherent(s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/microblaze/include/asm/pci.h linux-2.6.39-pax/arch/microblaze/include/asm/pci.h --- linux-2.6.39/arch/microblaze/include/asm/pci.h 2011-05-19 10:21:04.000000000 +0200 +++ linux-2.6.39-pax/arch/microblaze/include/asm/pci.h 2011-05-19 14:23:27.000000000 +0200 @@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_ } #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/microblaze/kernel/dma.c linux-2.6.39-pax/arch/microblaze/kernel/dma.c --- linux-2.6.39/arch/microblaze/kernel/dma.c 2011-05-19 10:21:05.000000000 +0200 +++ linux-2.6.39-pax/arch/microblaze/kernel/dma.c 2011-05-19 14:23:27.000000000 +0200 @@ -134,7 +134,7 @@ static inline void dma_direct_unmap_page __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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/microblaze/kernel/kgdb.c linux-2.6.39-pax/arch/microblaze/kernel/kgdb.c --- linux-2.6.39/arch/microblaze/kernel/kgdb.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/microblaze/kernel/kgdb.c 2011-05-19 14:23:27.000000000 +0200 @@ -141,7 +141,7 @@ void kgdb_arch_exit(void) /* * 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 diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/microblaze/pci/indirect_pci.c linux-2.6.39-pax/arch/microblaze/pci/indirect_pci.c --- linux-2.6.39/arch/microblaze/pci/indirect_pci.c 2011-05-19 10:21:05.000000000 +0200 +++ linux-2.6.39-pax/arch/microblaze/pci/indirect_pci.c 2011-05-19 14:23:27.000000000 +0200 @@ -140,7 +140,7 @@ indirect_write_config(struct pci_bus *bu return PCIBIOS_SUCCESSFUL; } -static struct pci_ops indirect_pci_ops = { +static const struct pci_ops indirect_pci_ops = { .read = indirect_read_config, .write = indirect_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/microblaze/pci/pci-common.c linux-2.6.39-pax/arch/microblaze/pci/pci-common.c --- linux-2.6.39/arch/microblaze/pci/pci-common.c 2011-05-19 10:21:05.000000000 +0200 +++ linux-2.6.39-pax/arch/microblaze/pci/pci-common.c 2011-05-19 14:23:27.000000000 +0200 @@ -48,14 +48,14 @@ resource_size_t isa_mem_base; /* 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; } @@ -1583,7 +1583,7 @@ null_write_config(struct pci_bus *bus, u return PCIBIOS_DEVICE_NOT_FOUND; } -static struct pci_ops null_pci_ops = { +static const struct pci_ops null_pci_ops = { .read = null_read_config, .write = null_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/alchemy/common/pci.c linux-2.6.39-pax/arch/mips/alchemy/common/pci.c --- linux-2.6.39/arch/mips/alchemy/common/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/alchemy/common/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -51,7 +51,7 @@ static struct resource pci_mem_resource .flags = IORESOURCE_MEM }; -extern struct pci_ops au1x_pci_ops; +extern const struct pci_ops au1x_pci_ops; static struct pci_controller au1x_controller = { .pci_ops = &au1x_pci_ops, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.39-pax/arch/mips/cavium-octeon/dma-octeon.c --- linux-2.6.39/arch/mips/cavium-octeon/dma-octeon.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/cavium-octeon/dma-octeon.c 2011-05-19 14:23:28.000000000 +0200 @@ -202,7 +202,7 @@ static phys_addr_t octeon_unity_dma_to_p } 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 @@ static struct octeon_dma_map_ops _octeon }, }; -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/cobalt/pci.c linux-2.6.39-pax/arch/mips/cobalt/pci.c --- linux-2.6.39/arch/mips/cobalt/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/cobalt/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -14,7 +14,7 @@ #include -extern struct pci_ops gt64xxx_pci0_ops; +extern const struct pci_ops gt64xxx_pci0_ops; static struct resource cobalt_mem_resource = { .start = GT_DEF_PCI0_MEM0_BASE, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/include/asm/device.h linux-2.6.39-pax/arch/mips/include/asm/device.h --- linux-2.6.39/arch/mips/include/asm/device.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/include/asm/device.h 2011-05-19 14:23:28.000000000 +0200 @@ -10,7 +10,7 @@ struct dma_map_ops; 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/include/asm/dma-mapping.h linux-2.6.39-pax/arch/mips/include/asm/dma-mapping.h --- linux-2.6.39/arch/mips/include/asm/dma-mapping.h 2011-05-19 10:21:05.000000000 +0200 +++ linux-2.6.39-pax/arch/mips/include/asm/dma-mapping.h 2011-05-19 14:25:54.000000000 +0200 @@ -9,9 +9,9 @@ #include #endif -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; @@ -33,13 +33,13 @@ static inline void dma_mark_clean(void * 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); } @@ -61,7 +61,7 @@ static inline void *dma_alloc_coherent(s 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); @@ -73,7 +73,7 @@ static inline void *dma_alloc_coherent(s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/include/asm/elf.h linux-2.6.39-pax/arch/mips/include/asm/elf.h --- linux-2.6.39/arch/mips/include/asm/elf.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/include/asm/elf.h 2011-05-19 13:45:27.000000000 +0200 @@ -372,13 +372,16 @@ extern const char *__elf_platform; #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL) + +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT) +#define PAX_DELTA_STACK_LEN (TASK_IS_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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.39-pax/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h --- linux-2.6.39/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-05-19 14:23:28.000000000 +0200 @@ -66,7 +66,7 @@ dma_addr_t phys_to_dma(struct device *de 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/include/asm/page.h linux-2.6.39-pax/arch/mips/include/asm/page.h --- linux-2.6.39/arch/mips/include/asm/page.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/include/asm/page.h 2011-05-19 13:45:27.000000000 +0200 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/include/asm/pci/bridge.h linux-2.6.39-pax/arch/mips/include/asm/pci/bridge.h --- linux-2.6.39/arch/mips/include/asm/pci/bridge.h 2011-05-19 10:21:06.000000000 +0200 +++ linux-2.6.39-pax/arch/mips/include/asm/pci/bridge.h 2011-05-19 14:23:28.000000000 +0200 @@ -849,6 +849,6 @@ struct bridge_controller { extern void register_bridge_irq(unsigned int irq); extern int request_bridge_irq(struct bridge_controller *bc); -extern struct pci_ops bridge_pci_ops; +extern const struct pci_ops bridge_pci_ops; #endif /* _ASM_PCI_BRIDGE_H */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/include/asm/system.h linux-2.6.39-pax/arch/mips/include/asm/system.h --- linux-2.6.39/arch/mips/include/asm/system.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/include/asm/system.h 2011-05-19 13:45:27.000000000 +0200 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/kernel/binfmt_elfn32.c linux-2.6.39-pax/arch/mips/kernel/binfmt_elfn32.c --- linux-2.6.39/arch/mips/kernel/binfmt_elfn32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/kernel/binfmt_elfn32.c 2011-05-19 13:45:27.000000000 +0200 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL) + +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT) +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT) +#endif + #include #include #include diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/kernel/binfmt_elfo32.c linux-2.6.39-pax/arch/mips/kernel/binfmt_elfo32.c --- linux-2.6.39/arch/mips/kernel/binfmt_elfo32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/kernel/binfmt_elfo32.c 2011-05-19 13:45:27.000000000 +0200 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL) + +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT) +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT) +#endif + #include /* diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/kernel/kgdb.c linux-2.6.39-pax/arch/mips/kernel/kgdb.c --- linux-2.6.39/arch/mips/kernel/kgdb.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/kernel/kgdb.c 2011-05-19 14:23:28.000000000 +0200 @@ -351,7 +351,7 @@ int kgdb_arch_handle_exception(int vecto 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/kernel/process.c linux-2.6.39-pax/arch/mips/kernel/process.c --- linux-2.6.39/arch/mips/kernel/process.c 2011-05-19 10:21:07.000000000 +0200 +++ linux-2.6.39-pax/arch/mips/kernel/process.c 2011-05-19 13:45:27.000000000 +0200 @@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/kernel/syscall.c linux-2.6.39-pax/arch/mips/kernel/syscall.c --- linux-2.6.39/arch/mips/kernel/syscall.c 2011-03-15 19:32:57.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/kernel/syscall.c 2011-05-19 13:45:27.000000000 +0200 @@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str 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 @@ unsigned long arch_get_unmapped_area(str /* 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) @@ -154,33 +158,6 @@ void arch_pick_mmap_layout(struct mm_str mm->unmap_area = arch_unmap_area; } -static inline unsigned long brk_rnd(void) -{ - unsigned long rnd = get_random_int(); - - rnd = rnd << PAGE_SHIFT; - /* 8MB for 32bit, 256MB for 64bit */ - if (TASK_IS_32BIT_ADDR) - rnd = rnd & 0x7ffffful; - else - rnd = rnd & 0xffffffful; - - 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/mm/dma-default.c linux-2.6.39-pax/arch/mips/mm/dma-default.c --- linux-2.6.39/arch/mips/mm/dma-default.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/mm/dma-default.c 2011-05-19 14:23:28.000000000 +0200 @@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev, 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 @@ static struct dma_map_ops mips_default_d .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/mm/fault.c linux-2.6.39-pax/arch/mips/mm/fault.c --- linux-2.6.39/arch/mips/mm/fault.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/mm/fault.c 2011-05-19 13:45:27.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/mti-malta/malta-pci.c linux-2.6.39-pax/arch/mips/mti-malta/malta-pci.c --- linux-2.6.39/arch/mips/mti-malta/malta-pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/mti-malta/malta-pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -64,9 +64,9 @@ static struct resource msc_io_resource = .flags = IORESOURCE_IO, }; -extern struct pci_ops bonito64_pci_ops; -extern struct pci_ops gt64xxx_pci0_ops; -extern struct pci_ops msc_pci_ops; +extern const struct pci_ops bonito64_pci_ops; +extern const struct pci_ops gt64xxx_pci0_ops; +extern const struct pci_ops msc_pci_ops; static struct pci_controller bonito64_controller = { .pci_ops = &bonito64_pci_ops, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/nxp/pnx8550/common/pci.c linux-2.6.39-pax/arch/mips/nxp/pnx8550/common/pci.c --- linux-2.6.39/arch/mips/nxp/pnx8550/common/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/nxp/pnx8550/common/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -40,7 +40,7 @@ static struct resource pci_mem_resource .flags = IORESOURCE_MEM }; -extern struct pci_ops pnx8550_pci_ops; +extern const struct pci_ops pnx8550_pci_ops; static struct pci_controller pnx8550_controller = { .pci_ops = &pnx8550_pci_ops, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-au1000.c linux-2.6.39-pax/arch/mips/pci/ops-au1000.c --- linux-2.6.39/arch/mips/pci/ops-au1000.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-au1000.c 2011-05-19 14:23:28.000000000 +0200 @@ -302,7 +302,7 @@ static int config_write(struct pci_bus * } } -struct pci_ops au1x_pci_ops = { +const struct pci_ops au1x_pci_ops = { config_read, config_write }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-bcm63xx.c linux-2.6.39-pax/arch/mips/pci/ops-bcm63xx.c --- linux-2.6.39/arch/mips/pci/ops-bcm63xx.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-bcm63xx.c 2011-05-19 14:23:28.000000000 +0200 @@ -173,7 +173,7 @@ static int bcm63xx_pci_write(struct pci_ where, size, val); } -struct pci_ops bcm63xx_pci_ops = { +const struct pci_ops bcm63xx_pci_ops = { .read = bcm63xx_pci_read, .write = bcm63xx_pci_write }; @@ -402,7 +402,7 @@ static int bcm63xx_cb_write(struct pci_b return PCIBIOS_DEVICE_NOT_FOUND; } -struct pci_ops bcm63xx_cb_ops = { +const struct pci_ops bcm63xx_cb_ops = { .read = bcm63xx_cb_read, .write = bcm63xx_cb_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-bonito64.c linux-2.6.39-pax/arch/mips/pci/ops-bonito64.c --- linux-2.6.39/arch/mips/pci/ops-bonito64.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-bonito64.c 2011-05-19 14:23:28.000000000 +0200 @@ -155,7 +155,7 @@ static int bonito64_pcibios_write(struct return PCIBIOS_SUCCESSFUL; } -struct pci_ops bonito64_pci_ops = { +const struct pci_ops bonito64_pci_ops = { .read = bonito64_pcibios_read, .write = bonito64_pcibios_write }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-bridge.c linux-2.6.39-pax/arch/mips/pci/ops-bridge.c --- linux-2.6.39/arch/mips/pci/ops-bridge.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-bridge.c 2011-05-19 14:23:28.000000000 +0200 @@ -316,7 +316,7 @@ static int pci_write_config(struct pci_b return pci_conf0_write_config(bus, devfn, where, size, value); } -struct pci_ops bridge_pci_ops = { +const struct pci_ops bridge_pci_ops = { .read = pci_read_config, .write = pci_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-emma2rh.c linux-2.6.39-pax/arch/mips/pci/ops-emma2rh.c --- linux-2.6.39/arch/mips/pci/ops-emma2rh.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-emma2rh.c 2011-05-19 14:23:28.000000000 +0200 @@ -176,7 +176,7 @@ static int pci_config_write(struct pci_b return PCIBIOS_SUCCESSFUL; } -struct pci_ops emma2rh_pci_ops = { +const struct pci_ops emma2rh_pci_ops = { .read = pci_config_read, .write = pci_config_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-gt64xxx_pci0.c linux-2.6.39-pax/arch/mips/pci/ops-gt64xxx_pci0.c --- linux-2.6.39/arch/mips/pci/ops-gt64xxx_pci0.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-gt64xxx_pci0.c 2011-05-19 14:23:28.000000000 +0200 @@ -146,7 +146,7 @@ static int gt64xxx_pci0_pcibios_write(st return PCIBIOS_SUCCESSFUL; } -struct pci_ops gt64xxx_pci0_ops = { +const struct pci_ops gt64xxx_pci0_ops = { .read = gt64xxx_pci0_pcibios_read, .write = gt64xxx_pci0_pcibios_write }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-loongson2.c linux-2.6.39-pax/arch/mips/pci/ops-loongson2.c --- linux-2.6.39/arch/mips/pci/ops-loongson2.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-loongson2.c 2011-05-19 14:23:28.000000000 +0200 @@ -174,7 +174,7 @@ static int loongson_pcibios_write(struct return PCIBIOS_SUCCESSFUL; } -struct pci_ops loongson_pci_ops = { +const struct pci_ops loongson_pci_ops = { .read = loongson_pcibios_read, .write = loongson_pcibios_write }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-mace.c linux-2.6.39-pax/arch/mips/pci/ops-mace.c --- linux-2.6.39/arch/mips/pci/ops-mace.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-mace.c 2011-05-19 14:23:28.000000000 +0200 @@ -96,7 +96,7 @@ mace_pci_write_config(struct pci_bus *bu return PCIBIOS_SUCCESSFUL; } -struct pci_ops mace_pci_ops = { +const struct pci_ops mace_pci_ops = { .read = mace_pci_read_config, .write = mace_pci_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-msc.c linux-2.6.39-pax/arch/mips/pci/ops-msc.c --- linux-2.6.39/arch/mips/pci/ops-msc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-msc.c 2011-05-19 14:23:28.000000000 +0200 @@ -142,7 +142,7 @@ static int msc_pcibios_write(struct pci_ return PCIBIOS_SUCCESSFUL; } -struct pci_ops msc_pci_ops = { +const struct pci_ops msc_pci_ops = { .read = msc_pcibios_read, .write = msc_pcibios_write }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-nile4.c linux-2.6.39-pax/arch/mips/pci/ops-nile4.c --- linux-2.6.39/arch/mips/pci/ops-nile4.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-nile4.c 2011-05-19 14:23:28.000000000 +0200 @@ -141,7 +141,7 @@ static int nile4_pcibios_write(struct pc return PCIBIOS_SUCCESSFUL; } -struct pci_ops nile4_pci_ops = { +const struct pci_ops nile4_pci_ops = { .read = nile4_pcibios_read, .write = nile4_pcibios_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-pmcmsp.c linux-2.6.39-pax/arch/mips/pci/ops-pmcmsp.c --- linux-2.6.39/arch/mips/pci/ops-pmcmsp.c 2011-05-19 10:21:07.000000000 +0200 +++ linux-2.6.39-pax/arch/mips/pci/ops-pmcmsp.c 2011-05-19 14:23:28.000000000 +0200 @@ -904,7 +904,7 @@ msp_pcibios_write_config(struct pci_bus * write - function for Linux to generate PCI Configuration writes. * ****************************************************************************/ -struct pci_ops msp_pci_ops = { +const struct pci_ops msp_pci_ops = { .read = msp_pcibios_read_config, .write = msp_pcibios_write_config }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-pnx8550.c linux-2.6.39-pax/arch/mips/pci/ops-pnx8550.c --- linux-2.6.39/arch/mips/pci/ops-pnx8550.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-pnx8550.c 2011-05-19 14:23:28.000000000 +0200 @@ -276,7 +276,7 @@ static int config_write(struct pci_bus * } } -struct pci_ops pnx8550_pci_ops = { +const struct pci_ops pnx8550_pci_ops = { config_read, config_write }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-rc32434.c linux-2.6.39-pax/arch/mips/pci/ops-rc32434.c --- linux-2.6.39/arch/mips/pci/ops-rc32434.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-rc32434.c 2011-05-19 14:23:28.000000000 +0200 @@ -201,7 +201,7 @@ static int pci_config_write(struct pci_b } } -struct pci_ops rc32434_pci_ops = { +const struct pci_ops rc32434_pci_ops = { .read = pci_config_read, .write = pci_config_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-sni.c linux-2.6.39-pax/arch/mips/pci/ops-sni.c --- linux-2.6.39/arch/mips/pci/ops-sni.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-sni.c 2011-05-19 14:23:28.000000000 +0200 @@ -83,7 +83,7 @@ static int pcimt_write(struct pci_bus *b return 0; } -struct pci_ops sni_pcimt_ops = { +const struct pci_ops sni_pcimt_ops = { .read = pcimt_read, .write = pcimt_write, }; @@ -158,7 +158,7 @@ static int pcit_write(struct pci_bus *bu } -struct pci_ops sni_pcit_ops = { +const struct pci_ops sni_pcit_ops = { .read = pcit_read, .write = pcit_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-titan-ht.c linux-2.6.39-pax/arch/mips/pci/ops-titan-ht.c --- linux-2.6.39/arch/mips/pci/ops-titan-ht.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-titan-ht.c 2011-05-19 14:23:28.000000000 +0200 @@ -118,7 +118,7 @@ static int titan_ht_config_write(struct return PCIBIOS_SUCCESSFUL; } -struct pci_ops titan_ht_pci_ops = { +const struct pci_ops titan_ht_pci_ops = { .read = titan_ht_config_read, .write = titan_ht_config_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-titan.c linux-2.6.39-pax/arch/mips/pci/ops-titan.c --- linux-2.6.39/arch/mips/pci/ops-titan.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-titan.c 2011-05-19 14:23:28.000000000 +0200 @@ -105,7 +105,7 @@ static int titan_write_config(struct pci /* * Titan PCI structure */ -struct pci_ops titan_pci_ops = { +const struct pci_ops titan_pci_ops = { titan_read_config, titan_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-tx3927.c linux-2.6.39-pax/arch/mips/pci/ops-tx3927.c --- linux-2.6.39/arch/mips/pci/ops-tx3927.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-tx3927.c 2011-05-19 14:23:28.000000000 +0200 @@ -121,7 +121,7 @@ static int tx3927_pci_write_config(struc return check_abort(); } -static struct pci_ops tx3927_pci_ops = { +static const struct pci_ops tx3927_pci_ops = { .read = tx3927_pci_read_config, .write = tx3927_pci_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/ops-vr41xx.c linux-2.6.39-pax/arch/mips/pci/ops-vr41xx.c --- linux-2.6.39/arch/mips/pci/ops-vr41xx.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/ops-vr41xx.c 2011-05-19 14:23:28.000000000 +0200 @@ -120,7 +120,7 @@ static int pci_config_write(struct pci_b return PCIBIOS_SUCCESSFUL; } -struct pci_ops vr41xx_pci_ops = { +const struct pci_ops vr41xx_pci_ops = { .read = pci_config_read, .write = pci_config_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pci-bcm1480.c linux-2.6.39-pax/arch/mips/pci/pci-bcm1480.c --- linux-2.6.39/arch/mips/pci/pci-bcm1480.c 2011-05-19 10:21:07.000000000 +0200 +++ linux-2.6.39-pax/arch/mips/pci/pci-bcm1480.c 2011-05-19 14:23:28.000000000 +0200 @@ -171,7 +171,7 @@ static int bcm1480_pcibios_write(struct return PCIBIOS_SUCCESSFUL; } -struct pci_ops bcm1480_pci_ops = { +const struct pci_ops bcm1480_pci_ops = { bcm1480_pcibios_read, bcm1480_pcibios_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pci-bcm1480ht.c linux-2.6.39-pax/arch/mips/pci/pci-bcm1480ht.c --- linux-2.6.39/arch/mips/pci/pci-bcm1480ht.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/pci-bcm1480ht.c 2011-05-19 14:23:28.000000000 +0200 @@ -166,7 +166,7 @@ static int bcm1480ht_pcibios_get_busno(v return 0; } -struct pci_ops bcm1480ht_pci_ops = { +const struct pci_ops bcm1480ht_pci_ops = { .read = bcm1480ht_pcibios_read, .write = bcm1480ht_pcibios_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pci-bcm63xx.h linux-2.6.39-pax/arch/mips/pci/pci-bcm63xx.h --- linux-2.6.39/arch/mips/pci/pci-bcm63xx.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/pci-bcm63xx.h 2011-05-19 14:23:28.000000000 +0200 @@ -16,8 +16,8 @@ /* * defined in ops-bcm63xx.c */ -extern struct pci_ops bcm63xx_pci_ops; -extern struct pci_ops bcm63xx_cb_ops; +extern const struct pci_ops bcm63xx_pci_ops; +extern const struct pci_ops bcm63xx_cb_ops; /* * defined in pci-bcm63xx.c diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pci-emma2rh.c linux-2.6.39-pax/arch/mips/pci/pci-emma2rh.c --- linux-2.6.39/arch/mips/pci/pci-emma2rh.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/pci-emma2rh.c 2011-05-19 14:23:28.000000000 +0200 @@ -43,7 +43,7 @@ static struct resource pci_mem_resource .flags = IORESOURCE_MEM, }; -extern struct pci_ops emma2rh_pci_ops; +extern const struct pci_ops emma2rh_pci_ops; static struct pci_controller emma2rh_pci_controller = { .pci_ops = &emma2rh_pci_ops, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pci-ip27.c linux-2.6.39-pax/arch/mips/pci/pci-ip27.c --- linux-2.6.39/arch/mips/pci/pci-ip27.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/pci-ip27.c 2011-05-19 14:23:28.000000000 +0200 @@ -39,7 +39,7 @@ static struct bridge_controller bridges[ struct bridge_controller *irq_to_bridge[MAX_PCI_BUSSES * MAX_DEVICES_PER_PCIBUS]; int irq_to_slot[MAX_PCI_BUSSES * MAX_DEVICES_PER_PCIBUS]; -extern struct pci_ops bridge_pci_ops; +extern const struct pci_ops bridge_pci_ops; int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pci-ip32.c linux-2.6.39-pax/arch/mips/pci/pci-ip32.c --- linux-2.6.39/arch/mips/pci/pci-ip32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/pci-ip32.c 2011-05-19 14:23:28.000000000 +0200 @@ -82,7 +82,7 @@ static irqreturn_t macepci_error(int irq } -extern struct pci_ops mace_pci_ops; +extern const struct pci_ops mace_pci_ops; #ifdef CONFIG_64BIT static struct resource mace_pci_mem_resource = { .name = "SGI O2 PCI MEM", diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pci-lasat.c linux-2.6.39-pax/arch/mips/pci/pci-lasat.c --- linux-2.6.39/arch/mips/pci/pci-lasat.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/pci-lasat.c 2011-05-19 14:23:28.000000000 +0200 @@ -14,8 +14,8 @@ #include -extern struct pci_ops nile4_pci_ops; -extern struct pci_ops gt64xxx_pci0_ops; +extern const struct pci_ops nile4_pci_ops; +extern const struct pci_ops gt64xxx_pci0_ops; static struct resource lasat_pci_mem_resource = { .name = "LASAT PCI MEM", .start = 0x18000000, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pci-octeon.c linux-2.6.39-pax/arch/mips/pci/pci-octeon.c --- linux-2.6.39/arch/mips/pci/pci-octeon.c 2011-05-19 10:21:07.000000000 +0200 +++ linux-2.6.39-pax/arch/mips/pci/pci-octeon.c 2011-05-19 14:23:28.000000000 +0200 @@ -334,7 +334,7 @@ static int octeon_write_config(struct pc } -static struct pci_ops octeon_pci_ops = { +static const struct pci_ops octeon_pci_ops = { octeon_read_config, octeon_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pci-rc32434.c linux-2.6.39-pax/arch/mips/pci/pci-rc32434.c --- linux-2.6.39/arch/mips/pci/pci-rc32434.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/pci-rc32434.c 2011-05-19 14:23:28.000000000 +0200 @@ -75,7 +75,7 @@ static struct resource rc32434_res_pci_i .flags = IORESOURCE_IO, }; -extern struct pci_ops rc32434_pci_ops; +extern const struct pci_ops rc32434_pci_ops; #define PCI_MEM1_START PCI_ADDR_START #define PCI_MEM1_END (PCI_ADDR_START + CPUTOPCI_MEM_WIN - 1) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pci-sb1250.c linux-2.6.39-pax/arch/mips/pci/pci-sb1250.c --- linux-2.6.39/arch/mips/pci/pci-sb1250.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/pci-sb1250.c 2011-05-19 14:23:28.000000000 +0200 @@ -181,7 +181,7 @@ static int sb1250_pcibios_write(struct p return PCIBIOS_SUCCESSFUL; } -struct pci_ops sb1250_pci_ops = { +const struct pci_ops sb1250_pci_ops = { .read = sb1250_pcibios_read, .write = sb1250_pcibios_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pci-vr41xx.c linux-2.6.39-pax/arch/mips/pci/pci-vr41xx.c --- linux-2.6.39/arch/mips/pci/pci-vr41xx.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/pci-vr41xx.c 2011-05-19 14:23:28.000000000 +0200 @@ -36,7 +36,7 @@ #include "pci-vr41xx.h" -extern struct pci_ops vr41xx_pci_ops; +extern const struct pci_ops vr41xx_pci_ops; static void __iomem *pciu_base; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pci-yosemite.c linux-2.6.39-pax/arch/mips/pci/pci-yosemite.c --- linux-2.6.39/arch/mips/pci/pci-yosemite.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/pci-yosemite.c 2011-05-19 14:23:28.000000000 +0200 @@ -11,7 +11,7 @@ #include #include -extern struct pci_ops titan_pci_ops; +extern const struct pci_ops titan_pci_ops; static struct resource py_mem_resource = { .start = 0xe0000000UL, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pci/pcie-octeon.c linux-2.6.39-pax/arch/mips/pci/pcie-octeon.c --- linux-2.6.39/arch/mips/pci/pcie-octeon.c 2011-03-15 19:32:58.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pci/pcie-octeon.c 2011-05-19 14:23:28.000000000 +0200 @@ -1237,7 +1237,7 @@ static int octeon_pcie1_write_config(str return octeon_pcie_write_config(1, bus, devfn, reg, size, val); } -static struct pci_ops octeon_pcie0_ops = { +static const struct pci_ops octeon_pcie0_ops = { octeon_pcie0_read_config, octeon_pcie0_write_config, }; @@ -1258,7 +1258,7 @@ static struct pci_controller octeon_pcie .io_resource = &octeon_pcie0_io_resource, }; -static struct pci_ops octeon_pcie1_ops = { +static const struct pci_ops octeon_pcie1_ops = { octeon_pcie1_read_config, octeon_pcie1_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pmc-sierra/yosemite/ht.c linux-2.6.39-pax/arch/mips/pmc-sierra/yosemite/ht.c --- linux-2.6.39/arch/mips/pmc-sierra/yosemite/ht.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pmc-sierra/yosemite/ht.c 2011-05-19 14:23:28.000000000 +0200 @@ -366,7 +366,7 @@ resource_size_t pcibios_align_resource(v return start; } -struct pci_ops titan_pci_ops = { +const struct pci_ops titan_pci_ops = { titan_ht_config_read_byte, titan_ht_config_read_word, titan_ht_config_read_dword, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/pnx8550/common/pci.c linux-2.6.39-pax/arch/mips/pnx8550/common/pci.c --- linux-2.6.39/arch/mips/pnx8550/common/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/pnx8550/common/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -40,7 +40,7 @@ static struct resource pci_mem_resource .flags = IORESOURCE_MEM }; -extern struct pci_ops pnx8550_pci_ops; +extern const struct pci_ops pnx8550_pci_ops; static struct pci_controller pnx8550_controller = { .pci_ops = &pnx8550_pci_ops, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/sni/pcimt.c linux-2.6.39-pax/arch/mips/sni/pcimt.c --- linux-2.6.39/arch/mips/sni/pcimt.c 2011-05-19 10:21:08.000000000 +0200 +++ linux-2.6.39-pax/arch/mips/sni/pcimt.c 2011-05-19 14:23:28.000000000 +0200 @@ -183,7 +183,7 @@ static void __init sni_pcimt_resource_in request_resource(&sni_mem_resource, pcimt_mem_resources + i); } -extern struct pci_ops sni_pcimt_ops; +extern const struct pci_ops sni_pcimt_ops; static struct pci_controller sni_controller = { .pci_ops = &sni_pcimt_ops, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/sni/pcit.c linux-2.6.39-pax/arch/mips/sni/pcit.c --- linux-2.6.39/arch/mips/sni/pcit.c 2011-05-19 10:21:08.000000000 +0200 +++ linux-2.6.39-pax/arch/mips/sni/pcit.c 2011-05-19 14:23:28.000000000 +0200 @@ -145,7 +145,7 @@ static void __init sni_pcit_resource_ini } -extern struct pci_ops sni_pcit_ops; +extern const struct pci_ops sni_pcit_ops; static struct pci_controller sni_pcit_controller = { .pci_ops = &sni_pcit_ops, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mips/wrppmc/pci.c linux-2.6.39-pax/arch/mips/wrppmc/pci.c --- linux-2.6.39/arch/mips/wrppmc/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mips/wrppmc/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -14,7 +14,7 @@ #include -extern struct pci_ops gt64xxx_pci0_ops; +extern const struct pci_ops gt64xxx_pci0_ops; static struct resource pci0_io_resource = { .name = "pci_0 io", diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mn10300/unit-asb2305/pci-asb2305.h linux-2.6.39-pax/arch/mn10300/unit-asb2305/pci-asb2305.h --- linux-2.6.39/arch/mn10300/unit-asb2305/pci-asb2305.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mn10300/unit-asb2305/pci-asb2305.h 2011-05-19 14:23:28.000000000 +0200 @@ -39,7 +39,7 @@ extern void pcibios_resource_survey(void extern int pcibios_last_bus; extern struct pci_bus *pci_root_bus; -extern struct pci_ops *pci_root_ops; +extern const struct pci_ops *pci_root_ops; extern struct irq_routing_table *pcibios_get_irq_routing_table(void); extern int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/mn10300/unit-asb2305/pci.c linux-2.6.39-pax/arch/mn10300/unit-asb2305/pci.c --- linux-2.6.39/arch/mn10300/unit-asb2305/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/mn10300/unit-asb2305/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -24,7 +24,7 @@ unsigned int pci_probe = 1; int pcibios_last_bus = -1; struct pci_bus *pci_root_bus; -struct pci_ops *pci_root_ops; +const struct pci_ops *pci_root_ops; /* * The accessible PCI window does not cover the entire CPU address space, but @@ -274,7 +274,7 @@ static int pci_ampci_write_config(struct } } -static struct pci_ops pci_direct_ampci = { +static const struct pci_ops pci_direct_ampci = { pci_ampci_read_config, pci_ampci_write_config, }; @@ -289,7 +289,7 @@ static struct pci_ops pci_direct_ampci = * 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_ops *o) +static int __init pci_sanity_check(const struct pci_ops *o) { struct pci_bus bus; /* Fake bus and device */ u32 x; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/parisc/include/asm/elf.h linux-2.6.39-pax/arch/parisc/include/asm/elf.h --- linux-2.6.39/arch/parisc/include/asm/elf.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/parisc/include/asm/elf.h 2011-05-19 13:45:27.000000000 +0200 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration.. #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/parisc/include/asm/pgtable.h linux-2.6.39-pax/arch/parisc/include/asm/pgtable.h --- linux-2.6.39/arch/parisc/include/asm/pgtable.h 2011-05-19 10:21:08.000000000 +0200 +++ linux-2.6.39-pax/arch/parisc/include/asm/pgtable.h 2011-05-19 13:45:27.000000000 +0200 @@ -207,6 +207,17 @@ struct vm_area_struct; #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/parisc/kernel/module.c linux-2.6.39-pax/arch/parisc/kernel/module.c --- linux-2.6.39/arch/parisc/kernel/module.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/parisc/kernel/module.c 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ int module_frob_arch_sections(CONST Elf_ } /* 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 @@ static Elf64_Word get_got(struct module 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 @@ static Elf64_Word get_got(struct module #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 @@ static Elf_Addr get_fdesc(struct module /* 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 @@ register_unwind_table(struct module *me, 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/parisc/kernel/sys_parisc.c linux-2.6.39-pax/arch/parisc/kernel/sys_parisc.c --- linux-2.6.39/arch/parisc/kernel/sys_parisc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/parisc/kernel/sys_parisc.c 2011-05-19 13:45:27.000000000 +0200 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u /* 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 @@ static unsigned long get_shared_area(str /* 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 @@ unsigned long arch_get_unmapped_area(str 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/parisc/kernel/traps.c linux-2.6.39-pax/arch/parisc/kernel/traps.c --- linux-2.6.39/arch/parisc/kernel/traps.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/parisc/kernel/traps.c 2011-05-19 13:45:27.000000000 +0200 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/parisc/mm/fault.c linux-2.6.39-pax/arch/parisc/mm/fault.c --- linux-2.6.39/arch/parisc/mm/fault.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/parisc/mm/fault.c 2011-05-19 13:45:27.000000000 +0200 @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, ex 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 @@ parisc_acctyp(unsigned long code, unsign } #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 @@ good_area: 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 diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/device.h linux-2.6.39-pax/arch/powerpc/include/asm/device.h --- linux-2.6.39/arch/powerpc/include/asm/device.h 2011-03-15 19:32:59.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/include/asm/device.h 2011-05-19 14:23:28.000000000 +0200 @@ -17,7 +17,7 @@ struct device_node; */ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/dma-mapping.h linux-2.6.39-pax/arch/powerpc/include/asm/dma-mapping.h --- linux-2.6.39/arch/powerpc/include/asm/dma-mapping.h 2011-05-19 10:21:08.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/include/asm/dma-mapping.h 2011-05-19 14:23:28.000000000 +0200 @@ -67,12 +67,13 @@ static inline unsigned long device_to_ma /* * 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 @@ -85,7 +86,7 @@ static inline struct dma_map_ops *get_dm 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; } @@ -119,7 +120,7 @@ static inline void set_dma_offset(struct 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; @@ -133,7 +134,7 @@ extern int dma_set_mask(struct device *d 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); @@ -148,7 +149,7 @@ static inline void *dma_alloc_coherent(s 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); @@ -159,7 +160,7 @@ static inline void dma_free_coherent(str 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/elf.h linux-2.6.39-pax/arch/powerpc/include/asm/elf.h --- linux-2.6.39/arch/powerpc/include/asm/elf.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/include/asm/elf.h 2011-05-19 13:45:27.000000000 +0200 @@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E 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 @@ extern int arch_setup_additional_pages(s (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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/iommu.h linux-2.6.39-pax/arch/powerpc/include/asm/iommu.h --- linux-2.6.39/arch/powerpc/include/asm/iommu.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/include/asm/iommu.h 2011-05-19 14:23:28.000000000 +0200 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/kmap_types.h linux-2.6.39-pax/arch/powerpc/include/asm/kmap_types.h --- linux-2.6.39/arch/powerpc/include/asm/kmap_types.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/include/asm/kmap_types.h 2011-05-19 13:45:27.000000000 +0200 @@ -27,6 +27,7 @@ enum km_type { KM_PPC_SYNC_PAGE, KM_PPC_SYNC_ICACHE, KM_KDB, + KM_CLEARPAGE, KM_TYPE_NR }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/page.h linux-2.6.39-pax/arch/powerpc/include/asm/page.h --- linux-2.6.39/arch/powerpc/include/asm/page.h 2011-05-19 10:21:08.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/include/asm/page.h 2011-05-19 13:45:27.000000000 +0200 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr; * 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 @@ extern phys_addr_t kernstart_addr; #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/page_64.h linux-2.6.39-pax/arch/powerpc/include/asm/page_64.h --- linux-2.6.39/arch/powerpc/include/asm/page_64.h 2011-05-19 10:21:09.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/include/asm/page_64.h 2011-05-19 13:45:27.000000000 +0200 @@ -172,15 +172,18 @@ do { \ * stack by default, so in the absence 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/pci.h linux-2.6.39-pax/arch/powerpc/include/asm/pci.h --- linux-2.6.39/arch/powerpc/include/asm/pci.h 2011-05-19 10:21:09.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/include/asm/pci.h 2011-05-19 14:23:28.000000000 +0200 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq } #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/pgtable.h linux-2.6.39-pax/arch/powerpc/include/asm/pgtable.h --- linux-2.6.39/arch/powerpc/include/asm/pgtable.h 2011-05-19 10:21:09.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/include/asm/pgtable.h 2011-05-19 13:45:27.000000000 +0200 @@ -2,6 +2,7 @@ #define _ASM_POWERPC_PGTABLE_H #ifdef __KERNEL__ +#include #ifndef __ASSEMBLY__ #include /* For TASK_SIZE */ #include diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/pte-hash32.h linux-2.6.39-pax/arch/powerpc/include/asm/pte-hash32.h --- linux-2.6.39/arch/powerpc/include/asm/pte-hash32.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/include/asm/pte-hash32.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/reg.h linux-2.6.39-pax/arch/powerpc/include/asm/reg.h --- linux-2.6.39/arch/powerpc/include/asm/reg.h 2011-05-19 10:21:09.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/include/asm/reg.h 2011-05-19 13:45:27.000000000 +0200 @@ -201,6 +201,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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/swiotlb.h linux-2.6.39-pax/arch/powerpc/include/asm/swiotlb.h --- linux-2.6.39/arch/powerpc/include/asm/swiotlb.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/include/asm/swiotlb.h 2011-05-19 14:23:28.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/system.h linux-2.6.39-pax/arch/powerpc/include/asm/system.h --- linux-2.6.39/arch/powerpc/include/asm/system.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/include/asm/system.h 2011-05-19 13:45:27.000000000 +0200 @@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsi #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/include/asm/uaccess.h linux-2.6.39-pax/arch/powerpc/include/asm/uaccess.h --- linux-2.6.39/arch/powerpc/include/asm/uaccess.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/include/asm/uaccess.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ do { \ 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 @@ static inline unsigned long __copy_from_ 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 @@ static inline unsigned long __copy_to_us 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 @@ static inline unsigned long __copy_to_us 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/dma-iommu.c linux-2.6.39-pax/arch/powerpc/kernel/dma-iommu.c --- linux-2.6.39/arch/powerpc/kernel/dma-iommu.c 2011-03-15 19:33:00.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/kernel/dma-iommu.c 2011-05-19 14:23:28.000000000 +0200 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de } /* 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 @@ static int dma_iommu_dma_supported(struc 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.39-pax/arch/powerpc/kernel/dma-swiotlb.c --- linux-2.6.39/arch/powerpc/kernel/dma-swiotlb.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/kernel/dma-swiotlb.c 2011-05-19 14:23:28.000000000 +0200 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/dma.c linux-2.6.39-pax/arch/powerpc/kernel/dma.c --- linux-2.6.39/arch/powerpc/kernel/dma.c 2011-05-19 10:21:09.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/kernel/dma.c 2011-05-19 14:23:28.000000000 +0200 @@ -136,7 +136,7 @@ static inline void dma_direct_sync_singl } #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 @@ EXPORT_SYMBOL(dma_direct_ops); 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/exceptions-64e.S linux-2.6.39-pax/arch/powerpc/kernel/exceptions-64e.S --- linux-2.6.39/arch/powerpc/kernel/exceptions-64e.S 2011-05-19 10:21:09.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/kernel/exceptions-64e.S 2011-05-19 13:45:27.000000000 +0200 @@ -495,6 +495,7 @@ storage_fault_common: 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 @@ storage_fault_common: 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/exceptions-64s.S linux-2.6.39-pax/arch/powerpc/kernel/exceptions-64s.S --- linux-2.6.39/arch/powerpc/kernel/exceptions-64s.S 2011-05-19 10:21:09.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/kernel/exceptions-64s.S 2011-05-19 13:45:27.000000000 +0200 @@ -848,10 +848,10 @@ handle_page_fault: 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/ibmebus.c linux-2.6.39-pax/arch/powerpc/kernel/ibmebus.c --- linux-2.6.39/arch/powerpc/kernel/ibmebus.c 2011-05-19 10:21:09.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/kernel/ibmebus.c 2011-05-19 14:23:28.000000000 +0200 @@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/kgdb.c linux-2.6.39-pax/arch/powerpc/kernel/kgdb.c --- linux-2.6.39/arch/powerpc/kernel/kgdb.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/kernel/kgdb.c 2011-05-19 14:23:28.000000000 +0200 @@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vecto /* * Global data */ -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/module.c linux-2.6.39-pax/arch/powerpc/kernel/module.c --- linux-2.6.39/arch/powerpc/kernel/module.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/kernel/module.c 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ void module_free(struct module *mod, voi 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/module_32.c linux-2.6.39-pax/arch/powerpc/kernel/module_32.c --- linux-2.6.39/arch/powerpc/kernel/module_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/kernel/module_32.c 2011-05-19 13:45:27.000000000 +0200 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr 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 @@ static uint32_t do_plt_call(void *locati 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/pci-common.c linux-2.6.39-pax/arch/powerpc/kernel/pci-common.c --- linux-2.6.39/arch/powerpc/kernel/pci-common.c 2011-05-19 10:21:09.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/kernel/pci-common.c 2011-05-19 14:23:28.000000000 +0200 @@ -53,14 +53,14 @@ resource_size_t isa_mem_base; 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; } @@ -1639,7 +1639,7 @@ null_write_config(struct pci_bus *bus, u return PCIBIOS_DEVICE_NOT_FOUND; } -static struct pci_ops null_pci_ops = +static const struct pci_ops null_pci_ops = { .read = null_read_config, .write = null_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/process.c linux-2.6.39-pax/arch/powerpc/kernel/process.c --- linux-2.6.39/arch/powerpc/kernel/process.c 2011-05-19 10:21:09.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/kernel/process.c 2011-05-19 13:45:27.000000000 +0200 @@ -1244,58 +1244,3 @@ void thread_info_cache_init(void) } #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/rtas_pci.c linux-2.6.39-pax/arch/powerpc/kernel/rtas_pci.c --- linux-2.6.39/arch/powerpc/kernel/rtas_pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/kernel/rtas_pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -149,7 +149,7 @@ static int rtas_pci_write_config(struct return PCIBIOS_DEVICE_NOT_FOUND; } -static struct pci_ops rtas_pci_ops = { +static const struct pci_ops rtas_pci_ops = { .read = rtas_pci_read_config, .write = rtas_pci_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/signal_32.c linux-2.6.39-pax/arch/powerpc/kernel/signal_32.c --- linux-2.6.39/arch/powerpc/kernel/signal_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/kernel/signal_32.c 2011-05-19 13:45:27.000000000 +0200 @@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/signal_64.c linux-2.6.39-pax/arch/powerpc/kernel/signal_64.c --- linux-2.6.39/arch/powerpc/kernel/signal_64.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/kernel/signal_64.c 2011-05-19 13:45:27.000000000 +0200 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/vdso.c linux-2.6.39-pax/arch/powerpc/kernel/vdso.c --- linux-2.6.39/arch/powerpc/kernel/vdso.c 2011-05-19 10:21:09.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/kernel/vdso.c 2011-05-19 13:45:27.000000000 +0200 @@ -36,6 +36,7 @@ #include #include #include +#include #include "setup.h" @@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct l 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 +241,7 @@ int arch_setup_additional_pages(struct l 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/kernel/vio.c linux-2.6.39-pax/arch/powerpc/kernel/vio.c --- linux-2.6.39/arch/powerpc/kernel/vio.c 2011-03-15 19:33:01.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/kernel/vio.c 2011-05-19 14:23:28.000000000 +0200 @@ -605,11 +605,12 @@ static int vio_dma_iommu_dma_supported(s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/lib/usercopy_64.c linux-2.6.39-pax/arch/powerpc/lib/usercopy_64.c --- linux-2.6.39/arch/powerpc/lib/usercopy_64.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/lib/usercopy_64.c 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ unsigned long copy_in_user(void __user * return n; } -EXPORT_SYMBOL(copy_from_user); -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/mm/fault.c linux-2.6.39-pax/arch/powerpc/mm/fault.c --- linux-2.6.39/arch/powerpc/mm/fault.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/mm/fault.c 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ static inline int notify_page_fault(stru } #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 @@ int __kprobes do_page_fault(struct pt_re * 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 @@ good_area: * "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 @@ good_area: * 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: 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/mm/mmap_64.c linux-2.6.39-pax/arch/powerpc/mm/mmap_64.c --- linux-2.6.39/arch/powerpc/mm/mmap_64.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/mm/mmap_64.c 2011-05-19 13:45:27.000000000 +0200 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/mm/slice.c linux-2.6.39-pax/arch/powerpc/mm/slice.c --- linux-2.6.39/arch/powerpc/mm/slice.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/mm/slice.c 2011-05-19 13:45:27.000000000 +0200 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_ 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 @@ full_search: 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 @@ static unsigned long slice_find_area_top } } - 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 @@ static unsigned long slice_find_area_top * 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 @@ static unsigned long slice_find_area_top 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 @@ unsigned long slice_get_unmapped_area(un 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/platforms/52xx/efika.c linux-2.6.39-pax/arch/powerpc/platforms/52xx/efika.c --- linux-2.6.39/arch/powerpc/platforms/52xx/efika.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/platforms/52xx/efika.c 2011-05-19 14:23:28.000000000 +0200 @@ -60,7 +60,7 @@ static int rtas_write_config(struct pci_ return rval ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL; } -static struct pci_ops rtas_pci_ops = { +static const struct pci_ops rtas_pci_ops = { .read = rtas_read_config, .write = rtas_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/platforms/cell/celleb_pci.c linux-2.6.39-pax/arch/powerpc/platforms/cell/celleb_pci.c --- linux-2.6.39/arch/powerpc/platforms/cell/celleb_pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/platforms/cell/celleb_pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -234,7 +234,7 @@ static int celleb_fake_pci_write_config( return PCIBIOS_SUCCESSFUL; } -static struct pci_ops celleb_fake_pci_ops = { +static const struct pci_ops celleb_fake_pci_ops = { .read = celleb_fake_pci_read_config, .write = celleb_fake_pci_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_epci.c linux-2.6.39-pax/arch/powerpc/platforms/cell/celleb_scc_epci.c --- linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_epci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/platforms/cell/celleb_scc_epci.c 2011-05-19 14:23:28.000000000 +0200 @@ -245,7 +245,7 @@ static int celleb_epci_write_config(stru return celleb_epci_check_abort(hose, addr); } -struct pci_ops celleb_epci_ops = { +const struct pci_ops celleb_epci_ops = { .read = celleb_epci_read_config, .write = celleb_epci_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_pciex.c linux-2.6.39-pax/arch/powerpc/platforms/cell/celleb_scc_pciex.c --- linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_pciex.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/platforms/cell/celleb_scc_pciex.c 2011-05-19 14:23:28.000000000 +0200 @@ -399,7 +399,7 @@ static int scc_pciex_write_config(struct return PCIBIOS_SUCCESSFUL; } -static struct pci_ops scc_pciex_pci_ops = { +static const struct pci_ops scc_pciex_pci_ops = { scc_pciex_read_config, scc_pciex_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/platforms/cell/iommu.c linux-2.6.39-pax/arch/powerpc/platforms/cell/iommu.c --- linux-2.6.39/arch/powerpc/platforms/cell/iommu.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/platforms/cell/iommu.c 2011-05-19 14:23:28.000000000 +0200 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/platforms/chrp/pci.c linux-2.6.39-pax/arch/powerpc/platforms/chrp/pci.c --- linux-2.6.39/arch/powerpc/platforms/chrp/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/platforms/chrp/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -84,7 +84,7 @@ int gg2_write_config(struct pci_bus *bus return PCIBIOS_SUCCESSFUL; } -static struct pci_ops gg2_pci_ops = +static const struct pci_ops gg2_pci_ops = { .read = gg2_read_config, .write = gg2_write_config, @@ -122,7 +122,7 @@ int rtas_write_config(struct pci_bus *bu return rval? PCIBIOS_DEVICE_NOT_FOUND: PCIBIOS_SUCCESSFUL; } -static struct pci_ops rtas_pci_ops = +static const struct pci_ops rtas_pci_ops = { .read = rtas_read_config, .write = rtas_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/platforms/iseries/pci.c linux-2.6.39-pax/arch/powerpc/platforms/iseries/pci.c --- linux-2.6.39/arch/powerpc/platforms/iseries/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/platforms/iseries/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -533,7 +533,7 @@ static int iSeries_pci_write_config(stru return 0; } -static struct pci_ops iSeries_pci_ops = { +static const struct pci_ops iSeries_pci_ops = { .read = iSeries_pci_read_config, .write = iSeries_pci_write_config }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/platforms/maple/pci.c linux-2.6.39-pax/arch/powerpc/platforms/maple/pci.c --- linux-2.6.39/arch/powerpc/platforms/maple/pci.c 2011-05-19 10:21:10.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/platforms/maple/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -180,7 +180,7 @@ static int u3_agp_write_config(struct pc return PCIBIOS_SUCCESSFUL; } -static struct pci_ops u3_agp_pci_ops = +static const struct pci_ops u3_agp_pci_ops = { .read = u3_agp_read_config, .write = u3_agp_write_config, @@ -276,7 +276,7 @@ static int u3_ht_write_config(struct pci return PCIBIOS_SUCCESSFUL; } -static struct pci_ops u3_ht_pci_ops = +static const struct pci_ops u3_ht_pci_ops = { .read = u3_ht_read_config, .write = u3_ht_write_config, @@ -381,7 +381,7 @@ static int u4_pcie_write_config(struct p return PCIBIOS_SUCCESSFUL; } -static struct pci_ops u4_pcie_pci_ops = +static const struct pci_ops u4_pcie_pci_ops = { .read = u4_pcie_read_config, .write = u4_pcie_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/platforms/pasemi/pci.c linux-2.6.39-pax/arch/powerpc/platforms/pasemi/pci.c --- linux-2.6.39/arch/powerpc/platforms/pasemi/pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/platforms/pasemi/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -176,7 +176,7 @@ static int pa_pxp_write_config(struct pc return PCIBIOS_SUCCESSFUL; } -static struct pci_ops pa_pxp_ops = { +static const struct pci_ops pa_pxp_ops = { .read = pa_pxp_read_config, .write = pa_pxp_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/platforms/powermac/pci.c linux-2.6.39-pax/arch/powerpc/platforms/powermac/pci.c --- linux-2.6.39/arch/powerpc/platforms/powermac/pci.c 2011-05-19 10:21:10.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/platforms/powermac/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -218,7 +218,7 @@ static int macrisc_write_config(struct p return PCIBIOS_SUCCESSFUL; } -static struct pci_ops macrisc_pci_ops = +static const struct pci_ops macrisc_pci_ops = { .read = macrisc_read_config, .write = macrisc_write_config, @@ -273,7 +273,7 @@ chaos_write_config(struct pci_bus *bus, return macrisc_write_config(bus, devfn, offset, len, val); } -static struct pci_ops chaos_pci_ops = +static const struct pci_ops chaos_pci_ops = { .read = chaos_read_config, .write = chaos_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.39-pax/arch/powerpc/platforms/ps3/system-bus.c --- linux-2.6.39/arch/powerpc/platforms/ps3/system-bus.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/platforms/ps3/system-bus.c 2011-05-19 14:23:28.000000000 +0200 @@ -695,7 +695,7 @@ static int ps3_dma_supported(struct devi 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 @@ static struct dma_map_ops ps3_sb_dma_ops .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/sysdev/fsl_pci.c linux-2.6.39-pax/arch/powerpc/sysdev/fsl_pci.c --- linux-2.6.39/arch/powerpc/sysdev/fsl_pci.c 2011-05-19 10:21:10.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/sysdev/fsl_pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -573,7 +573,7 @@ static int mpc83xx_pcie_write_config(str return PCIBIOS_SUCCESSFUL; } -static struct pci_ops mpc83xx_pcie_ops = { +static const struct pci_ops mpc83xx_pcie_ops = { .read = mpc83xx_pcie_read_config, .write = mpc83xx_pcie_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/sysdev/indirect_pci.c linux-2.6.39-pax/arch/powerpc/sysdev/indirect_pci.c --- linux-2.6.39/arch/powerpc/sysdev/indirect_pci.c 2011-05-19 10:21:10.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/sysdev/indirect_pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -148,7 +148,7 @@ indirect_write_config(struct pci_bus *bu return PCIBIOS_SUCCESSFUL; } -static struct pci_ops indirect_pci_ops = +static const struct pci_ops indirect_pci_ops = { .read = indirect_read_config, .write = indirect_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/sysdev/ppc4xx_pci.c linux-2.6.39-pax/arch/powerpc/sysdev/ppc4xx_pci.c --- linux-2.6.39/arch/powerpc/sysdev/ppc4xx_pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/powerpc/sysdev/ppc4xx_pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -1514,7 +1514,7 @@ static int ppc4xx_pciex_write_config(str return PCIBIOS_SUCCESSFUL; } -static struct pci_ops ppc4xx_pciex_pci_ops = +static const struct pci_ops ppc4xx_pciex_pci_ops = { .read = ppc4xx_pciex_read_config, .write = ppc4xx_pciex_write_config, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/powerpc/sysdev/tsi108_pci.c linux-2.6.39-pax/arch/powerpc/sysdev/tsi108_pci.c --- linux-2.6.39/arch/powerpc/sysdev/tsi108_pci.c 2011-05-19 10:21:10.000000000 +0200 +++ linux-2.6.39-pax/arch/powerpc/sysdev/tsi108_pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -190,7 +190,7 @@ void tsi108_clear_pci_cfg_error(void) tsi108_clear_pci_error(tsi108_pci_cfg_phys); } -static struct pci_ops tsi108_direct_pci_ops = { +static const struct pci_ops tsi108_direct_pci_ops = { .read = tsi108_direct_read_config, .write = tsi108_direct_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/s390/Kconfig linux-2.6.39-pax/arch/s390/Kconfig --- linux-2.6.39/arch/s390/Kconfig 2011-05-19 10:21:10.000000000 +0200 +++ linux-2.6.39-pax/arch/s390/Kconfig 2011-05-19 13:45:27.000000000 +0200 @@ -234,11 +234,9 @@ config S390_EXEC_PROTECT 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" diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/s390/include/asm/elf.h linux-2.6.39-pax/arch/s390/include/asm/elf.h --- linux-2.6.39/arch/s390/include/asm/elf.h 2011-03-15 19:33:03.000000000 +0100 +++ linux-2.6.39-pax/arch/s390/include/asm/elf.h 2011-05-19 13:45:27.000000000 +0200 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled; 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 @@ struct linux_binprm; #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/s390/include/asm/system.h linux-2.6.39-pax/arch/s390/include/asm/system.h --- linux-2.6.39/arch/s390/include/asm/system.h 2011-05-19 10:21:10.000000000 +0200 +++ linux-2.6.39-pax/arch/s390/include/asm/system.h 2011-05-19 13:45:27.000000000 +0200 @@ -255,7 +255,7 @@ extern void (*_machine_restart)(char *co 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/s390/include/asm/uaccess.h linux-2.6.39-pax/arch/s390/include/asm/uaccess.h --- linux-2.6.39/arch/s390/include/asm/uaccess.h 2011-05-19 10:21:10.000000000 +0200 +++ linux-2.6.39-pax/arch/s390/include/asm/uaccess.h 2011-05-19 13:45:27.000000000 +0200 @@ -234,6 +234,10 @@ static inline unsigned long __must_check 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 @@ copy_to_user(void __user *to, const void 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 @@ copy_from_user(void *to, const void __us 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/s390/kernel/module.c linux-2.6.39-pax/arch/s390/kernel/module.c --- linux-2.6.39/arch/s390/kernel/module.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/s390/kernel/module.c 2011-05-19 13:45:27.000000000 +0200 @@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* 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 @@ apply_rela(Elf_Rela *rela, Elf_Addr base 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 @@ apply_rela(Elf_Rela *rela, Elf_Addr base 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 @@ apply_rela(Elf_Rela *rela, Elf_Addr base 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 @@ apply_rela(Elf_Rela *rela, Elf_Addr base 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 @@ apply_rela(Elf_Rela *rela, Elf_Addr base 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 @@ apply_rela(Elf_Rela *rela, Elf_Addr base 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/s390/kernel/process.c linux-2.6.39-pax/arch/s390/kernel/process.c --- linux-2.6.39/arch/s390/kernel/process.c 2011-03-15 19:33:03.000000000 +0100 +++ linux-2.6.39-pax/arch/s390/kernel/process.c 2011-05-19 13:45:27.000000000 +0200 @@ -334,39 +334,3 @@ unsigned long get_wchan(struct task_stru } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/s390/kernel/setup.c linux-2.6.39-pax/arch/s390/kernel/setup.c --- linux-2.6.39/arch/s390/kernel/setup.c 2011-05-19 10:21:10.000000000 +0200 +++ linux-2.6.39-pax/arch/s390/kernel/setup.c 2011-05-19 13:45:27.000000000 +0200 @@ -271,7 +271,7 @@ static int __init early_parse_mem(char * } 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, @@ -300,17 +300,6 @@ static int set_amode_and_uaccess(unsigne } } -/* - * 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) @@ -327,20 +316,6 @@ static int __init early_parse_user_mode( } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/s390/mm/maccess.c linux-2.6.39-pax/arch/s390/mm/maccess.c --- linux-2.6.39/arch/s390/mm/maccess.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/s390/mm/maccess.c 2011-05-19 14:23:28.000000000 +0200 @@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/s390/mm/mmap.c linux-2.6.39-pax/arch/s390/mm/mmap.c --- linux-2.6.39/arch/s390/mm/mmap.c 2011-03-15 19:33:03.000000000 +0100 +++ linux-2.6.39-pax/arch/s390/mm/mmap.c 2011-05-19 13:45:27.000000000 +0200 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str */ 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 @@ void arch_pick_mmap_layout(struct mm_str */ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/score/include/asm/system.h linux-2.6.39-pax/arch/score/include/asm/system.h --- linux-2.6.39/arch/score/include/asm/system.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/score/include/asm/system.h 2011-05-19 13:45:27.000000000 +0200 @@ -17,7 +17,7 @@ do { \ #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/score/kernel/process.c linux-2.6.39-pax/arch/score/kernel/process.c --- linux-2.6.39/arch/score/kernel/process.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/score/kernel/process.c 2011-05-19 13:45:27.000000000 +0200 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru return task_pt_regs(task)->cp0_epc; } - -unsigned long arch_align_stack(unsigned long sp) -{ - return sp; -} diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sh/drivers/pci/ops-dreamcast.c linux-2.6.39-pax/arch/sh/drivers/pci/ops-dreamcast.c --- linux-2.6.39/arch/sh/drivers/pci/ops-dreamcast.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sh/drivers/pci/ops-dreamcast.c 2011-05-19 14:23:28.000000000 +0200 @@ -76,7 +76,7 @@ static int gapspci_write(struct pci_bus return PCIBIOS_SUCCESSFUL; } -struct pci_ops gapspci_pci_ops = { +const struct pci_ops gapspci_pci_ops = { .read = gapspci_read, .write = gapspci_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sh/drivers/pci/ops-sh4.c linux-2.6.39-pax/arch/sh/drivers/pci/ops-sh4.c --- linux-2.6.39/arch/sh/drivers/pci/ops-sh4.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sh/drivers/pci/ops-sh4.c 2011-05-19 14:23:28.000000000 +0200 @@ -96,7 +96,7 @@ static int sh4_pci_write(struct pci_bus return PCIBIOS_SUCCESSFUL; } -struct pci_ops sh4_pci_ops = { +const struct pci_ops sh4_pci_ops = { .read = sh4_pci_read, .write = sh4_pci_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sh/drivers/pci/ops-sh5.c linux-2.6.39-pax/arch/sh/drivers/pci/ops-sh5.c --- linux-2.6.39/arch/sh/drivers/pci/ops-sh5.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sh/drivers/pci/ops-sh5.c 2011-05-19 14:23:28.000000000 +0200 @@ -62,7 +62,7 @@ static int sh5pci_write(struct pci_bus * return PCIBIOS_SUCCESSFUL; } -struct pci_ops sh5_pci_ops = { +const struct pci_ops sh5_pci_ops = { .read = sh5pci_read, .write = sh5pci_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sh/drivers/pci/ops-sh7786.c linux-2.6.39-pax/arch/sh/drivers/pci/ops-sh7786.c --- linux-2.6.39/arch/sh/drivers/pci/ops-sh7786.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sh/drivers/pci/ops-sh7786.c 2011-05-19 14:23:28.000000000 +0200 @@ -165,7 +165,7 @@ out: return ret; } -struct pci_ops sh7786_pci_ops = { +const struct pci_ops sh7786_pci_ops = { .read = sh7786_pcie_read, .write = sh7786_pcie_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sh/drivers/pci/pci-sh4.h linux-2.6.39-pax/arch/sh/drivers/pci/pci-sh4.h --- linux-2.6.39/arch/sh/drivers/pci/pci-sh4.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sh/drivers/pci/pci-sh4.h 2011-05-19 14:23:28.000000000 +0200 @@ -161,7 +161,7 @@ #define SH4_PCIPDR 0x220 /* Port IO Data Register */ /* arch/sh/kernel/drivers/pci/ops-sh4.c */ -extern struct pci_ops sh4_pci_ops; +extern const struct pci_ops sh4_pci_ops; int pci_fixup_pcic(struct pci_channel *chan); struct sh4_pci_address_space { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sh/drivers/pci/pci-sh5.h linux-2.6.39-pax/arch/sh/drivers/pci/pci-sh5.h --- linux-2.6.39/arch/sh/drivers/pci/pci-sh5.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sh/drivers/pci/pci-sh5.h 2011-05-19 14:23:28.000000000 +0200 @@ -105,6 +105,6 @@ extern unsigned long pcicr_virt; #define PCISH5_MEM_SIZCONV(x) (((x / 0x40000) - 1) << 18) #define PCISH5_IO_SIZCONV(x) (((x / 0x40000) - 1) << 18) -extern struct pci_ops sh5_pci_ops; +extern const struct pci_ops sh5_pci_ops; #endif /* __PCI_SH5_H */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sh/drivers/pci/pcie-sh7786.c linux-2.6.39-pax/arch/sh/drivers/pci/pcie-sh7786.c --- linux-2.6.39/arch/sh/drivers/pci/pcie-sh7786.c 2011-05-19 10:21:11.000000000 +0200 +++ linux-2.6.39-pax/arch/sh/drivers/pci/pcie-sh7786.c 2011-05-19 14:23:28.000000000 +0200 @@ -109,7 +109,7 @@ static struct resource sh7786_pci2_resou }, }; -extern struct pci_ops sh7786_pci_ops; +extern const struct pci_ops sh7786_pci_ops; #define DEFINE_CONTROLLER(start, idx) \ { \ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sh/include/asm/dma-mapping.h linux-2.6.39-pax/arch/sh/include/asm/dma-mapping.h --- linux-2.6.39/arch/sh/include/asm/dma-mapping.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sh/include/asm/dma-mapping.h 2011-05-19 14:23:28.000000000 +0200 @@ -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 struct dma_map_ops *get_dm 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_supported(struct d 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 @@ void dma_cache_sync(struct device *dev, 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 int dma_mapping_error(stru 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_alloc_coherent(s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sh/kernel/dma-nommu.c linux-2.6.39-pax/arch/sh/kernel/dma-nommu.c --- linux-2.6.39/arch/sh/kernel/dma-nommu.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sh/kernel/dma-nommu.c 2011-05-19 14:23:28.000000000 +0200 @@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device } #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sh/kernel/kgdb.c linux-2.6.39-pax/arch/sh/kernel/kgdb.c --- linux-2.6.39/arch/sh/kernel/kgdb.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sh/kernel/kgdb.c 2011-05-19 14:23:28.000000000 +0200 @@ -319,7 +319,7 @@ void kgdb_arch_exit(void) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sh/mm/consistent.c linux-2.6.39-pax/arch/sh/mm/consistent.c --- linux-2.6.39/arch/sh/mm/consistent.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sh/mm/consistent.c 2011-05-19 14:23:28.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sh/mm/mmap.c linux-2.6.39-pax/arch/sh/mm/mmap.c --- linux-2.6.39/arch/sh/mm/mmap.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sh/mm/mmap.c 2011-05-19 13:45:27.000000000 +0200 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str 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 @@ 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: */ @@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct fi 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 @@ arch_get_unmapped_area_topdown(struct fi /* 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 @@ arch_get_unmapped_area_topdown(struct fi 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 @@ arch_get_unmapped_area_topdown(struct fi 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/include/asm/atomic_64.h linux-2.6.39-pax/arch/sparc/include/asm/atomic_64.h --- linux-2.6.39/arch/sparc/include/asm/atomic_64.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/include/asm/atomic_64.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ extern long atomic64_sub_ret(long, atomi #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) /* @@ -50,6 +84,7 @@ extern long atomic64_sub_ret(long, atomi * other cases. */ #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0) +#define atomic_inc_and_test_unchecked(v) (atomic_inc_return_unchecked(v) == 0) #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0) #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0) @@ -59,30 +94,59 @@ extern long atomic64_sub_ret(long, atomi #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) #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n))) +#define atomic_cmpxchg_unchecked(v, o, n) (cmpxchg(&((v)->counter), (o), (n))) #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) +#define atomic_xchg_unchecked(v, new) (xchg(&((v)->counter), new)) 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 +157,28 @@ static inline int atomic_add_unless(atom 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/include/asm/cache.h linux-2.6.39-pax/arch/sparc/include/asm/cache.h --- linux-2.6.39/arch/sparc/include/asm/cache.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/include/asm/cache.h 2011-05-19 13:45:27.000000000 +0200 @@ -10,7 +10,7 @@ #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long) #define L1_CACHE_SHIFT 5 -#define L1_CACHE_BYTES 32 +#define L1_CACHE_BYTES 32U #ifdef CONFIG_SPARC32 #define SMP_CACHE_BYTES_SHIFT 5 diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/include/asm/dma-mapping.h linux-2.6.39-pax/arch/sparc/include/asm/dma-mapping.h --- linux-2.6.39/arch/sparc/include/asm/dma-mapping.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/include/asm/dma-mapping.h 2011-05-19 14:23:28.000000000 +0200 @@ -12,10 +12,10 @@ extern int dma_supported(struct device * #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 struct dma_map_ops *get_dm 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_alloc_coherent(s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/include/asm/elf_32.h linux-2.6.39-pax/arch/sparc/include/asm/elf_32.h --- linux-2.6.39/arch/sparc/include/asm/elf_32.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/include/asm/elf_32.h 2011-05-19 13:45:27.000000000 +0200 @@ -114,6 +114,13 @@ typedef struct { #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/include/asm/elf_64.h linux-2.6.39-pax/arch/sparc/include/asm/elf_64.h --- linux-2.6.39/arch/sparc/include/asm/elf_64.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/include/asm/elf_64.h 2011-05-19 13:45:27.000000000 +0200 @@ -162,6 +162,12 @@ typedef struct { #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/include/asm/pgtable_32.h linux-2.6.39-pax/arch/sparc/include/asm/pgtable_32.h --- linux-2.6.39/arch/sparc/include/asm/pgtable_32.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/include/asm/pgtable_32.h 2011-05-19 13:45:27.000000000 +0200 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) 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 @@ extern pgprot_t PAGE_SHARED; #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.39-pax/arch/sparc/include/asm/pgtsrmmu.h --- linux-2.6.39/arch/sparc/include/asm/pgtsrmmu.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/include/asm/pgtsrmmu.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/include/asm/spinlock_64.h linux-2.6.39-pax/arch/sparc/include/asm/spinlock_64.h --- linux-2.6.39/arch/sparc/include/asm/spinlock_64.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/include/asm/spinlock_64.h 2011-05-19 13:45:27.000000000 +0200 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags( /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */ -static void inline arch_read_lock(arch_rwlock_t *lock) +static inline void arch_read_lock(arch_rwlock_t *lock) { unsigned long tmp1, tmp2; __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,10 +117,10 @@ static void inline arch_read_lock(arch_r " .previous" : "=&r" (tmp1), "=&r" (tmp2) : "r" (lock) - : "memory"); + : "memory", "cc"); } -static int inline arch_read_trylock(arch_rwlock_t *lock) +static inline int arch_read_trylock(arch_rwlock_t *lock) { int tmp1, tmp2; @@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch "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" @@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch return tmp1; } -static void inline arch_read_unlock(arch_rwlock_t *lock) +static inline void arch_read_unlock(arch_rwlock_t *lock) { unsigned long tmp1, tmp2; __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" @@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch : "memory"); } -static void inline arch_write_lock(arch_rwlock_t *lock) +static inline void arch_write_lock(arch_rwlock_t *lock) { unsigned long mask, tmp1, tmp2; @@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_ : "memory"); } -static void inline arch_write_unlock(arch_rwlock_t *lock) +static inline void arch_write_unlock(arch_rwlock_t *lock) { __asm__ __volatile__( " stw %%g0, [%0]" @@ -186,7 +201,7 @@ static void inline arch_write_unlock(arc : "memory"); } -static int inline arch_write_trylock(arch_rwlock_t *lock) +static inline int arch_write_trylock(arch_rwlock_t *lock) { unsigned long mask, tmp1, tmp2, result; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/include/asm/uaccess.h linux-2.6.39-pax/arch/sparc/include/asm/uaccess.h --- linux-2.6.39/arch/sparc/include/asm/uaccess.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/include/asm/uaccess.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/include/asm/uaccess_32.h linux-2.6.39-pax/arch/sparc/include/asm/uaccess_32.h --- linux-2.6.39/arch/sparc/include/asm/uaccess_32.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/include/asm/uaccess_32.h 2011-05-19 13:45:27.000000000 +0200 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/include/asm/uaccess_64.h linux-2.6.39-pax/arch/sparc/include/asm/uaccess_64.h --- linux-2.6.39/arch/sparc/include/asm/uaccess_64.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/include/asm/uaccess_64.h 2011-05-19 13:45:27.000000000 +0200 @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -213,8 +214,15 @@ extern unsigned long copy_from_user_fixu 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 @@ extern unsigned long copy_to_user_fixup( 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/kernel/Makefile linux-2.6.39-pax/arch/sparc/kernel/Makefile --- linux-2.6.39/arch/sparc/kernel/Makefile 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/sparc/kernel/Makefile 2011-05-19 13:45:27.000000000 +0200 @@ -3,7 +3,7 @@ # asflags-y := -ansi -ccflags-y := -Werror +#ccflags-y := -Werror extra-y := head_$(BITS).o extra-y += init_task.o diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/kernel/iommu.c linux-2.6.39-pax/arch/sparc/kernel/iommu.c --- linux-2.6.39/arch/sparc/kernel/iommu.c 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/sparc/kernel/iommu.c 2011-05-19 14:23:28.000000000 +0200 @@ -824,7 +824,7 @@ static void dma_4u_sync_sg_for_cpu(struc 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 @@ static struct dma_map_ops sun4u_dma_ops .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/kernel/ioport.c linux-2.6.39-pax/arch/sparc/kernel/ioport.c --- linux-2.6.39/arch/sparc/kernel/ioport.c 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/sparc/kernel/ioport.c 2011-05-19 14:23:28.000000000 +0200 @@ -402,7 +402,7 @@ static void sbus_sync_sg_for_device(stru 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, @@ -653,7 +653,7 @@ static void pci32_sync_sg_for_device(str } } -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/kernel/kgdb_32.c linux-2.6.39-pax/arch/sparc/kernel/kgdb_32.c --- linux-2.6.39/arch/sparc/kernel/kgdb_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/kernel/kgdb_32.c 2011-05-19 14:23:28.000000000 +0200 @@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *re 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/kernel/kgdb_64.c linux-2.6.39-pax/arch/sparc/kernel/kgdb_64.c --- linux-2.6.39/arch/sparc/kernel/kgdb_64.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/kernel/kgdb_64.c 2011-05-19 14:23:28.000000000 +0200 @@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *re 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/kernel/pci_common.c linux-2.6.39-pax/arch/sparc/kernel/pci_common.c --- linux-2.6.39/arch/sparc/kernel/pci_common.c 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/sparc/kernel/pci_common.c 2011-05-19 14:23:28.000000000 +0200 @@ -249,7 +249,7 @@ static int sun4u_write_pci_cfg(struct pc return PCIBIOS_SUCCESSFUL; } -struct pci_ops sun4u_pci_ops = { +const struct pci_ops sun4u_pci_ops = { .read = sun4u_read_pci_cfg, .write = sun4u_write_pci_cfg, }; @@ -310,7 +310,7 @@ static int sun4v_write_pci_cfg(struct pc return PCIBIOS_SUCCESSFUL; } -struct pci_ops sun4v_pci_ops = { +const struct pci_ops sun4v_pci_ops = { .read = sun4v_read_pci_cfg, .write = sun4v_write_pci_cfg, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/kernel/pci_impl.h linux-2.6.39-pax/arch/sparc/kernel/pci_impl.h --- linux-2.6.39/arch/sparc/kernel/pci_impl.h 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/sparc/kernel/pci_impl.h 2011-05-19 14:23:28.000000000 +0200 @@ -175,8 +175,8 @@ extern void pci_config_write8(u8 *addr, extern void pci_config_write16(u16 *addr, u16 val); extern void pci_config_write32(u32 *addr, u32 val); -extern struct pci_ops sun4u_pci_ops; -extern struct pci_ops sun4v_pci_ops; +extern const struct pci_ops sun4u_pci_ops; +extern const struct pci_ops sun4v_pci_ops; extern volatile int pci_poke_in_progress; extern volatile int pci_poke_cpu; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/kernel/pci_sun4v.c linux-2.6.39-pax/arch/sparc/kernel/pci_sun4v.c --- linux-2.6.39/arch/sparc/kernel/pci_sun4v.c 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/sparc/kernel/pci_sun4v.c 2011-05-19 14:23:28.000000000 +0200 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/kernel/pcic.c linux-2.6.39-pax/arch/sparc/kernel/pcic.c --- linux-2.6.39/arch/sparc/kernel/pcic.c 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/sparc/kernel/pcic.c 2011-05-19 14:23:28.000000000 +0200 @@ -268,7 +268,7 @@ static int pcic_write_config(struct pci_ return -EINVAL; } -static struct pci_ops pcic_ops = { +static const struct pci_ops pcic_ops = { .read = pcic_read_config, .write = pcic_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/kernel/sys_sparc_32.c linux-2.6.39-pax/arch/sparc/kernel/sys_sparc_32.c --- linux-2.6.39/arch/sparc/kernel/sys_sparc_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/kernel/sys_sparc_32.c 2011-05-19 13:45:27.000000000 +0200 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str 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 @@ unsigned long arch_get_unmapped_area(str } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/kernel/sys_sparc_64.c linux-2.6.39-pax/arch/sparc/kernel/sys_sparc_64.c --- linux-2.6.39/arch/sparc/kernel/sys_sparc_64.c 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/sparc/kernel/sys_sparc_64.c 2011-05-19 13:45:27.000000000 +0200 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str /* 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 @@ unsigned long arch_get_unmapped_area(str 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 @@ unsigned long arch_get_unmapped_area(str 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 @@ full_search: 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 @@ arch_get_unmapped_area_topdown(struct fi /* 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 @@ arch_get_unmapped_area_topdown(struct fi 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 @@ arch_get_unmapped_area_topdown(struct fi /* 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 @@ arch_get_unmapped_area_topdown(struct fi 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 @@ arch_get_unmapped_area_topdown(struct fi 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: /* @@ -390,6 +390,12 @@ void arch_pick_mmap_layout(struct mm_str 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 { @@ -402,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_str 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/kernel/traps_64.c linux-2.6.39-pax/arch/sparc/kernel/traps_64.c --- linux-2.6.39/arch/sparc/kernel/traps_64.c 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/sparc/kernel/traps_64.c 2011-05-19 13:45:27.000000000 +0200 @@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long 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(struct pt_regs *regs, long 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); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/lib/Makefile linux-2.6.39-pax/arch/sparc/lib/Makefile --- linux-2.6.39/arch/sparc/lib/Makefile 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/lib/Makefile 2011-05-19 13:45:27.000000000 +0200 @@ -2,7 +2,7 @@ # asflags-y := -ansi -DST_DIV0=0x02 -ccflags-y := -Werror +#ccflags-y := -Werror lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o lib-$(CONFIG_SPARC32) += memcpy.o memset.o diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/lib/atomic_64.S linux-2.6.39-pax/arch/sparc/lib/atomic_64.S --- linux-2.6.39/arch/sparc/lib/atomic_64.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/lib/atomic_64.S 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ atomic_add: /* %o0 = increment, %o1 = at 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 @@ atomic_sub: /* %o0 = decrement, %o1 = at 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 @@ atomic_add_ret: /* %o0 = increment, %o1 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 @@ atomic_sub_ret: /* %o0 = decrement, %o1 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 @@ atomic64_add: /* %o0 = increment, %o1 = 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 @@ atomic64_sub: /* %o0 = decrement, %o1 = 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 @@ atomic64_add_ret: /* %o0 = increment, %o 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/lib/ksyms.c linux-2.6.39-pax/arch/sparc/lib/ksyms.c --- linux-2.6.39/arch/sparc/lib/ksyms.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/lib/ksyms.c 2011-05-19 13:45:27.000000000 +0200 @@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write); /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/mm/Makefile linux-2.6.39-pax/arch/sparc/mm/Makefile --- linux-2.6.39/arch/sparc/mm/Makefile 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/mm/Makefile 2011-05-19 13:45:27.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/mm/fault_32.c linux-2.6.39-pax/arch/sparc/mm/fault_32.c --- linux-2.6.39/arch/sparc/mm/fault_32.c 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/sparc/mm/fault_32.c 2011-05-19 13:45:27.000000000 +0200 @@ -22,6 +22,9 @@ #include #include #include +#include +#include +#include #include #include @@ -209,6 +212,268 @@ static unsigned long compute_si_addr(str 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 @@ good_area: 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/mm/fault_64.c linux-2.6.39-pax/arch/sparc/mm/fault_64.c --- linux-2.6.39/arch/sparc/mm/fault_64.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/mm/fault_64.c 2011-05-19 13:45:27.000000000 +0200 @@ -21,6 +21,9 @@ #include #include #include +#include +#include +#include #include #include @@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32b 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 @@ asmlinkage void __kprobes do_sparc64_fau 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/mm/hugetlbpage.c linux-2.6.39-pax/arch/sparc/mm/hugetlbpage.c --- linux-2.6.39/arch/sparc/mm/hugetlbpage.c 2011-03-15 19:33:06.000000000 +0100 +++ linux-2.6.39-pax/arch/sparc/mm/hugetlbpage.c 2011-05-19 13:45:27.000000000 +0200 @@ -68,7 +68,7 @@ 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: */ @@ -107,7 +107,7 @@ hugetlb_get_unmapped_area_topdown(struct /* 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 @@ hugetlb_get_unmapped_area_topdown(struct 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 @@ hugetlb_get_unmapped_area_topdown(struct 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 @@ hugetlb_get_unmapped_area(struct file *f 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/mm/init_32.c linux-2.6.39-pax/arch/sparc/mm/init_32.c --- linux-2.6.39/arch/sparc/mm/init_32.c 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/sparc/mm/init_32.c 2011-05-19 13:45:27.000000000 +0200 @@ -318,6 +318,9 @@ extern void device_scan(void); 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 @@ void __init paging_init(void) /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/sparc/mm/srmmu.c linux-2.6.39-pax/arch/sparc/mm/srmmu.c --- linux-2.6.39/arch/sparc/mm/srmmu.c 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/sparc/mm/srmmu.c 2011-05-19 13:45:27.000000000 +0200 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/tile/kernel/pci.c linux-2.6.39-pax/arch/tile/kernel/pci.c --- linux-2.6.39/arch/tile/kernel/pci.c 2011-05-19 10:21:13.000000000 +0200 +++ linux-2.6.39-pax/arch/tile/kernel/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -60,7 +60,7 @@ int __write_once tile_plx_gen1; static struct pci_controller controllers[TILE_NUM_PCIE]; static int num_controllers; -static struct pci_ops tile_cfg_ops; +static const struct pci_ops tile_cfg_ops; /* @@ -564,7 +564,7 @@ static int __devinit tile_cfg_write(stru } -static struct pci_ops tile_cfg_ops = { +static const struct pci_ops tile_cfg_ops = { .read = tile_cfg_read, .write = tile_cfg_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/um/include/asm/kmap_types.h linux-2.6.39-pax/arch/um/include/asm/kmap_types.h --- linux-2.6.39/arch/um/include/asm/kmap_types.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/um/include/asm/kmap_types.h 2011-05-19 13:45:27.000000000 +0200 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, KM_SOFTIRQ1, + KM_CLEARPAGE, KM_TYPE_NR }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/um/include/asm/page.h linux-2.6.39-pax/arch/um/include/asm/page.h --- linux-2.6.39/arch/um/include/asm/page.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/um/include/asm/page.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/um/kernel/process.c linux-2.6.39-pax/arch/um/kernel/process.c --- linux-2.6.39/arch/um/kernel/process.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/um/kernel/process.c 2011-05-19 13:45:27.000000000 +0200 @@ -404,22 +404,6 @@ int singlestepping(void * t) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/um/sys-i386/syscalls.c linux-2.6.39-pax/arch/um/sys-i386/syscalls.c --- linux-2.6.39/arch/um/sys-i386/syscalls.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/um/sys-i386/syscalls.c 2011-05-19 13:45:27.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/unicore32/kernel/pci.c linux-2.6.39-pax/arch/unicore32/kernel/pci.c --- linux-2.6.39/arch/unicore32/kernel/pci.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/unicore32/kernel/pci.c 2011-05-19 14:23:28.000000000 +0200 @@ -66,7 +66,7 @@ puv3_write_config(struct pci_bus *bus, u return PCIBIOS_SUCCESSFUL; } -struct pci_ops pci_puv3_ops = { +const struct pci_ops pci_puv3_ops = { .read = puv3_read_config, .write = puv3_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/Kconfig linux-2.6.39-pax/arch/x86/Kconfig --- linux-2.6.39/arch/x86/Kconfig 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/Kconfig 2011-05-19 13:45:27.000000000 +0200 @@ -224,7 +224,7 @@ config X86_HT 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 @@ -1113,7 +1113,7 @@ config PAGE_OFFSET 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 @@ -1487,6 +1487,7 @@ config SECCOMP 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 @@ -1544,6 +1545,7 @@ config KEXEC_JUMP 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. @@ -1607,6 +1609,7 @@ config X86_NEED_RELOCS 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 @@ -1638,7 +1641,7 @@ config HOTPLUG_CPU 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 ---help--- diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/Kconfig.cpu linux-2.6.39-pax/arch/x86/Kconfig.cpu --- linux-2.6.39/arch/x86/Kconfig.cpu 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/Kconfig.cpu 2011-05-19 13:45:27.000000000 +0200 @@ -334,7 +334,7 @@ config X86_PPRO_FENCE 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 @@ -358,7 +358,7 @@ config X86_POPAD_OK 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 @@ -404,7 +404,7 @@ config X86_CMPXCHG64 # 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/Kconfig.debug linux-2.6.39-pax/arch/x86/Kconfig.debug --- linux-2.6.39/arch/x86/Kconfig.debug 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/Kconfig.debug 2011-05-19 13:45:27.000000000 +0200 @@ -101,7 +101,7 @@ config X86_PTDUMP 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_RODATA_TEST 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/Makefile linux-2.6.39-pax/arch/x86/Makefile --- linux-2.6.39/arch/x86/Makefile 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/Makefile 2011-05-19 13:45:27.000000000 +0200 @@ -195,3 +195,12 @@ define archhelp 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/boot/bitops.h linux-2.6.39-pax/arch/x86/boot/bitops.h --- linux-2.6.39/arch/x86/boot/bitops.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/boot/bitops.h 2011-05-19 13:45:27.000000000 +0200 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int 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 int variable_test_bit(int 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/boot/boot.h linux-2.6.39-pax/arch/x86/boot/boot.h --- linux-2.6.39/arch/x86/boot/boot.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/boot/boot.h 2011-05-19 13:45:27.000000000 +0200 @@ -85,7 +85,7 @@ static inline void io_delay(void) 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 void wrgs32(u32 v, addr_t 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/boot/compressed/head_32.S linux-2.6.39-pax/arch/x86/boot/compressed/head_32.S --- linux-2.6.39/arch/x86/boot/compressed/head_32.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/boot/compressed/head_32.S 2011-05-19 13:45:27.000000000 +0200 @@ -76,7 +76,7 @@ ENTRY(startup_32) 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 @@ relocated: * 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 @@ relocated: 1: subl $4, %edi movl (%edi), %ecx - testl %ecx, %ecx - jz 2f + jecxz 2f addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/boot/compressed/head_64.S linux-2.6.39-pax/arch/x86/boot/compressed/head_64.S --- linux-2.6.39/arch/x86/boot/compressed/head_64.S 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/boot/compressed/head_64.S 2011-05-19 13:45:27.000000000 +0200 @@ -91,7 +91,7 @@ ENTRY(startup_32) 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 @@ ENTRY(startup_64) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/boot/compressed/misc.c linux-2.6.39-pax/arch/x86/boot/compressed/misc.c --- linux-2.6.39/arch/x86/boot/compressed/misc.c 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/boot/compressed/misc.c 2011-05-19 13:45:27.000000000 +0200 @@ -310,7 +310,7 @@ static void parse_elf(void *output) 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 @@ asmlinkage void decompress_kernel(void * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/boot/compressed/relocs.c linux-2.6.39-pax/arch/x86/boot/compressed/relocs.c --- linux-2.6.39/arch/x86/boot/compressed/relocs.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/boot/compressed/relocs.c 2011-05-19 13:45:27.000000000 +0200 @@ -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_ehdr(FILE *fp) } } +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_shdrs(FILE *fp) 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_strtabs(FILE *fp) 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_symtabs(FILE *fp) 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 @@ static void read_relocs(FILE *fp) 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 read_relocs(FILE *fp) 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_symbols(void) 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 print_absolute_relocs(void) 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 @@ static void walk_relocs(void (*visit)(El !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 int cmp_relocs(const void *va, co 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 @@ int main(int argc, char **argv) fname, strerror(errno)); } read_ehdr(fp); + read_phdrs(fp); read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/boot/cpucheck.c linux-2.6.39-pax/arch/x86/boot/cpucheck.c --- linux-2.6.39/arch/x86/boot/cpucheck.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/boot/cpucheck.c 2011-05-19 13:45:27.000000000 +0200 @@ -74,7 +74,7 @@ static int has_fpu(void) 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 @@ static int has_eflag(u32 mask) { u32 f0, f1; - asm("pushfl ; " + asm volatile("pushfl ; " "pushfl ; " "popl %0 ; " "movl %0,%1 ; " @@ -115,7 +115,7 @@ static void get_flags(void) 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 @@ static void get_flags(void) 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 @@ static void get_flags(void) cpu.model += ((tfms >> 16) & 0xf) << 4; } - asm("cpuid" + asm volatile("cpuid" : "=a" (max_amd_level) : "a" (0x80000000) : "ebx", "ecx", "edx"); @@ -144,7 +144,7 @@ static void get_flags(void) 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 @@ int check_cpu(int *cpu_level_ptr, int *r 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 @@ int check_cpu(int *cpu_level_ptr, int *r 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 @@ int check_cpu(int *cpu_level_ptr, int *r 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/boot/header.S linux-2.6.39-pax/arch/x86/boot/header.S --- linux-2.6.39/arch/x86/boot/header.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/boot/header.S 2011-05-19 13:45:27.000000000 +0200 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/boot/memory.c linux-2.6.39-pax/arch/x86/boot/memory.c --- linux-2.6.39/arch/x86/boot/memory.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/boot/memory.c 2011-05-19 13:45:27.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/boot/video-vesa.c linux-2.6.39-pax/arch/x86/boot/video-vesa.c --- linux-2.6.39/arch/x86/boot/video-vesa.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/boot/video-vesa.c 2011-05-19 13:45:27.000000000 +0200 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/boot/video.c linux-2.6.39-pax/arch/x86/boot/video.c --- linux-2.6.39/arch/x86/boot/video.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/boot/video.c 2011-05-19 13:45:27.000000000 +0200 @@ -96,7 +96,7 @@ static void store_mode_params(void) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/ia32/ia32_signal.c linux-2.6.39-pax/arch/x86/ia32/ia32_signal.c --- linux-2.6.39/arch/x86/ia32/ia32_signal.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/ia32/ia32_signal.c 2011-05-19 13:45:27.000000000 +0200 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 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 @@ int ia32_setup_frame(int sig, struct k_s * 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 @@ int ia32_setup_rt_frame(int sig, struct 0xb8, __NR_ia32_rt_sigreturn, 0x80cd, - 0, + 0 }; frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); @@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/ia32/ia32entry.S linux-2.6.39-pax/arch/x86/ia32/ia32entry.S --- linux-2.6.39/arch/x86/ia32/ia32entry.S 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/ia32/ia32entry.S 2011-05-24 02:01:26.000000000 +0200 @@ -13,6 +13,7 @@ #include #include #include +#include #include /* Avoid __ASSEMBLER__'ifying just for this. */ @@ -95,6 +96,30 @@ ENTRY(native_irq_enable_sysexit) 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 + pushq %rax + call pax_randomize_kstack + popq %rax +#endif + pax_erase_kstack + .endm + +.macro pax_erase_kstack +#ifdef CONFIG_PAX_MEMORY_STACKLEAK + call pax_erase_kstack +#endif +.endm + /* * 32bit SYSENTER instruction entry. * @@ -121,7 +146,7 @@ ENTRY(ia32_sysenter_target) 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: @@ -134,7 +159,8 @@ ENTRY(ia32_sysenter_target) CFI_REL_OFFSET rsp,0 pushfq_cfi /*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_cfi $__USER32_CS /*CFI_REL_OFFSET cs,0*/ @@ -146,6 +172,12 @@ ENTRY(ia32_sysenter_target) 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 @@ -168,6 +200,7 @@ sysenter_dispatch: 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) @@ -194,6 +227,9 @@ sysexit_from_sys_call: movl %eax,%esi /* 2nd arg: syscall number */ movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */ call audit_syscall_entry + + pax_erase_kstack + movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */ cmpq $(IA32_NR_syscalls-1),%rax ja ia32_badsys @@ -246,6 +282,9 @@ sysenter_tracesys: movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */ movq %rsp,%rdi /* &pt_regs -> arg1 */ call syscall_trace_enter + + pax_erase_kstack + LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ RESTORE_REST cmpq $(IA32_NR_syscalls-1),%rax @@ -277,19 +316,24 @@ ENDPROC(ia32_sysenter_target) 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) @@ -305,6 +349,12 @@ ENTRY(ia32_cstar_target) /* 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 @@ -327,6 +377,7 @@ cstar_dispatch: 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 @@ -364,6 +415,9 @@ cstar_tracesys: movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */ movq %rsp,%rdi /* &pt_regs -> arg1 */ call syscall_trace_enter + + pax_erase_kstack + LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */ RESTORE_REST xchgl %ebp,%r9d @@ -409,6 +463,7 @@ ENTRY(ia32_syscall) 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: @@ -441,6 +496,9 @@ ia32_tracesys: movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */ movq %rsp,%rdi /* &pt_regs -> arg1 */ call syscall_trace_enter + + pax_erase_kstack + LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ RESTORE_REST cmpq $(IA32_NR_syscalls-1),%rax diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/alternative.h linux-2.6.39-pax/arch/x86/include/asm/alternative.h --- linux-2.6.39/arch/x86/include/asm/alternative.h 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/alternative.h 2011-05-19 13:45:27.000000000 +0200 @@ -94,7 +94,7 @@ static inline int alternatives_text_rese ".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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/apm.h linux-2.6.39-pax/arch/x86/include/asm/apm.h --- linux-2.6.39/arch/x86/include/asm/apm.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/apm.h 2011-05-19 13:45:27.000000000 +0200 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __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 @@ static inline u8 apm_bios_call_simple_as __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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/atomic.h linux-2.6.39-pax/arch/x86/include/asm/atomic.h --- linux-2.6.39/arch/x86/include/asm/atomic.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/atomic.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ static inline void atomic_set(atomic_t * } /** + * 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_set(atomic_t * */ 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_add(int i, ato */ 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_unchecked_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 @@ static inline int atomic_sub_and_test(in { 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 int atomic_sub_and_test(in */ 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_inc(atomic_t * */ 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_unchecked_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 @@ static inline int atomic_dec_and_test(at { 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,35 @@ static inline int atomic_inc_and_test(at { 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; +} + +/** + * atomic_inc_and_test_unchecked - increment and test + * @v: pointer of type atomic_unchecked_t + * + * Atomically increments @v by 1 + * and returns true if the result is zero, or false for all + * other cases. + */ +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v) +{ + unsigned char c; + + asm volatile(LOCK_PREFIX "incl %0\n" + "sete %1\n" : "+m" (v->counter), "=qm" (c) : : "memory"); return c != 0; @@ -157,7 +310,16 @@ static inline int atomic_add_negative(in { 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 +342,46 @@ static inline int atomic_add_return(int #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 +410,10 @@ static inline int atomic_sub_return(int } #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) @@ -215,11 +421,21 @@ static inline int atomic_cmpxchg(atomic_ return cmpxchg(&v->counter, old, new); } +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new) +{ + return cmpxchg(&v->counter, old, new); +} + static inline int atomic_xchg(atomic_t *v, int new) { return xchg(&v->counter, new); } +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new) +{ + return xchg(&v->counter, new); +} + /** * atomic_add_unless - add unless the number is already a given value * @v: pointer of type atomic_t @@ -231,21 +447,77 @@ static inline int atomic_xchg(atomic_t * */ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/atomic64_32.h linux-2.6.39-pax/arch/x86/include/asm/atomic64_32.h --- linux-2.6.39/arch/x86/include/asm/atomic64_32.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/atomic64_32.h 2011-05-19 13:45:27.000000000 +0200 @@ -12,6 +12,14 @@ typedef struct { 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 @@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg } /** + * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable + * @p: pointer to type atomic64_unchecked_t + * @o: expected value + * @n: new value + * + * Atomically sets @v to @n if it was equal to @o and returns + * the old value. + */ + +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n) +{ + return cmpxchg64(&v->counter, o, n); +} + +/** * atomic64_xchg - xchg atomic64 variable * @v: pointer to type atomic64_t * @n: value to assign @@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64 } /** + * atomic64_set_unchecked - set atomic64 variable + * @v: pointer to type atomic64_unchecked_t + * @n: value to assign + * + * Atomically sets the value of @v to @n. + */ +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i) +{ + unsigned high = (unsigned)(i >> 32); + unsigned low = (unsigned)i; + asm volatile(ATOMIC64_ALTERNATIVE(set) + : "+b" (low), "+c" (high) + : "S" (v) + : "eax", "edx", "memory" + ); +} + +/** * atomic64_read - read atomic64 variable * @v: pointer to type atomic64_t * @@ -93,6 +134,22 @@ static inline long long atomic64_read(at } /** + * atomic64_read_unchecked - read atomic64 variable + * @v: pointer to type atomic64_unchecked_t + * + * Atomically reads the value of @v and returns it. + */ +static inline long long atomic64_read_unchecked(atomic64_unchecked_t *v) +{ + long long r; + asm volatile(ATOMIC64_ALTERNATIVE(read_unchecked) + : "=A" (r), "+c" (v) + : : "memory" + ); + return r; + } + +/** * atomic64_add_return - add and return * @i: integer value to add * @v: pointer to type atomic64_t @@ -108,6 +165,22 @@ static inline long long atomic64_add_ret return 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 long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v) +{ + asm volatile(ATOMIC64_ALTERNATIVE(add_return_unchecked) + : "+A" (i), "+c" (v) + : : "memory" + ); + return i; +} + /* * Other variants with different arithmetic operators: */ @@ -131,6 +204,17 @@ static inline long long atomic64_inc_ret return a; } +static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v) +{ + long long a; + asm volatile(ATOMIC64_ALTERNATIVE(inc_return_unchecked) + : "=A" (a) + : "S" (v) + : "memory", "ecx" + ); + return a; +} + static inline long long atomic64_dec_return(atomic64_t *v) { long long a; @@ -155,6 +239,22 @@ static inline long long atomic64_add(lon : "+A" (i), "+c" (v) : : "memory" ); + return i; +} + +/** + * 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 long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v) +{ + asm volatile(ATOMIC64_ALTERNATIVE_(add_unchecked, add_return_unchecked) + : "+A" (i), "+c" (v) + : : "memory" + ); return i; } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/atomic64_64.h linux-2.6.39-pax/arch/x86/include/asm/atomic64_64.h --- linux-2.6.39/arch/x86/include/asm/atomic64_64.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/atomic64_64.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ static inline void atomic64_set(atomic64 } /** + * 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_set(atomic64 */ 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_add(long i, */ 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 @@ static inline int atomic64_sub_and_test( { 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 int atomic64_sub_and_test( */ 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_inc(atomic64 */ 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 @@ static inline int atomic64_dec_and_test( { 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 @@ static inline int atomic64_inc_and_test( { 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 @@ static inline int atomic64_add_negative( { 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 int atomic64_add_negative( 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 @@ static inline long atomic64_sub_return(l } #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) @@ -190,6 +364,11 @@ static inline long atomic64_cmpxchg(atom return cmpxchg(&v->counter, old, new); } +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new) +{ + return cmpxchg(&v->counter, old, new); +} + static inline long atomic64_xchg(atomic64_t *v, long new) { return xchg(&v->counter, new); @@ -206,17 +385,30 @@ static inline long atomic64_xchg(atomic6 */ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/bitops.h linux-2.6.39-pax/arch/x86/include/asm/bitops.h --- linux-2.6.39/arch/x86/include/asm/bitops.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/bitops.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/boot.h linux-2.6.39-pax/arch/x86/include/asm/boot.h --- linux-2.6.39/arch/x86/include/asm/boot.h 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/boot.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/cache.h linux-2.6.39-pax/arch/x86/include/asm/cache.h --- linux-2.6.39/arch/x86/include/asm/cache.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/cache.h 2011-05-19 13:45:27.000000000 +0200 @@ -5,12 +5,13 @@ /* L1 cache line size */ #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) +#define L1_CACHE_BYTES (_AC(1,U) << 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) +#define INTERNODE_CACHE_BYTES (_AC(1,U) << INTERNODE_CACHE_SHIFT) #ifdef CONFIG_X86_VSMP #ifdef CONFIG_SMP diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/cacheflush.h linux-2.6.39-pax/arch/x86/include/asm/cacheflush.h --- linux-2.6.39/arch/x86/include/asm/cacheflush.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/cacheflush.h 2011-05-19 13:45:27.000000000 +0200 @@ -26,7 +26,7 @@ static inline unsigned long get_page_mem 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/checksum_32.h linux-2.6.39-pax/arch/x86/include/asm/checksum_32.h --- linux-2.6.39/arch/x86/include/asm/checksum_32.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/checksum_32.h 2011-05-19 13:45:27.000000000 +0200 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene 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 @@ static inline __wsum csum_partial_copy_f 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 @@ static inline __wsum csum_and_copy_to_us { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/cpufeature.h linux-2.6.39-pax/arch/x86/include/asm/cpufeature.h --- linux-2.6.39/arch/x86/include/asm/cpufeature.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/cpufeature.h 2011-05-19 13:45:27.000000000 +0200 @@ -351,7 +351,7 @@ static __always_inline __pure bool __sta ".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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/desc.h linux-2.6.39-pax/arch/x86/include/asm/desc.h --- linux-2.6.39/arch/x86/include/asm/desc.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/desc.h 2011-05-19 13:45:27.000000000 +0200 @@ -4,6 +4,7 @@ #include #include #include +#include #include static inline void fill_ldt(struct desc_struct *desc, @@ -15,6 +16,7 @@ static inline void fill_ldt(struct desc_ 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 @@ static inline void fill_ldt(struct desc_ } 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 @@ static inline void pack_gate(gate_desc * 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 paravirt_free_ldt(str 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 @@ static inline void native_write_gdt_entr 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_set_ldt(const 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 @@ static inline void native_load_tls(struc 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 @@ static inline void set_desc_limit(struct 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 @@ static inline void _set_gate(int gate, u * 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 @@ static inline void alloc_intr_gate(unsig /* * 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_trap_gate(unsigne 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/desc_defs.h linux-2.6.39-pax/arch/x86/include/asm/desc_defs.h --- linux-2.6.39/arch/x86/include/asm/desc_defs.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/desc_defs.h 2011-05-19 13:45:27.000000000 +0200 @@ -31,6 +31,12 @@ struct desc_struct { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/device.h linux-2.6.39-pax/arch/x86/include/asm/device.h --- linux-2.6.39/arch/x86/include/asm/device.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/device.h 2011-05-19 14:23:28.000000000 +0200 @@ -6,7 +6,7 @@ struct dev_archdata { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/dma-mapping.h linux-2.6.39-pax/arch/x86/include/asm/dma-mapping.h --- linux-2.6.39/arch/x86/include/asm/dma-mapping.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/dma-mapping.h 2011-05-19 14:23:28.000000000 +0200 @@ -26,9 +26,9 @@ extern int iommu_merge; 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 @@ static inline struct dma_map_ops *get_dm /* 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 @@ 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; gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); @@ -142,7 +142,7 @@ dma_alloc_coherent(struct device *dev, s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/e820.h linux-2.6.39-pax/arch/x86/include/asm/e820.h --- linux-2.6.39/arch/x86/include/asm/e820.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/e820.h 2011-05-19 13:45:27.000000000 +0200 @@ -69,7 +69,7 @@ struct e820map { #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/elf.h linux-2.6.39-pax/arch/x86/include/asm/elf.h --- linux-2.6.39/arch/x86/include/asm/elf.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/elf.h 2011-05-19 13:45:27.000000000 +0200 @@ -237,7 +237,25 @@ extern int force_personality32; 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 @@ do { \ #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 @@ do { \ #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 arch_setup_additional_pages(s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/emergency-restart.h linux-2.6.39-pax/arch/x86/include/asm/emergency-restart.h --- linux-2.6.39/arch/x86/include/asm/emergency-restart.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/emergency-restart.h 2011-05-21 20:04:13.000000000 +0200 @@ -15,6 +15,6 @@ enum reboot_type { extern enum reboot_type reboot_type; -extern void machine_emergency_restart(void); +extern void machine_emergency_restart(void) __noreturn; #endif /* _ASM_X86_EMERGENCY_RESTART_H */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/futex.h linux-2.6.39-pax/arch/x86/include/asm/futex.h --- linux-2.6.39/arch/x86/include/asm/futex.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/futex.h 2011-05-20 01:08:17.000000000 +0200 @@ -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,7 +36,7 @@ _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, u32 __user *uaddr) @@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser 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: @@ -123,13 +125,13 @@ static inline int futex_atomic_cmpxchg_i if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; - asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" + asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n" "2:\t.section .fixup, \"ax\"\n" "3:\tmov %3, %0\n" "\tjmp 2b\n" "\t.previous\n" _ASM_EXTABLE(1b, 3b) - : "+r" (ret), "=a" (oldval), "+m" (*uaddr) + : "+r" (ret), "=a" (oldval), "+m" (*(u32 *)____m(uaddr)) : "i" (-EFAULT), "r" (newval), "1" (oldval) : "memory" ); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/hw_irq.h linux-2.6.39-pax/arch/x86/include/asm/hw_irq.h --- linux-2.6.39/arch/x86/include/asm/hw_irq.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/hw_irq.h 2011-05-19 13:45:27.000000000 +0200 @@ -137,8 +137,8 @@ extern void setup_ioapic_dest(void); extern void enable_IO_APIC(void); /* Statistics */ -extern atomic_t irq_err_count; -extern atomic_t irq_mis_count; +extern atomic_unchecked_t irq_err_count; +extern atomic_unchecked_t irq_mis_count; /* EISA */ extern void eisa_set_level_irq(unsigned int irq); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/i387.h linux-2.6.39-pax/arch/x86/include/asm/i387.h --- linux-2.6.39/arch/x86/include/asm/i387.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/i387.h 2011-05-19 13:45:27.000000000 +0200 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc { 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 @@ static inline int fxsave_user(struct i38 { 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 @@ static inline void fpu_fxsave(struct fpu #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 @@ -312,7 +317,7 @@ static inline void kernel_fpu_begin(void 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/io.h linux-2.6.39-pax/arch/x86/include/asm/io.h --- linux-2.6.39/arch/x86/include/asm/io.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/io.h 2011-05-19 13:45:27.000000000 +0200 @@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void); #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/iommu.h linux-2.6.39-pax/arch/x86/include/asm/iommu.h --- linux-2.6.39/arch/x86/include/asm/iommu.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/iommu.h 2011-05-19 14:23:28.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/irqflags.h linux-2.6.39-pax/arch/x86/include/asm/irqflags.h --- linux-2.6.39/arch/x86/include/asm/irqflags.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/irqflags.h 2011-05-19 13:45:27.000000000 +0200 @@ -140,6 +140,11 @@ static inline unsigned long arch_local_i 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/kprobes.h linux-2.6.39-pax/arch/x86/include/asm/kprobes.h --- linux-2.6.39/arch/x86/include/asm/kprobes.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/kprobes.h 2011-05-19 13:45:27.000000000 +0200 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t; #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/kvm_host.h linux-2.6.39-pax/arch/x86/include/asm/kvm_host.h --- linux-2.6.39/arch/x86/include/asm/kvm_host.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/kvm_host.h 2011-05-19 13:45:27.000000000 +0200 @@ -419,7 +419,7 @@ struct kvm_arch { unsigned int n_used_mmu_pages; unsigned int n_requested_mmu_pages; unsigned int n_max_mmu_pages; - atomic_t invlpg_counter; + atomic_unchecked_t invlpg_counter; struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES]; /* * Hash table of struct kvm_mmu_page. @@ -599,7 +599,7 @@ struct kvm_arch_async_pf { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/local.h linux-2.6.39-pax/arch/x86/include/asm/local.h --- linux-2.6.39/arch/x86/include/asm/local.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/local.h 2011-05-19 13:45:27.000000000 +0200 @@ -18,26 +18,58 @@ typedef struct { 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 @@ static inline int local_sub_and_test(lon { 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 @@ static inline int local_dec_and_test(loc { 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 @@ static inline int local_inc_and_test(loc { 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 @@ static inline int local_add_negative(lon { 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 @@ static inline long local_add_return(long #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/mce.h linux-2.6.39-pax/arch/x86/include/asm/mce.h --- linux-2.6.39/arch/x86/include/asm/mce.h 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/mce.h 2011-05-19 14:23:28.000000000 +0200 @@ -198,7 +198,7 @@ int mce_notify_irq(void); 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/microcode.h linux-2.6.39-pax/arch/x86/include/asm/microcode.h --- linux-2.6.39/arch/x86/include/asm/microcode.h 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/microcode.h 2011-05-19 14:23:28.000000000 +0200 @@ -12,13 +12,13 @@ struct device; 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 @@ struct ucode_cpu_info { 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 @@ static inline void get_ucode_data(void * } #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/mman.h linux-2.6.39-pax/arch/x86/include/asm/mman.h --- linux-2.6.39/arch/x86/include/asm/mman.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/mman.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/mmu.h linux-2.6.39-pax/arch/x86/include/asm/mmu.h --- linux-2.6.39/arch/x86/include/asm/mmu.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/mmu.h 2011-05-19 13:45:27.000000000 +0200 @@ -9,10 +9,22 @@ * 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 #ifdef CONFIG_X86_64 /* True if mm supports a task running in 32 bit compatibility mode. */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/mmu_context.h linux-2.6.39-pax/arch/x86/include/asm/mmu_context.h --- linux-2.6.39/arch/x86/include/asm/mmu_context.h 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/mmu_context.h 2011-05-19 13:45:27.000000000 +0200 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m 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 @@ static inline void switch_mm(struct mm_s 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 @@ static inline void switch_mm(struct mm_s */ 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 @@ static inline void switch_mm(struct mm_s * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/module.h linux-2.6.39-pax/arch/x86/include/asm/module.h --- linux-2.6.39/arch/x86/include/asm/module.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/module.h 2011-05-19 13:45:27.000000000 +0200 @@ -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,24 @@ #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 + +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT + #endif /* _ASM_X86_MODULE_H */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/page_64_types.h linux-2.6.39-pax/arch/x86/include/asm/page_64_types.h --- linux-2.6.39/arch/x86/include/asm/page_64_types.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/page_64_types.h 2011-05-19 13:45:27.000000000 +0200 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from); /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/paravirt.h linux-2.6.39-pax/arch/x86/include/asm/paravirt.h --- linux-2.6.39/arch/x86/include/asm/paravirt.h 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/paravirt.h 2011-05-19 13:45:27.000000000 +0200 @@ -739,6 +739,21 @@ static inline void __set_fixmap(unsigned 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 @@ extern void default_banner(void); #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 @@ extern void default_banner(void); 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/paravirt_types.h linux-2.6.39-pax/arch/x86/include/asm/paravirt_types.h --- linux-2.6.39/arch/x86/include/asm/paravirt_types.h 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/paravirt_types.h 2011-05-19 13:45:27.000000000 +0200 @@ -317,6 +317,12 @@ struct pv_mmu_ops { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/pci_x86.h linux-2.6.39-pax/arch/x86/include/asm/pci_x86.h --- linux-2.6.39/arch/x86/include/asm/pci_x86.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/pci_x86.h 2011-05-19 14:23:28.000000000 +0200 @@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/pgalloc.h linux-2.6.39-pax/arch/x86/include/asm/pgalloc.h --- linux-2.6.39/arch/x86/include/asm/pgalloc.h 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/pgalloc.h 2011-05-19 13:45:27.000000000 +0200 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/pgtable-2level.h linux-2.6.39-pax/arch/x86/include/asm/pgtable-2level.h --- linux-2.6.39/arch/x86/include/asm/pgtable-2level.h 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/pgtable-2level.h 2011-05-19 13:45:27.000000000 +0200 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/pgtable-3level.h linux-2.6.39-pax/arch/x86/include/asm/pgtable-3level.h --- linux-2.6.39/arch/x86/include/asm/pgtable-3level.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/pgtable-3level.h 2011-05-19 13:45:27.000000000 +0200 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/pgtable.h linux-2.6.39-pax/arch/x86/include/asm/pgtable.h --- linux-2.6.39/arch/x86/include/asm/pgtable.h 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/pgtable.h 2011-05-19 13:45:27.000000000 +0200 @@ -81,12 +81,51 @@ extern struct mm_struct *pgd_page_get_mm #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 @@ static inline pte_t pte_wrprotect(pte_t 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 @@ pte_t *populate_extra_pte(unsigned long #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 pud_t *pud_offset(pgd_t *p 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 @@ static inline int pgd_none(pgd_t pgd) * 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 @@ static inline int pgd_none(pgd_t pgd) #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 @@ static inline void pmdp_set_wrprotect(st * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/pgtable_32.h linux-2.6.39-pax/arch/x86/include/asm/pgtable_32.h --- linux-2.6.39/arch/x86/include/asm/pgtable_32.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/pgtable_32.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ extern void set_pmd_pfn(unsigned long, u # 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 @@ extern void set_pmd_pfn(unsigned long, u /* 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 @@ do { \ #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/pgtable_32_types.h linux-2.6.39-pax/arch/x86/include/asm/pgtable_32_types.h --- linux-2.6.39/arch/x86/include/asm/pgtable_32_types.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/pgtable_32_types.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ extern bool __vmalloc_start_set; /* set # 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/pgtable_64.h linux-2.6.39-pax/arch/x86/include/asm/pgtable_64.h --- linux-2.6.39/arch/x86/include/asm/pgtable_64.h 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/pgtable_64.h 2011-05-19 13:45:27.000000000 +0200 @@ -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_pte_atomic 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_pud_clear(pud_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/pgtable_64_types.h linux-2.6.39-pax/arch/x86/include/asm/pgtable_64_types.h --- linux-2.6.39/arch/x86/include/asm/pgtable_64_types.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/pgtable_64_types.h 2011-05-19 13:45:27.000000000 +0200 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/pgtable_types.h linux-2.6.39-pax/arch/x86/include/asm/pgtable_types.h --- linux-2.6.39/arch/x86/include/asm/pgtable_types.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/pgtable_types.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ static inline pgdval_t pgd_flags(pgd_t p { 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 @@ static inline pudval_t native_pud_val(pu 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 @@ static inline pmdval_t native_pmd_val(pm 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 @@ typedef struct page *pgtable_t; 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/processor.h linux-2.6.39-pax/arch/x86/include/asm/processor.h --- linux-2.6.39/arch/x86/include/asm/processor.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/processor.h 2011-05-19 13:45:27.000000000 +0200 @@ -266,7 +266,7 @@ struct tss_struct { } ____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 @@ -860,11 +860,18 @@ static inline void spin_lock_prefetch(co */ #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, \ + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \ .vm86_info = NULL, \ .sysenter_cs = __KERNEL_CS, \ .io_bitmap_ptr = NULL, \ @@ -878,7 +885,7 @@ static inline void spin_lock_prefetch(co */ #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, \ @@ -889,11 +896,7 @@ static inline void spin_lock_prefetch(co 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. @@ -908,7 +911,7 @@ extern unsigned long thread_saved_pc(str #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; \ }) @@ -918,13 +921,13 @@ extern unsigned long thread_saved_pc(str /* * 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) @@ -935,11 +938,11 @@ extern unsigned long thread_saved_pc(str #define STACK_TOP_MAX TASK_SIZE_MAX #define INIT_THREAD { \ - .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \ + .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \ } #define INIT_TSS { \ - .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \ + .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \ } /* @@ -961,6 +964,10 @@ extern void start_thread(struct pt_regs */ #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/ptrace.h linux-2.6.39-pax/arch/x86/include/asm/ptrace.h --- linux-2.6.39/arch/x86/include/asm/ptrace.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/ptrace.h 2011-05-19 13:45:27.000000000 +0200 @@ -152,28 +152,29 @@ static inline unsigned long regs_return_ } /* - * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/reboot.h linux-2.6.39-pax/arch/x86/include/asm/reboot.h --- linux-2.6.39/arch/x86/include/asm/reboot.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/reboot.h 2011-05-21 18:43:01.000000000 +0200 @@ -6,19 +6,19 @@ struct pt_regs; struct machine_ops { - void (*restart)(char *cmd); - void (*halt)(void); - void (*power_off)(void); + void (* __noreturn restart)(char *cmd); + void (* __noreturn halt)(void); + void (* __noreturn power_off)(void); void (*shutdown)(void); void (*crash_shutdown)(struct pt_regs *); - void (*emergency_restart)(void); + void (* __noreturn emergency_restart)(void); }; extern struct machine_ops machine_ops; void native_machine_crash_shutdown(struct pt_regs *regs); void native_machine_shutdown(void); -void machine_real_restart(unsigned int type); +void machine_real_restart(unsigned int type) __noreturn; /* These must match dispatch_table in reboot_32.S */ #define MRR_BIOS 0 #define MRR_APM 1 diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/rwsem.h linux-2.6.39-pax/arch/x86/include/asm/rwsem.h --- linux-2.6.39/arch/x86/include/asm/rwsem.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/rwsem.h 2011-05-19 13:45:27.000000000 +0200 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw { 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" @@ -85,6 +93,14 @@ static inline int __down_read_trylock(st "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" @@ -104,6 +120,14 @@ static inline void __down_write_nested(s long 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? */ @@ -141,6 +165,14 @@ static inline void __up_read(struct rw_s long 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 */ @@ -159,6 +191,14 @@ static inline void __up_write(struct rw_ long 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 */ @@ -176,6 +216,14 @@ static inline void __downgrade_write(str { 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) @@ -194,7 +242,15 @@ static inline void __downgrade_write(str */ static inline void rwsem_atomic_add(long 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)); } @@ -206,7 +262,15 @@ static inline long rwsem_atomic_update(l { long 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/segment.h linux-2.6.39-pax/arch/x86/include/asm/segment.h --- linux-2.6.39/arch/x86/include/asm/segment.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/segment.h 2011-05-19 13:45:27.000000000 +0200 @@ -64,8 +64,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 @@ -79,6 +79,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) @@ -104,6 +106,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 /* @@ -141,7 +149,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 @@ -165,6 +173,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 @@ -185,6 +195,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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/smp.h linux-2.6.39-pax/arch/x86/include/asm/smp.h --- linux-2.6.39/arch/x86/include/asm/smp.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/smp.h 2011-05-19 13:45:27.000000000 +0200 @@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_ /* cpus sharing the last level cache: */ DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_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) { @@ -192,14 +192,8 @@ extern unsigned disabled_cpus __cpuinitd 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/spinlock.h linux-2.6.39-pax/arch/x86/include/asm/spinlock.h --- linux-2.6.39/arch/x86/include/asm/spinlock.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/spinlock.h 2011-05-19 13:45:27.000000000 +0200 @@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar 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_read_lock(arch_r 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 int arch_write_trylock(arc 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/stackprotector.h linux-2.6.39-pax/arch/x86/include/asm/stackprotector.h --- linux-2.6.39/arch/x86/include/asm/stackprotector.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/stackprotector.h 2011-05-19 13:45:27.000000000 +0200 @@ -113,7 +113,7 @@ static inline void setup_stack_canary_se 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/stacktrace.h linux-2.6.39-pax/arch/x86/include/asm/stacktrace.h --- linux-2.6.39/arch/x86/include/asm/stacktrace.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/stacktrace.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ struct stacktrace_ops { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/system.h linux-2.6.39-pax/arch/x86/include/asm/system.h --- linux-2.6.39/arch/x86/include/asm/system.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/system.h 2011-05-21 18:57:10.000000000 +0200 @@ -129,7 +129,7 @@ do { \ "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" \ @@ -140,7 +140,7 @@ do { \ [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) @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un { unsigned long __limit; asm("lsll %1,%0" : "=r" (__limit) : "r" (segment)); - return __limit + 1; + return __limit; } static inline void native_clts(void) @@ -340,12 +340,12 @@ void enable_hlt(void); 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); -void stop_this_cpu(void *dummy); +void stop_this_cpu(void *dummy) __noreturn; /* * Force strict CPU ordering. diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/thread_info.h linux-2.6.39-pax/arch/x86/include/asm/thread_info.h --- linux-2.6.39/arch/x86/include/asm/thread_info.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/thread_info.h 2011-05-19 13:45:27.000000000 +0200 @@ -10,6 +10,7 @@ #include #include #include +#include /* * low level task data that entry.S needs immediate access to @@ -24,7 +25,6 @@ struct exec_domain; #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,12 @@ struct thread_info { 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 + unsigned long lowest_stack; 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 +50,7 @@ struct thread_info { }, \ } -#define init_thread_info (init_thread_union.thread_info) +#define init_thread_info (init_thread_union.stack) #define init_stack (init_thread_union.stack) #else /* !__ASSEMBLY__ */ @@ -170,6 +164,23 @@ struct thread_info { ret; \ }) +#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) @@ -180,35 +191,13 @@ struct thread_info { */ #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. @@ -216,21 +205,8 @@ static inline struct thread_info *curren #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 - +/* how to get the current stack pointer from C */ +register unsigned long current_stack_pointer asm("rsp") __used; #endif #endif /* !X86_32 */ @@ -266,5 +242,16 @@ extern void arch_task_cache_init(void); 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_node(int node); +extern void free_task_struct(struct task_struct *); + #endif #endif /* _ASM_X86_THREAD_INFO_H */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/uaccess.h linux-2.6.39-pax/arch/x86/include/asm/uaccess.h --- linux-2.6.39/arch/x86/include/asm/uaccess.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/uaccess.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ extern int __get_user_bad(void); 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 @@ extern int __get_user_bad(void); : "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 @@ do { \ } 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 @@ do { \ " 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 @@ do { \ } 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 @@ do { \ 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 @@ struct __large_struct { unsigned long bu * 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 @@ struct __large_struct { unsigned long bu ".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 @@ struct __large_struct { unsigned long bu * 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 @@ struct __large_struct { unsigned long bu * 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 @@ struct __large_struct { unsigned long bu #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 @@ extern struct movsl_mask { #define ARCH_HAS_NOCACHE_UACCESS 1 +#define ARCH_HAS_SORT_EXTABLE #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/uaccess_32.h linux-2.6.39-pax/arch/x86/include/asm/uaccess_32.h --- linux-2.6.39/arch/x86/include/asm/uaccess_32.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/uaccess_32.h 2011-05-19 13:45:27.000000000 +0200 @@ -44,6 +44,11 @@ unsigned long __must_check __copy_from_u static __always_inline unsigned long __must_check __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) { + pax_track_stack(); + + if ((long)n < 0) + return n; + if (__builtin_constant_p(n)) { unsigned long ret; @@ -62,6 +67,8 @@ __copy_to_user_inatomic(void __user *to, return ret; } } + if (!__builtin_constant_p(n)) + check_object_size(from, n, true); return __copy_to_user_ll(to, from, n); } @@ -83,12 +90,16 @@ static __always_inline unsigned long __m __copy_to_user(void __user *to, const void *from, unsigned long n) { might_fault(); + return __copy_to_user_inatomic(to, from, n); } 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 +149,12 @@ static __always_inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n) { might_fault(); + + pax_track_stack(); + + if ((long)n < 0) + return n; + if (__builtin_constant_p(n)) { unsigned long ret; @@ -153,6 +170,8 @@ __copy_from_user(void *to, const void __ return ret; } } + if (!__builtin_constant_p(n)) + check_object_size(to, n, false); return __copy_from_user_ll(to, from, n); } @@ -160,6 +179,10 @@ static __always_inline unsigned long __c 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 +205,19 @@ static __always_inline unsigned long __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 +227,61 @@ extern void copy_from_user_overflow(void #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/uaccess_64.h linux-2.6.39-pax/arch/x86/include/asm/uaccess_64.h --- linux-2.6.39/arch/x86/include/asm/uaccess_64.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/uaccess_64.h 2011-05-19 13:45:27.000000000 +0200 @@ -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 @@ copy_user_generic(void *to, const void * 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,198 @@ int copy_to_user(void __user *dst, const { 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); + + pax_track_stack(); + + 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); + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if ((unsigned long)src < PAX_USER_SHADOW_BASE) + src += PAX_USER_SHADOW_BASE; +#endif + + 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); + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if ((unsigned long)src < PAX_USER_SHADOW_BASE) + src += PAX_USER_SHADOW_BASE; +#endif + + 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)) + + pax_track_stack(); + + 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); + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if ((unsigned long)dst < PAX_USER_SHADOW_BASE) + dst += PAX_USER_SHADOW_BASE; +#endif + 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: + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if ((unsigned long)dst < PAX_USER_SHADOW_BASE) + dst += PAX_USER_SHADOW_BASE; +#endif + 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)) { + +#ifdef CONFIG_PAX_MEMORY_UDEREF + 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; +#endif + 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 +268,7 @@ int __copy_in_user(void __user *dst, con } 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 +278,7 @@ int __copy_in_user(void __user *dst, con 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 +287,7 @@ int __copy_in_user(void __user *dst, con } 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 +295,16 @@ int __copy_in_user(void __user *dst, con return ret; } default: + +#ifdef CONFIG_PAX_MEMORY_UDEREF + 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; +#endif + return copy_user_generic((__force void *)dst, - (__force void *)src, size); + (__force const void *)src, size); } } @@ -222,33 +321,72 @@ __must_check unsigned long __clear_user( static __must_check __always_inline int __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size) { + pax_track_stack(); + + if ((int)size < 0) + return size; + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if (!__access_ok(VERIFY_READ, src, size)) + return size; + + if ((unsigned long)src < PAX_USER_SHADOW_BASE) + src += PAX_USER_SHADOW_BASE; +#endif + 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; + + if ((unsigned long)dst < PAX_USER_SHADOW_BASE) + dst += PAX_USER_SHADOW_BASE; +#endif + 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/vgtod.h linux-2.6.39-pax/arch/x86/include/asm/vgtod.h --- linux-2.6.39/arch/x86/include/asm/vgtod.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/vgtod.h 2011-05-19 13:45:27.000000000 +0200 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/vsyscall.h linux-2.6.39-pax/arch/x86/include/asm/vsyscall.h --- linux-2.6.39/arch/x86/include/asm/vsyscall.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/vsyscall.h 2011-05-19 13:45:27.000000000 +0200 @@ -15,9 +15,10 @@ enum vsyscall_num { #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 @@ enum vsyscall_num { #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 struct timezone sys_tz; 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/xen/pci.h linux-2.6.39-pax/arch/x86/include/asm/xen/pci.h --- linux-2.6.39/arch/x86/include/asm/xen/pci.h 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/include/asm/xen/pci.h 2011-05-19 14:23:28.000000000 +0200 @@ -33,7 +33,7 @@ struct xen_pci_frontend_ops { void (*disable_msix)(struct pci_dev *dev); }; -extern struct xen_pci_frontend_ops *xen_pci_frontend; +extern const struct xen_pci_frontend_ops *xen_pci_frontend; static inline int xen_pci_frontend_enable_msi(struct pci_dev *dev, int vectors[]) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/include/asm/xsave.h linux-2.6.39-pax/arch/x86/include/asm/xsave.h --- linux-2.6.39/arch/x86/include/asm/xsave.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/include/asm/xsave.h 2011-05-19 13:45:27.000000000 +0200 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav { 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 @@ static inline int xrestore_user(struct x 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/acpi/sleep.c linux-2.6.39-pax/arch/x86/kernel/acpi/sleep.c --- linux-2.6.39/arch/x86/kernel/acpi/sleep.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/acpi/sleep.c 2011-05-19 13:45:28.000000000 +0200 @@ -88,8 +88,12 @@ int acpi_suspend_lowlevel(void) header->trampoline_segment = trampoline_address() >> 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.39-pax/arch/x86/kernel/acpi/wakeup_32.S --- linux-2.6.39/arch/x86/kernel/acpi/wakeup_32.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/acpi/wakeup_32.S 2011-05-19 13:45:28.000000000 +0200 @@ -30,13 +30,11 @@ wakeup_pmode_return: # 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/alternative.c linux-2.6.39-pax/arch/x86/kernel/alternative.c --- linux-2.6.39/arch/x86/kernel/alternative.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/alternative.c 2011-05-19 13:45:28.000000000 +0200 @@ -248,7 +248,7 @@ static void alternatives_smp_lock(const 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 @@ static void alternatives_smp_unlock(cons 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 @@ void __init_or_module apply_paravirt(str 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 @@ void __init alternative_instructions(voi 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 @@ void __init alternative_instructions(voi * 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 *__init_or_module text_poke_early(v */ 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 @@ void __kprobes text_poke_smp_batch(struc #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/amd_iommu.c linux-2.6.39-pax/arch/x86/kernel/amd_iommu.c --- linux-2.6.39/arch/x86/kernel/amd_iommu.c 2011-03-15 19:33:07.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/amd_iommu.c 2011-05-19 14:23:28.000000000 +0200 @@ -48,7 +48,7 @@ static DEFINE_SPINLOCK(iommu_pd_list_loc */ static struct protection_domain *pt_domain; -static struct iommu_ops amd_iommu_ops; +static const struct iommu_ops amd_iommu_ops; /* * general struct to manage commands send to an IOMMU @@ -2286,7 +2286,7 @@ static void prealloc_protection_domains( } } -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, @@ -2582,7 +2582,7 @@ static int amd_iommu_domain_has_cap(stru return 0; } -static struct iommu_ops amd_iommu_ops = { +static const struct iommu_ops amd_iommu_ops = { .domain_init = amd_iommu_domain_init, .domain_destroy = amd_iommu_domain_destroy, .attach_dev = amd_iommu_attach_device, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/apic/apic.c linux-2.6.39-pax/arch/x86/kernel/apic/apic.c --- linux-2.6.39/arch/x86/kernel/apic/apic.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/apic/apic.c 2011-05-19 13:45:28.000000000 +0200 @@ -1821,7 +1821,7 @@ void smp_error_interrupt(struct pt_regs apic_write(APIC_ESR, 0); v1 = apic_read(APIC_ESR); ack_APIC_irq(); - atomic_inc(&irq_err_count); + atomic_inc_unchecked(&irq_err_count); /* * Here is what the APIC error bits mean: @@ -2204,6 +2204,8 @@ static int __cpuinit apic_cluster_num(vo u16 *bios_cpu_apicid; DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS); + pax_track_stack(); + bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid); bitmap_zero(clustermap, NUM_APIC_CLUSTERS); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/apic/io_apic.c linux-2.6.39-pax/arch/x86/kernel/apic/io_apic.c --- linux-2.6.39/arch/x86/kernel/apic/io_apic.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/apic/io_apic.c 2011-05-19 13:45:28.000000000 +0200 @@ -623,7 +623,7 @@ struct IO_APIC_route_entry **alloc_ioapi 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] = @@ -640,7 +640,7 @@ nomem: kfree(ioapic_entries[apic]); kfree(ioapic_entries); - return 0; + return NULL; } /* @@ -1040,7 +1040,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, } 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. @@ -1048,7 +1048,7 @@ void lock_vector_lock(void) raw_spin_lock(&vector_lock); } -void unlock_vector_lock(void) +void unlock_vector_lock(void) __releases(vector_lock) { raw_spin_unlock(&vector_lock); } @@ -2379,7 +2379,7 @@ static void ack_apic_edge(struct irq_dat ack_APIC_irq(); } -atomic_t irq_mis_count; +atomic_unchecked_t irq_mis_count; /* * IO-APIC versions below 0x20 don't support EOI register. @@ -2487,7 +2487,7 @@ static void ack_apic_level(struct irq_da * at the cpu. */ if (!(v & (1 << (i & 0x1f)))) { - atomic_inc(&irq_mis_count); + atomic_inc_unchecked(&irq_mis_count); eoi_ioapic_irq(irq, cfg); } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/apm_32.c linux-2.6.39-pax/arch/x86/kernel/apm_32.c --- linux-2.6.39/arch/x86/kernel/apm_32.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/apm_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -412,7 +412,7 @@ static DEFINE_MUTEX(apm_mutex); * 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 */ @@ -590,7 +590,10 @@ static long __apm_bios_call(void *_call) 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; @@ -599,7 +602,11 @@ static long __apm_bios_call(void *_call) &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; @@ -666,7 +673,10 @@ static long __apm_bios_call_simple(void 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; @@ -674,7 +684,11 @@ static long __apm_bios_call_simple(void &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; } @@ -2351,12 +2365,15 @@ static int __init apm_init(void) * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/asm-offsets.c linux-2.6.39-pax/arch/x86/kernel/asm-offsets.c --- linux-2.6.39/arch/x86/kernel/asm-offsets.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/asm-offsets.c 2011-05-19 13:45:28.000000000 +0200 @@ -33,6 +33,8 @@ void common(void) { OFFSET(TI_status, thread_info, status); OFFSET(TI_addr_limit, thread_info, addr_limit); OFFSET(TI_preempt_count, thread_info, preempt_count); + OFFSET(TI_lowest_stack, thread_info, lowest_stack); + DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo)); BLANK(); OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx); @@ -53,8 +55,24 @@ void common(void) { OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0); OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2); + +#ifdef CONFIG_PAX_KERNEXEC + 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 + + BLANK(); + DEFINE(PAGE_SIZE_asm, PAGE_SIZE); + DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT); + DEFINE(THREAD_SIZE_asm, THREAD_SIZE); + #ifdef CONFIG_XEN BLANK(); OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/asm-offsets_64.c linux-2.6.39-pax/arch/x86/kernel/asm-offsets_64.c --- linux-2.6.39/arch/x86/kernel/asm-offsets_64.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/asm-offsets_64.c 2011-05-19 13:45:28.000000000 +0200 @@ -69,6 +69,7 @@ int main(void) BLANK(); #undef ENTRY + DEFINE(TSS_size, sizeof(struct tss_struct)); OFFSET(TSS_ist, tss_struct, x86_tss.ist); BLANK(); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/cpu/Makefile linux-2.6.39-pax/arch/x86/kernel/cpu/Makefile --- linux-2.6.39/arch/x86/kernel/cpu/Makefile 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/cpu/Makefile 2011-05-19 13:45:28.000000000 +0200 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/cpu/amd.c linux-2.6.39-pax/arch/x86/kernel/cpu/amd.c --- linux-2.6.39/arch/x86/kernel/cpu/amd.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/cpu/amd.c 2011-05-19 13:45:28.000000000 +0200 @@ -641,7 +641,7 @@ static unsigned int __cpuinit amd_size_c 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/cpu/common.c linux-2.6.39-pax/arch/x86/kernel/cpu/common.c --- linux-2.6.39/arch/x86/kernel/cpu/common.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/cpu/common.c 2011-05-19 13:45:28.000000000 +0200 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon 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 @@ void switch_to_new_gdt(int cpu) { 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 @@ static void __cpuinit identify_cpu(struc /* 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 @@ static __init int setup_disablecpuid(cha } __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 @@ DEFINE_PER_CPU(struct task_struct *, cur 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 - 16 + THREAD_SIZE; EXPORT_PER_CPU_SYMBOL(kernel_stack); DEFINE_PER_CPU(char *, irq_stack_ptr) = @@ -1084,7 +1037,7 @@ struct pt_regs * __cpuinit idle_regs(str { 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 @@ void __cpuinit cpu_init(void) 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 @@ void __cpuinit cpu_init(void) 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 @@ void __cpuinit cpu_init(void) wrmsrl(MSR_KERNEL_GS_BASE, 0); barrier(); - x86_configure_nx(); if (cpu != 0) enable_x2apic(); @@ -1228,7 +1180,7 @@ void __cpuinit cpu_init(void) { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/cpu/intel.c linux-2.6.39-pax/arch/x86/kernel/cpu/intel.c --- linux-2.6.39/arch/x86/kernel/cpu/intel.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/cpu/intel.c 2011-05-19 13:45:28.000000000 +0200 @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.39-pax/arch/x86/kernel/cpu/mcheck/mce.c --- linux-2.6.39/arch/x86/kernel/cpu/mcheck/mce.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/cpu/mcheck/mce.c 2011-05-19 13:54:13.000000000 +0200 @@ -46,6 +46,7 @@ #include #include #include +#include #include "mce-internal.h" @@ -220,7 +221,7 @@ static void print_mce(struct mce *m) !(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"); } @@ -244,10 +245,10 @@ static void print_mce(struct mce *m) #define PANIC_TIMEOUT 5 /* 5 seconds */ -static atomic_t mce_paniced; +static atomic_unchecked_t mce_paniced; static int fake_panic; -static atomic_t mce_fake_paniced; +static atomic_unchecked_t mce_fake_paniced; /* Panic in progress. Enable interrupts and wait for final IPI */ static void wait_for_panic(void) @@ -271,7 +272,7 @@ static void mce_panic(char *msg, struct /* * Make sure only one CPU runs in machine check panic */ - if (atomic_inc_return(&mce_paniced) > 1) + if (atomic_inc_return_unchecked(&mce_paniced) > 1) wait_for_panic(); barrier(); @@ -279,7 +280,7 @@ static void mce_panic(char *msg, struct console_verbose(); } else { /* Don't log too much for fake panic */ - if (atomic_inc_return(&mce_fake_paniced) > 1) + if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1) return; } /* First print corrected ones that are still unlogged */ @@ -647,7 +648,7 @@ static int mce_timed_out(u64 *t) * might have been modified by someone else. */ rmb(); - if (atomic_read(&mce_paniced)) + if (atomic_read_unchecked(&mce_paniced)) wait_for_panic(); if (!monarch_timeout) goto out; @@ -1461,14 +1462,14 @@ void __cpuinit mcheck_cpu_init(struct cp */ 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; @@ -1476,7 +1477,7 @@ static int mce_open(struct inode *inode, if (file->f_flags & O_EXCL) open_exclu = 1; - open_count++; + local_inc(&open_count); spin_unlock(&mce_state_lock); @@ -1487,7 +1488,7 @@ static int mce_release(struct inode *ino { spin_lock(&mce_state_lock); - open_count--; + local_dec(&open_count); open_exclu = 0; spin_unlock(&mce_state_lock); @@ -2174,7 +2175,7 @@ struct dentry *mce_get_debugfs_dir(void) static void mce_reset(void) { cpu_missing = 0; - atomic_set(&mce_fake_paniced, 0); + atomic_set_unchecked(&mce_fake_paniced, 0); atomic_set(&mce_executing, 0); atomic_set(&mce_callin, 0); atomic_set(&global_nwo, 0); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.39-pax/arch/x86/kernel/cpu/mtrr/main.c --- linux-2.6.39/arch/x86/kernel/cpu/mtrr/main.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/cpu/mtrr/main.c 2011-05-19 13:45:28.000000000 +0200 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex); 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.39-pax/arch/x86/kernel/cpu/mtrr/mtrr.h --- linux-2.6.39/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-05-19 14:23:28.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/cpu/perf_event.c linux-2.6.39-pax/arch/x86/kernel/cpu/perf_event.c --- linux-2.6.39/arch/x86/kernel/cpu/perf_event.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/cpu/perf_event.c 2011-05-19 13:45:28.000000000 +0200 @@ -774,6 +774,8 @@ static int x86_schedule_events(struct cp int i, j, w, wmax, num = 0; struct hw_perf_event *hwc; + pax_track_stack(); + bitmap_zero(used_mask, X86_PMC_IDX_MAX); for (i = 0; i < n; i++) { @@ -1878,7 +1880,7 @@ perf_callchain_user(struct perf_callchai break; perf_callchain_store(entry, frame.return_address); - fp = frame.next_frame; + fp = (__force const void __user *)frame.next_frame; } } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/crash.c linux-2.6.39-pax/arch/x86/kernel/crash.c --- linux-2.6.39/arch/x86/kernel/crash.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/crash.c 2011-05-19 13:45:28.000000000 +0200 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/doublefault_32.c linux-2.6.39-pax/arch/x86/kernel/doublefault_32.c --- linux-2.6.39/arch/x86/kernel/doublefault_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/doublefault_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -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 @@ static void doublefault_fn(void) 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 @@ struct tss_struct doublefault_tss __cach /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/dumpstack.c linux-2.6.39-pax/arch/x86/kernel/dumpstack.c --- linux-2.6.39/arch/x86/kernel/dumpstack.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/dumpstack.c 2011-05-19 13:45:28.000000000 +0200 @@ -35,9 +35,8 @@ void printk_address(unsigned long addres 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 +57,7 @@ print_ftrace_graph_addr(unsigned long ad 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 +68,8 @@ print_ftrace_graph_addr(unsigned long ad * 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 +80,14 @@ static inline int valid_stack_ptr(struct } 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 +99,7 @@ print_context_stack(struct thread_info * } 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 +108,7 @@ print_context_stack(struct thread_info * 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 +116,7 @@ print_context_stack_bp(struct thread_inf 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 +125,7 @@ print_context_stack_bp(struct thread_inf 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; @@ -202,7 +199,7 @@ void dump_stack(void) bp = stack_frame(current, NULL); 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); @@ -259,7 +256,7 @@ void __kprobes oops_end(unsigned long fl panic("Fatal exception in interrupt"); if (panic_on_oops) panic("Fatal exception"); - do_exit(signr); + do_group_exit(signr); } int __kprobes __die(const char *str, struct pt_regs *regs, long err) @@ -286,7 +283,7 @@ int __kprobes __die(const char *str, str show_registers(regs); #ifdef CONFIG_X86_32 - if (user_mode_vm(regs)) { + if (user_mode(regs)) { sp = regs->sp; ss = regs->ss & 0xffff; } else { @@ -314,7 +311,7 @@ void die(const char *str, struct pt_regs 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/dumpstack_32.c linux-2.6.39-pax/arch/x86/kernel/dumpstack_32.c --- linux-2.6.39/arch/x86/kernel/dumpstack_32.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/dumpstack_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task bp = stack_frame(task, regs); for (;;) { - struct thread_info *context; + void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1)); - context = (struct thread_info *) - ((unsigned long)stack & (~(THREAD_SIZE - 1))); - bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph); + bp = ops->walk_stack(task, stack_start, 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(); @@ -96,21 +94,22 @@ void show_registers(struct pt_regs *regs * 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, 0, 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++) { @@ -119,7 +118,7 @@ void show_registers(struct pt_regs *regs printk(" Bad EIP value."); break; } - if (ip == (u8 *)regs->ip) + if (ip == (u8 *)regs->ip + cs_base) printk("<%02x> ", c); else printk("%02x ", c); @@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip) { unsigned short ud2; + ip = ktla_ktva(ip); if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/dumpstack_64.c linux-2.6.39-pax/arch/x86/kernel/dumpstack_64.c --- linux-2.6.39/arch/x86/kernel/dumpstack_64.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/dumpstack_64.c 2011-05-19 13:45:28.000000000 +0200 @@ -147,9 +147,9 @@ void dump_trace(struct task_struct *task 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; + void *stack_start; if (!task) task = current; @@ -167,10 +167,10 @@ void dump_trace(struct task_struct *task * 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 @@ void dump_trace(struct task_struct *task 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 @@ void dump_trace(struct task_struct *task 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 @@ void dump_trace(struct task_struct *task /* * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/early_printk.c linux-2.6.39-pax/arch/x86/kernel/early_printk.c --- linux-2.6.39/arch/x86/kernel/early_printk.c 2011-03-15 19:33:08.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/early_printk.c 2011-05-19 13:45:28.000000000 +0200 @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -179,6 +180,8 @@ asmlinkage void early_printk(const char int n; va_list ap; + pax_track_stack(); + va_start(ap, fmt); n = vscnprintf(buf, sizeof(buf), fmt, ap); early_console->write(early_console, buf, n); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/entry_32.S linux-2.6.39-pax/arch/x86/kernel/entry_32.S --- linux-2.6.39/arch/x86/kernel/entry_32.S 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/entry_32.S 2011-05-22 21:59:34.000000000 +0200 @@ -185,13 +185,146 @@ /*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_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) +#ifdef CONFIG_PARAVIRT + pushl %eax + pushl %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 + popl %ecx + popl %eax +#endif + ret +ENDPROC(pax_enter_kernel) + +ENTRY(pax_exit_kernel) +#ifdef CONFIG_PARAVIRT + pushl %eax + pushl %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 + popl %ecx + popl %eax +#endif + ret +ENDPROC(pax_exit_kernel) +#endif + +.macro pax_erase_kstack +#ifdef CONFIG_PAX_MEMORY_STACKLEAK + call pax_erase_kstack +#endif +.endm + +#ifdef CONFIG_PAX_MEMORY_STACKLEAK +/* + * ebp: thread_info + * ecx, edx: can be clobbered + */ +ENTRY(pax_erase_kstack) + pushl %edi + pushl %eax + + mov TI_lowest_stack(%ebp), %edi + mov $0xB4DD00D5, %eax + std + +1: mov %edi, %ecx + and $THREAD_SIZE_asm - 1, %ecx + shr $2, %ecx + repne scasl + jecxz 2f + + cmp $2*16, %ecx + jc 2f + + mov $2*16, %ecx + repe scasl + jecxz 2f + jne 1b + +2: cld + mov %esp, %ecx + sub %edi, %ecx + shr $2, %ecx + rep stosl + + mov TI_task_thread_sp0(%ebp), %edi + sub $128, %edi + mov %edi, TI_lowest_stack(%ebp) + + popl %eax + popl %edi + ret +ENDPROC(pax_erase_kstack) +#endif + +.macro __SAVE_ALL _DS cld PUSH_GS pushl_cfi %fs @@ -214,7 +347,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 @@ -222,6 +355,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 @@ -332,7 +474,15 @@ check_userspace: 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 @@ -344,7 +494,7 @@ ENTRY(resume_userspace) andl $_TIF_WORK_MASK, %ecx # is there any work to be done on # int/exception return? jne work_pending - jmp restore_all + jmp restore_all_pax END(ret_from_exception) #ifdef CONFIG_PREEMPT @@ -394,23 +544,34 @@ sysenter_past_esp: /*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+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 @@ -433,12 +594,23 @@ sysenter_do_call: testl $_TIF_ALLWORK_MASK, %ecx jne sysexit_audit sysenter_exit: + +#ifdef CONFIG_PAX_RANDKSTACK + pushl_cfi %eax + call pax_randomize_kstack + popl_cfi %eax +#endif + + pax_erase_kstack + /* 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 @@ -455,6 +627,9 @@ sysenter_audit: movl %eax,%edx /* 2nd arg: syscall number */ movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */ call audit_syscall_entry + + pax_erase_kstack + pushl_cfi %ebx movl PT_EAX(%esp),%eax /* reload syscall number */ jmp sysenter_do_call @@ -481,11 +656,17 @@ sysexit_audit: 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) @@ -518,6 +699,14 @@ syscall_exit: testl $_TIF_ALLWORK_MASK, %ecx # current->work jne syscall_exit_work +restore_all_pax: + +#ifdef CONFIG_PAX_RANDKSTACK + call pax_randomize_kstack +#endif + + pax_erase_kstack + restore_all: TRACE_IRQS_IRET restore_all_notrace: @@ -577,14 +766,21 @@ ldt_ss: * 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 @@ -613,29 +809,23 @@ work_resched: movl TI_flags(%ebp), %ecx andl $_TIF_WORK_MASK, %ecx # is there any work to be done other # than syscall tracing? - jz restore_all + jz restore_all_pax testb $_TIF_NEED_RESCHED, %cl jnz work_resched 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 @@ -648,6 +838,9 @@ syscall_trace_entry: movl $-ENOSYS,PT_EAX(%esp) movl %esp, %eax call syscall_trace_enter + + pax_erase_kstack + /* What it returned is what we'll actually use. */ cmpl $(nr_syscalls), %eax jnae syscall_call @@ -670,6 +863,10 @@ END(syscall_exit_work) 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 @@ -752,6 +949,36 @@ ptregs_clone: 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 @@ -761,8 +988,15 @@ ENDPROC(ptregs_clone) * 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 @@ -1213,7 +1447,6 @@ return_to_handler: jmp *%ecx #endif -.section .rodata,"a" #include "syscall_table_32.S" syscall_table_size=(.-sys_call_table) @@ -1259,9 +1492,12 @@ error_code: 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 @@ -1346,6 +1582,9 @@ nmi_stack_correct: xorl %edx,%edx # zero error code movl %esp,%eax # pt_regs pointer call do_nmi + + pax_exit_kernel + jmp restore_all_notrace CFI_ENDPROC @@ -1382,6 +1621,9 @@ nmi_espfix_stack: 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/entry_64.S linux-2.6.39-pax/arch/x86/kernel/entry_64.S --- linux-2.6.39/arch/x86/kernel/entry_64.S 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/entry_64.S 2011-05-24 02:00:21.000000000 +0200 @@ -53,6 +53,7 @@ #include #include #include +#include /* Avoid __ASSEMBLER__'ifying just for this. */ #include @@ -176,6 +177,257 @@ ENTRY(native_usergs_sysret64) ENDPROC(native_usergs_sysret64) #endif /* CONFIG_PARAVIRT */ + .macro ljmpq sel, off +#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM) + .byte 0x48; ljmp *1234f(%rip) + .pushsection .rodata + .align 16 + 1234: .quad \off; .word \sel + .popsection +#else + pushq $\sel + pushq $\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) + pushq %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 + + popq %rdi + retq +ENDPROC(pax_enter_kernel) + +ENTRY(pax_exit_kernel) + pushq %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 + + popq %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 + pax_erase_kstack + .endm + +#ifdef CONFIG_PAX_MEMORY_UDEREF +ENTRY(pax_enter_kernel_user) + pushq %rdi + pushq %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 + pushq %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: popq %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 + + popq %rbx + popq %rdi + retq +ENDPROC(pax_enter_kernel_user) + +ENTRY(pax_exit_kernel_user) + push %rdi + +#ifdef CONFIG_PARAVIRT + pushq %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) + popq %rbx +#endif + + popq %rdi + retq +ENDPROC(pax_exit_kernel_user) +#endif + +.macro pax_erase_kstack +#ifdef CONFIG_PAX_MEMORY_STACKLEAK + call pax_erase_kstack +#endif +.endm + +#ifdef CONFIG_PAX_MEMORY_STACKLEAK +/* + * r10: thread_info + * rcx, rdx: can be clobbered + */ +ENTRY(pax_erase_kstack) + pushq %rdi + pushq %rax + + GET_THREAD_INFO(%r10) + mov TI_lowest_stack(%r10), %rdi + mov $0xB4DD00D5BADBABE5, %rax + std + +1: mov %edi, %ecx + and $THREAD_SIZE_asm - 1, %ecx + shr $3, %ecx + repne scasq + jecxz 2f + + cmp $2*8, %ecx + jc 2f + + mov $2*8, %ecx + repe scasq + jecxz 2f + jne 1b + +2: cld + mov %esp, %ecx + sub %edi, %ecx + shr $3, %ecx + rep stosq + + mov TI_task_thread_sp0(%r10), %rdi + sub $256, %rdi + mov %rdi, TI_lowest_stack(%r10) + + popq %rax + popq %rdi + ret +ENDPROC(pax_erase_kstack) +#endif .macro TRACE_IRQS_IRETQ offset=ARGOFFSET #ifdef CONFIG_TRACE_IRQFLAGS @@ -318,7 +570,7 @@ ENTRY(save_args) 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 /* @@ -409,7 +661,7 @@ ENTRY(ret_from_fork) 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 @@ -455,7 +707,7 @@ END(ret_from_fork) 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 @@ -468,12 +720,13 @@ ENTRY(system_call_after_swapgs) 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 @@ -502,6 +755,7 @@ sysret_check: andl %edi,%edx jnz sysret_careful CFI_REMEMBER_STATE + pax_exit_kernel_user /* * sysretq will re-enable interrupts: */ @@ -560,6 +814,9 @@ auditsys: movq %rax,%rsi /* 2nd arg: syscall number */ movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */ call audit_syscall_entry + + pax_erase_kstack + LOAD_ARGS 0 /* reload call-clobbered registers */ jmp system_call_fastpath @@ -590,6 +847,9 @@ tracesys: FIXUP_TOP_OF_STACK %rdi movq %rsp,%rdi call syscall_trace_enter + + pax_erase_kstack + /* * Reload arg registers from stack in case ptrace changed them. * We don't reload %rax because syscall_trace_enter() returned @@ -611,7 +871,7 @@ tracesys: 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 */ @@ -793,6 +1053,16 @@ END(interrupt) 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 @@ -825,7 +1095,7 @@ ret_from_intr: 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 */ @@ -847,12 +1117,14 @@ retint_swapgs: /* return to user-space * 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: */ @@ -1027,6 +1299,16 @@ ENTRY(\sym) 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 @@ -1044,6 +1326,16 @@ ENTRY(\sym) 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 @@ -1052,7 +1344,7 @@ ENTRY(\sym) 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 @@ -1062,8 +1354,24 @@ ENTRY(\sym) 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) @@ -1080,6 +1388,16 @@ ENTRY(\sym) 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 */ @@ -1099,6 +1417,16 @@ ENTRY(\sym) 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 */ @@ -1361,14 +1689,27 @@ ENTRY(paranoid_exit) 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 @@ -1426,7 +1767,7 @@ ENTRY(error_entry) 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 @@ -1490,6 +1831,16 @@ ENTRY(nmi) 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 @@ -1500,11 +1851,25 @@ ENTRY(nmi) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/ftrace.c linux-2.6.39-pax/arch/x86/kernel/ftrace.c --- linux-2.6.39/arch/x86/kernel/ftrace.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/ftrace.c 2011-05-19 13:45:28.000000000 +0200 @@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the static void *mod_code_newcode; /* holds the text to write to the IP */ static unsigned nmi_wait_count; -static atomic_t nmi_update_count = ATOMIC_INIT(0); +static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0); int ftrace_arch_read_dyn_info(char *buf, int size) { @@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf, r = snprintf(buf, size, "%u %u", nmi_wait_count, - atomic_read(&nmi_update_count)); + atomic_read_unchecked(&nmi_update_count)); return r; } @@ -177,8 +177,10 @@ void ftrace_nmi_enter(void) if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { smp_rmb(); + pax_open_kernel(); ftrace_mod_code(); - atomic_inc(&nmi_update_count); + pax_close_kernel(); + atomic_inc_unchecked(&nmi_update_count); } /* Must have previous changes seen before executions */ smp_mb(); @@ -271,6 +273,8 @@ ftrace_modify_code(unsigned long ip, uns { 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 @@ int ftrace_update_ftrace_func(ftrace_fun 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 @@ static int ftrace_mod_jmp(unsigned long { unsigned char code[MCOUNT_INSN_SIZE]; + ip = ktla_ktva(ip); + if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/head32.c linux-2.6.39-pax/arch/x86/kernel/head32.c --- linux-2.6.39/arch/x86/kernel/head32.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/head32.c 2011-05-19 13:45:28.000000000 +0200 @@ -19,6 +19,7 @@ #include #include #include +#include static void __init i386_default_early_setup(void) { @@ -34,7 +35,7 @@ void __init i386_start_kernel(void) { memblock_init(); - 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/head_32.S linux-2.6.39-pax/arch/x86/kernel/head_32.S --- linux-2.6.39/arch/x86/kernel/head_32.S 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/head_32.S 2011-05-19 13:45:28.000000000 +0200 @@ -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 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_P 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 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE) * 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 @@ ENTRY(startup_32) 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 @@ ENTRY(startup_32) 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 @@ page_pde_offset = (__PAGE_OFFSET >> 20); 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 @@ page_pde_offset = (__PAGE_OFFSET >> 20); 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 @@ WEAK(xen_entry) __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 ta(default_entry) /* normal x86/PC */ + .long ta(lguest_entry) /* lguest hypervisor */ + .long ta(xen_entry) /* Xen hypervisor */ + .long ta(default_entry) /* Moorestown MID */ num_subarch_entries = (. - subarch_entries) / 4 .previous #else @@ -312,6 +382,7 @@ default_entry: 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 @@ default_entry: /* Make changes effective */ wrmsr + btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4) +#endif + 6: /* @@ -443,7 +517,7 @@ is386: movl $2,%ecx # set MP 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 @@ is386: movl $2,%ecx # set MP */ 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 @@ early_page_fault: 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 @@ hlt_loop: /* 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 @@ ignore_int: 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 @@ ENTRY(initial_code) /* * BSS section */ -__PAGE_ALIGNED_BSS - .align PAGE_SIZE #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 +.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 @@ ENTRY(initial_page_table) # error "Kernel PMDs should be 1, 2 or 3" # endif .align PAGE_SIZE /* 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 @@ fault_msg: .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 @@ idt_descr: .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 @@ ENTRY(early_gdt_descr) .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/head_64.S linux-2.6.39-pax/arch/x86/kernel/head_64.S --- linux-2.6.39/arch/x86/kernel/head_64.S 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/head_64.S 2011-05-19 13:45:28.000000000 +0200 @@ -19,6 +19,7 @@ #include #include #include +#include #ifdef CONFIG_PARAVIRT #include @@ -38,6 +39,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET 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 @@ startup_64: */ 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 @@ -160,8 +152,8 @@ ENTRY(secondary_startup_64) * 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. */ @@ -183,9 +175,14 @@ ENTRY(secondary_startup_64) 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 */ @@ -269,7 +266,7 @@ ENTRY(secondary_startup_64) bad_address: jmp bad_address - .section ".init.text","ax" + __INIT #ifdef CONFIG_EARLY_PRINTK .globl early_idt_handlers early_idt_handlers: @@ -314,18 +311,23 @@ ENTRY(early_idt_handler) #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) @@ -338,7 +340,6 @@ ENTRY(name) 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 @@ -349,13 +350,36 @@ NEXT_PAGE(init_level4_pgt) .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 @@ -363,20 +387,23 @@ NEXT_PAGE(level3_kernel_pgt) .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) /* @@ -389,33 +416,55 @@ NEXT_PAGE(level2_kernel_pgt) * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/i386_ksyms_32.c linux-2.6.39-pax/arch/x86/kernel/i386_ksyms_32.c --- linux-2.6.39/arch/x86/kernel/i386_ksyms_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/i386_ksyms_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); 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(strstr); EXPORT_SYMBOL(csum_partial); EXPORT_SYMBOL(empty_zero_page); + +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/i8259.c linux-2.6.39-pax/arch/x86/kernel/i8259.c --- linux-2.6.39/arch/x86/kernel/i8259.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/i8259.c 2011-05-19 13:45:28.000000000 +0200 @@ -210,7 +210,7 @@ spurious_8259A_irq: "spurious 8259A interrupt: IRQ%d.\n", irq); spurious_irq_mask |= irqmask; } - atomic_inc(&irq_err_count); + atomic_inc_unchecked(&irq_err_count); /* * Theoretically we do not have to handle this IRQ, * but in Linux this does not cause problems and is diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/init_task.c linux-2.6.39-pax/arch/x86/kernel/init_task.c --- linux-2.6.39/arch/x86/kernel/init_task.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/init_task.c 2011-05-19 13:45:28.000000000 +0200 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan * 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 @@ EXPORT_SYMBOL(init_task); * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/ioport.c linux-2.6.39-pax/arch/x86/kernel/ioport.c --- linux-2.6.39/arch/x86/kernel/ioport.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/ioport.c 2011-05-19 13:45:28.000000000 +0200 @@ -54,7 +54,7 @@ asmlinkage long sys_ioperm(unsigned long * because the ->io_bitmap_max value must match the bitmap * contents: */ - tss = &per_cpu(init_tss, get_cpu()); + tss = init_tss + get_cpu(); if (turn_on) bitmap_clear(t->io_bitmap_ptr, from, num); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/irq.c linux-2.6.39-pax/arch/x86/kernel/irq.c --- linux-2.6.39/arch/x86/kernel/irq.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/irq.c 2011-05-19 13:45:28.000000000 +0200 @@ -17,7 +17,7 @@ #include #include -atomic_t irq_err_count; +atomic_unchecked_t irq_err_count; /* Function pointer for generic interrupt vector handling */ void (*x86_platform_ipi_callback)(void) = NULL; @@ -116,9 +116,9 @@ int arch_show_interrupts(struct seq_file seq_printf(p, "%10u ", per_cpu(mce_poll_count, j)); seq_printf(p, " Machine check polls\n"); #endif - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count)); + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count)); #if defined(CONFIG_X86_IO_APIC) - seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count)); + seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count)); #endif return 0; } @@ -158,10 +158,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu) u64 arch_irq_stat(void) { - u64 sum = atomic_read(&irq_err_count); + u64 sum = atomic_read_unchecked(&irq_err_count); #ifdef CONFIG_X86_IO_APIC - sum += atomic_read(&irq_mis_count); + sum += atomic_read_unchecked(&irq_mis_count); #endif return sum; } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/irq_32.c linux-2.6.39-pax/arch/x86/kernel/irq_32.c --- linux-2.6.39/arch/x86/kernel/irq_32.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/irq_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -36,7 +36,7 @@ static int check_stack_overflow(void) __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 @@ static inline void print_stack_overflow( * 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 void call_on_stack(void *func, vo 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 @@ execute_on_irq_stack(int overflow, struc * 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 @@ execute_on_irq_stack(int overflow, struc : "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 @@ execute_on_irq_stack(int overflow, struc */ 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 @@ void __cpuinit irq_ctx_init(int cpu) asmlinkage void do_softirq(void) { unsigned long flags; - struct thread_info *curctx; union irq_ctx *irqctx; u32 *isp; @@ -162,15 +144,22 @@ asmlinkage void do_softirq(void) 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 + /* * Shouldn't happen, we returned above if in_interrupt(): */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/kgdb.c linux-2.6.39-pax/arch/x86/kernel/kgdb.c --- linux-2.6.39/arch/x86/kernel/kgdb.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/kgdb.c 2011-05-19 14:23:27.000000000 +0200 @@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, #ifdef CONFIG_X86_32 switch (regno) { 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: @@ -473,12 +473,12 @@ int kgdb_arch_handle_exception(int e_vec case 'k': /* clear the trace bit */ linux_regs->flags &= ~X86_EFLAGS_TF; - atomic_set(&kgdb_cpu_doing_single_step, -1); + atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1); /* set the trace bit if we're stepping */ if (remcomInBuffer[0] == 's') { linux_regs->flags |= X86_EFLAGS_TF; - atomic_set(&kgdb_cpu_doing_single_step, + atomic_set_unchecked(&kgdb_cpu_doing_single_step, raw_smp_processor_id()); } @@ -534,7 +534,7 @@ static int __kgdb_notify(struct die_args return NOTIFY_DONE; case DIE_DEBUG: - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) { + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) { if (user_mode(regs)) return single_step_cont(regs, args); break; @@ -710,7 +710,7 @@ void kgdb_arch_set_pc(struct pt_regs *re 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/kprobes.c linux-2.6.39-pax/arch/x86/kernel/kprobes.c --- linux-2.6.39/arch/x86/kernel/kprobes.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/kprobes.c 2011-05-19 13:45:28.000000000 +0200 @@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat } __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 @@ static int __kprobes can_boost(kprobe_op 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 @@ static int __kprobes __copy_instruction( } } 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 @@ static int __kprobes __copy_instruction( (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 @@ static void __kprobes arch_copy_kprobe(s */ __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 @@ static void __kprobes setup_singlestep(s * 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 @@ static void __kprobes setup_singlestep(s 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 @@ static int __kprobes kprobe_handler(stru 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 @@ static void __kprobes resume_execution(s 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 @@ int __kprobes kprobe_exceptions_notify(s 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) { @@ -1381,7 +1388,7 @@ int __kprobes arch_prepare_optimized_kpr * 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; @@ -1402,11 +1409,11 @@ int __kprobes arch_prepare_optimized_kpr 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 + @@ -1428,7 +1435,7 @@ static void __kprobes setup_optimize_kpr ((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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/ldt.c linux-2.6.39-pax/arch/x86/kernel/ldt.c --- linux-2.6.39/arch/x86/kernel/ldt.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/ldt.c 2011-05-19 13:45:28.000000000 +0200 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i 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 @@ static inline int copy_ldt(mm_context_t 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 @@ int init_new_context(struct task_struct 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 @@ static int write_ldt(void __user *ptr, u } } +#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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/machine_kexec_32.c linux-2.6.39-pax/arch/x86/kernel/machine_kexec_32.c --- linux-2.6.39/arch/x86/kernel/machine_kexec_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/machine_kexec_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -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_idt(void *newidt, __u16 } -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 @@ void machine_kexec(struct kimage *image) } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/microcode_amd.c linux-2.6.39-pax/arch/x86/kernel/microcode_amd.c --- linux-2.6.39/arch/x86/kernel/microcode_amd.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/microcode_amd.c 2011-05-19 14:23:28.000000000 +0200 @@ -339,7 +339,7 @@ static void microcode_fini_cpu_amd(int c 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_amd, .collect_cpu_info = collect_cpu_info_amd, @@ -347,7 +347,7 @@ static struct microcode_ops microcode_am .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/microcode_core.c linux-2.6.39-pax/arch/x86/kernel/microcode_core.c --- linux-2.6.39/arch/x86/kernel/microcode_core.c 2011-05-19 10:21:14.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/microcode_core.c 2011-05-19 14:23:28.000000000 +0200 @@ -93,7 +93,7 @@ MODULE_LICENSE("GPL"); #define MICROCODE_VERSION "2.00" -static struct microcode_ops *microcode_ops; +static const struct microcode_ops *microcode_ops; /* * Synchronization. diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/microcode_intel.c linux-2.6.39-pax/arch/x86/kernel/microcode_intel.c --- linux-2.6.39/arch/x86/kernel/microcode_intel.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/microcode_intel.c 2011-05-19 14:23:27.000000000 +0200 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod 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 @@ static void microcode_fini_cpu(int cpu) 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 @@ static struct microcode_ops microcode_in .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/module.c linux-2.6.39-pax/arch/x86/kernel/module.c --- linux-2.6.39/arch/x86/kernel/module.c 2011-03-15 19:33:08.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/module.c 2011-05-19 13:45:28.000000000 +0200 @@ -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 @@ int apply_relocate(Elf32_Shdr *sechdrs, 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 @@ int apply_relocate(Elf32_Shdr *sechdrs, 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 @@ int apply_relocate_add(Elf64_Shdr *sechd 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.39-pax/arch/x86/kernel/paravirt-spinlocks.c --- linux-2.6.39/arch/x86/kernel/paravirt-spinlocks.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/paravirt-spinlocks.c 2011-05-19 13:45:28.000000000 +0200 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/paravirt.c linux-2.6.39-pax/arch/x86/kernel/paravirt.c --- linux-2.6.39/arch/x86/kernel/paravirt.c 2011-03-15 19:33:08.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/paravirt.c 2011-05-19 13:45:28.000000000 +0200 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu * 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, @@ -133,6 +133,9 @@ static void *get_call_destination(u8 typ .pv_lock_ops = pv_lock_ops, #endif }; + + pax_track_stack(); + return *((void **)&tmpl + type); } @@ -145,14 +148,14 @@ unsigned paravirt_patch_default(u8 type, 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 +181,7 @@ unsigned paravirt_patch_insns(void *insn 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 +297,22 @@ void arch_flush_lazy_mmu_mode(void) 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 +324,7 @@ struct pv_irq_ops pv_irq_ops = { #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 +385,7 @@ struct pv_cpu_ops pv_cpu_ops = { .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 +399,7 @@ struct pv_apic_ops pv_apic_ops = { #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 +468,12 @@ struct pv_mmu_ops pv_mmu_ops = { }, .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/pci-calgary_64.c linux-2.6.39-pax/arch/x86/kernel/pci-calgary_64.c --- linux-2.6.39/arch/x86/kernel/pci-calgary_64.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/pci-calgary_64.c 2011-05-19 14:23:28.000000000 +0200 @@ -179,13 +179,13 @@ static void calioc2_dump_error_regs(stru static void calgary_init_bitmap_from_tce_table(struct iommu_table *tbl); static void get_tce_space_from_tar(void); -static struct cal_chipset_ops calgary_chip_ops = { +static const struct cal_chipset_ops calgary_chip_ops = { .handle_quirks = calgary_handle_quirks, .tce_cache_blast = calgary_tce_cache_blast, .dump_error_regs = calgary_dump_error_regs }; -static struct cal_chipset_ops calioc2_chip_ops = { +static const struct cal_chipset_ops calioc2_chip_ops = { .handle_quirks = calioc2_handle_quirks, .tce_cache_blast = calioc2_tce_cache_blast, .dump_error_regs = calioc2_dump_error_regs @@ -476,7 +476,7 @@ static void calgary_free_coherent(struct 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/pci-dma.c linux-2.6.39-pax/arch/x86/kernel/pci-dma.c --- linux-2.6.39/arch/x86/kernel/pci-dma.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/pci-dma.c 2011-05-19 14:23:28.000000000 +0200 @@ -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 @@ early_param("iommu", iommu_setup); 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/pci-gart_64.c linux-2.6.39-pax/arch/x86/kernel/pci-gart_64.c --- linux-2.6.39/arch/x86/kernel/pci-gart_64.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/pci-gart_64.c 2011-05-19 14:23:28.000000000 +0200 @@ -695,7 +695,7 @@ static __init int init_amd_gatt(struct a 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/pci-iommu_table.c linux-2.6.39-pax/arch/x86/kernel/pci-iommu_table.c --- linux-2.6.39/arch/x86/kernel/pci-iommu_table.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/pci-iommu_table.c 2011-05-19 13:45:28.000000000 +0200 @@ -2,7 +2,7 @@ #include #include #include - +#include #define DEBUG 1 @@ -53,6 +53,8 @@ void __init check_iommu_entries(struct i char sym_p[KSYM_SYMBOL_LEN]; char sym_q[KSYM_SYMBOL_LEN]; + pax_track_stack(); + /* Simple cyclic dependency checker. */ for (p = start; p < finish; p++) { q = find_dependents_of(start, finish, p); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/pci-nommu.c linux-2.6.39-pax/arch/x86/kernel/pci-nommu.c --- linux-2.6.39/arch/x86/kernel/pci-nommu.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/pci-nommu.c 2011-05-19 14:23:28.000000000 +0200 @@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/pci-swiotlb.c linux-2.6.39-pax/arch/x86/kernel/pci-swiotlb.c --- linux-2.6.39/arch/x86/kernel/pci-swiotlb.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/pci-swiotlb.c 2011-05-19 14:23:28.000000000 +0200 @@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent( 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/process.c linux-2.6.39-pax/arch/x86/kernel/process.c --- linux-2.6.39/arch/x86/kernel/process.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/process.c 2011-05-21 18:56:55.000000000 +0200 @@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru 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_node(int node) +{ + return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node); +} + +void free_task_struct(struct task_struct *task) +{ + free_thread_xstate(task); + kmem_cache_free(task_struct_cachep, task); } /* @@ -70,7 +87,7 @@ void exit_thread(void) 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 @@ void show_regs_common(void) 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); @@ -120,6 +137,9 @@ void flush_thread(void) { 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)); /* @@ -282,10 +302,10 @@ int kernel_thread(int (*fn)(void *), voi 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 @@ -401,7 +421,7 @@ void default_idle(void) EXPORT_SYMBOL(default_idle); #endif -void stop_this_cpu(void *dummy) +__noreturn void stop_this_cpu(void *dummy) { local_irq_disable(); /* @@ -665,16 +685,34 @@ static int __init idle_setup(char *str) } 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 &= 0x3EUL; + time <<= 2; +#elif defined(CONFIG_X86_64) + time &= 0xFUL; + time <<= 4; +#else + time &= 0x1FUL; + 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/process_32.c linux-2.6.39-pax/arch/x86/kernel/process_32.c --- linux-2.6.39/arch/x86/kernel/process_32.c 2011-03-15 19:33:08.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/process_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as 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 @@ void __show_regs(struct pt_regs *regs, i 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,13 +196,14 @@ int copy_thread(unsigned long clone_flag 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; p->thread.sp = (unsigned long) childregs; p->thread.sp0 = (unsigned long) (childregs+1); + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p); p->thread.ip = (unsigned long) ret_from_fork; @@ -293,7 +294,7 @@ __switch_to(struct task_struct *prev_p, 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 +329,10 @@ __switch_to(struct task_struct *prev_p, */ 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 +368,9 @@ __switch_to(struct task_struct *prev_p, */ 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 +380,6 @@ __switch_to(struct task_struct *prev_p, if (prev->gs | next->gs) lazy_load_gs(next->gs); - percpu_write(current_task, next_p); - return prev_p; } @@ -403,4 +409,3 @@ unsigned long get_wchan(struct task_stru } while (count++ < 16); return 0; } - diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/process_64.c linux-2.6.39-pax/arch/x86/kernel/process_64.c --- linux-2.6.39/arch/x86/kernel/process_64.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/process_64.c 2011-05-19 13:45:28.000000000 +0200 @@ -87,7 +87,7 @@ static void __exit_idle(void) void exit_idle(void) { /* idle loop has pid 0 */ - if (current->pid) + if (task_pid_nr(current)) return; __exit_idle(); } @@ -260,8 +260,7 @@ int copy_thread(unsigned long clone_flag 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) - 16; *childregs = *regs; childregs->ax = 0; @@ -273,6 +272,7 @@ int copy_thread(unsigned long clone_flag p->thread.sp = (unsigned long) childregs; p->thread.sp0 = (unsigned long) (childregs+1); p->thread.usersp = me->thread.usersp; + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p); set_tsk_thread_flag(p, TIF_FORK); @@ -376,7 +376,7 @@ __switch_to(struct task_struct *prev_p, 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 +472,9 @@ __switch_to(struct task_struct *prev_p, 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 @@ -537,12 +536,11 @@ unsigned long get_wchan(struct task_stru 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-16-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-16-sizeof(u64)) return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/ptrace.c linux-2.6.39-pax/arch/x86/kernel/ptrace.c --- linux-2.6.39/arch/x86/kernel/ptrace.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/ptrace.c 2011-05-19 13:45:28.000000000 +0200 @@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi 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. */ @@ -906,14 +906,14 @@ long arch_ptrace(struct task_struct *chi 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 @@ -1330,7 +1330,7 @@ static void fill_sigtrap_info(struct tas 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, @@ -1363,7 +1363,7 @@ void send_sigtrap(struct task_struct *ts * 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; @@ -1408,7 +1408,7 @@ asmregparm long syscall_trace_enter(stru 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/pvclock.c linux-2.6.39-pax/arch/x86/kernel/pvclock.c --- linux-2.6.39/arch/x86/kernel/pvclock.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/pvclock.c 2011-05-19 13:45:28.000000000 +0200 @@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc return pv_tsc_khz; } -static atomic64_t last_value = ATOMIC64_INIT(0); +static atomic64_unchecked_t last_value = ATOMIC64_INIT(0); void pvclock_resume(void) { - atomic64_set(&last_value, 0); + atomic64_set_unchecked(&last_value, 0); } cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) @@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct * updating at the same time, and one of them could be slightly behind, * making the assumption that last_value always go forward fail to hold. */ - last = atomic64_read(&last_value); + last = atomic64_read_unchecked(&last_value); do { if (ret < last) return last; - last = atomic64_cmpxchg(&last_value, last, ret); + last = atomic64_cmpxchg_unchecked(&last_value, last, ret); } while (unlikely(last != ret)); return ret; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/reboot.c linux-2.6.39-pax/arch/x86/kernel/reboot.c --- linux-2.6.39/arch/x86/kernel/reboot.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/reboot.c 2011-05-23 01:23:42.000000000 +0200 @@ -35,7 +35,7 @@ void (*pm_power_off)(void); 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; @@ -307,13 +307,17 @@ core_initcall(reboot_init); extern const unsigned char machine_real_restart_asm[]; extern const u64 machine_real_restart_gdt[3]; -void machine_real_restart(unsigned int type) +__noreturn void machine_real_restart(unsigned int type) { void *restart_va; unsigned long restart_pa; - void (*restart_lowmem)(unsigned int); + void (* __noreturn restart_lowmem)(unsigned int); u64 *lowmem_gdt; +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)) + struct desc_struct *gdt; +#endif + local_irq_disable(); /* Write zero to CMOS register number 0x0f, which the BIOS POST @@ -339,14 +343,14 @@ void machine_real_restart(unsigned int t 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; /* Patch the GDT in the low memory trampoline */ lowmem_gdt = TRAMPOLINE_SYM(machine_real_restart_gdt); restart_va = TRAMPOLINE_SYM(machine_real_restart_asm); restart_pa = virt_to_phys(restart_va); - restart_lowmem = (void (*)(unsigned int))restart_pa; + restart_lowmem = (void *)restart_pa; /* GDT[0]: GDT self-pointer */ lowmem_gdt[0] = @@ -357,7 +361,33 @@ void machine_real_restart(unsigned int t GDT_ENTRY(0x009b, restart_pa, 0xffff); /* Jump to the identity-mapped low memory code */ + +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)) + gdt = get_cpu_gdt_table(smp_processor_id()); + pax_open_kernel(); +#ifdef CONFIG_PAX_MEMORY_UDEREF + gdt[GDT_ENTRY_KERNEL_DS].type = 3; + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf; + asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory"); +#endif +#ifdef CONFIG_PAX_KERNEXEC + gdt[GDT_ENTRY_KERNEL_CS].base0 = 0; + gdt[GDT_ENTRY_KERNEL_CS].base1 = 0; + gdt[GDT_ENTRY_KERNEL_CS].base2 = 0; + gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff; + gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf; + gdt[GDT_ENTRY_KERNEL_CS].g = 1; +#endif + pax_close_kernel(); +#endif + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) + asm volatile("push %0; push %1; lret\n" : : "i" (__KERNEL_CS), "rm" (restart_lowmem), "a" (type)); + unreachable(); +#else restart_lowmem(type); +#endif + } #ifdef CONFIG_APM_MODULE EXPORT_SYMBOL(machine_real_restart); @@ -478,7 +508,7 @@ void __attribute__((weak)) mach_reboot_f { } -static void native_machine_emergency_restart(void) +__noreturn static void native_machine_emergency_restart(void) { int i; @@ -593,13 +623,13 @@ void native_machine_shutdown(void) #endif } -static void __machine_emergency_restart(int emergency) +static __noreturn void __machine_emergency_restart(int emergency) { reboot_emergency = emergency; machine_ops.emergency_restart(); } -static void native_machine_restart(char *__unused) +static __noreturn void native_machine_restart(char *__unused) { printk("machine restart\n"); @@ -608,7 +638,7 @@ static void native_machine_restart(char __machine_emergency_restart(0); } -static void native_machine_halt(void) +static __noreturn void native_machine_halt(void) { /* stop other cpus and apics */ machine_shutdown(); @@ -619,7 +649,7 @@ static void native_machine_halt(void) stop_this_cpu(NULL); } -static void native_machine_power_off(void) +__noreturn static void native_machine_power_off(void) { if (pm_power_off) { if (!reboot_force) @@ -628,6 +658,7 @@ static void native_machine_power_off(voi } /* a fallback in case there is no PM info available */ tboot_shutdown(TB_SHUTDOWN_HALT); + unreachable(); } struct machine_ops machine_ops = { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/setup.c linux-2.6.39-pax/arch/x86/kernel/setup.c --- linux-2.6.39/arch/x86/kernel/setup.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/setup.c 2011-05-19 13:45:28.000000000 +0200 @@ -650,7 +650,7 @@ static void __init trim_bios_range(void) * 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); } @@ -775,14 +775,14 @@ void __init setup_arch(char **cmdline_p) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/setup_percpu.c linux-2.6.39-pax/arch/x86/kernel/setup_percpu.c --- linux-2.6.39/arch/x86/kernel/setup_percpu.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/setup_percpu.c 2011-05-19 13:45:28.000000000 +0200 @@ -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 @@ static inline void setup_percpu_segment( { #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 @@ void __init setup_per_cpu_areas(void) /* 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; @@ -247,6 +250,12 @@ void __init setup_per_cpu_areas(void) */ set_cpu_numa_node(cpu, early_cpu_to_node(cpu)); #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/signal.c linux-2.6.39-pax/arch/x86/kernel/signal.c --- linux-2.6.39/arch/x86/kernel/signal.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/signal.c 2011-05-22 11:33:55.000000000 +0200 @@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi * 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 @@ get_sigframe(struct k_sigaction *ka, str * 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 @@ __setup_frame(int sig, struct k_sigactio } 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 @@ __setup_frame(int sig, struct k_sigactio * 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 @@ static int __setup_rt_frame(int sig, str 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 @@ static int __setup_rt_frame(int sig, str * 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) @@ -773,6 +776,8 @@ static void do_signal(struct pt_regs *re int signr; sigset_t *oldset; + pax_track_stack(); + /* * We want the common case to go fast, which is why we may in certain * cases get here from kernel mode. Just return without doing anything @@ -780,7 +785,7 @@ static void do_signal(struct pt_regs *re * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/smpboot.c linux-2.6.39-pax/arch/x86/kernel/smpboot.c --- linux-2.6.39/arch/x86/kernel/smpboot.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/smpboot.c 2011-05-19 13:45:28.000000000 +0200 @@ -696,17 +696,20 @@ static int __cpuinit do_boot_cpu(int api 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) - 16 + 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; @@ -848,6 +851,12 @@ int __cpuinit native_cpu_up(unsigned int 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/step.c linux-2.6.39-pax/arch/x86/kernel/step.c --- linux-2.6.39/arch/x86/kernel/step.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/step.c 2011-05-19 13:45:28.000000000 +0200 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc 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 @@ unsigned long convert_ip_to_linear(struc 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 @@ static int is_setting_trap_flag(struct t 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 @@ static int is_setting_trap_flag(struct t #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/sys_i386_32.c linux-2.6.39-pax/arch/x86/kernel/sys_i386_32.c --- linux-2.6.39/arch/x86/kernel/sys_i386_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/sys_i386_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/sys_x86_64.c linux-2.6.39-pax/arch/x86/kernel/sys_x86_64.c --- linux-2.6.39/arch/x86/kernel/sys_x86_64.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/sys_x86_64.c 2011-05-19 13:45:28.000000000 +0200 @@ -32,8 +32,8 @@ out: 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 @@ static void find_start_end(unsigned long *begin = new_begin; } } else { - *begin = TASK_UNMAPPED_BASE; + *begin = mm->mmap_base; *end = TASK_SIZE; } } @@ -69,16 +69,19 @@ arch_get_unmapped_area(struct file *filp 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 @@ 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: */ @@ -128,7 +131,7 @@ arch_get_unmapped_area_topdown(struct fi { 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 @@ arch_get_unmapped_area_topdown(struct fi 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 @@ arch_get_unmapped_area_topdown(struct fi /* 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 @@ arch_get_unmapped_area_topdown(struct fi * 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 @@ arch_get_unmapped_area_topdown(struct fi 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 @@ bottomup: * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/syscall_table_32.S linux-2.6.39-pax/arch/x86/kernel/syscall_table_32.S --- linux-2.6.39/arch/x86/kernel/syscall_table_32.S 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/syscall_table_32.S 2011-05-19 13:45:28.000000000 +0200 @@ -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 diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/tboot.c linux-2.6.39-pax/arch/x86/kernel/tboot.c --- linux-2.6.39/arch/x86/kernel/tboot.c 2011-03-15 19:33:08.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/tboot.c 2011-05-21 19:00:42.000000000 +0200 @@ -218,7 +218,7 @@ static int tboot_setup_sleep(void) void tboot_shutdown(u32 shutdown_type) { - void (*shutdown)(void); + void (* __noreturn shutdown)(void); if (!tboot_enabled()) return; @@ -240,7 +240,7 @@ void tboot_shutdown(u32 shutdown_type) switch_to_tboot_pt(); - shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry; + shutdown = (void *)tboot->shutdown_entry; shutdown(); /* should not reach here */ @@ -297,7 +297,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1 tboot_shutdown(acpi_shutdown_map[sleep_state]); } -static atomic_t ap_wfs_count; +static atomic_unchecked_t ap_wfs_count; static int tboot_wait_for_aps(int num_aps) { @@ -321,9 +321,9 @@ static int __cpuinit tboot_cpu_callback( { switch (action) { case CPU_DYING: - atomic_inc(&ap_wfs_count); + atomic_inc_unchecked(&ap_wfs_count); if (num_online_cpus() == 1) - if (tboot_wait_for_aps(atomic_read(&ap_wfs_count))) + if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count))) return NOTIFY_BAD; break; } @@ -342,7 +342,7 @@ static __init int tboot_late_init(void) tboot_create_trampoline(); - atomic_set(&ap_wfs_count, 0); + atomic_set_unchecked(&ap_wfs_count, 0); register_hotcpu_notifier(&tboot_cpu_notifier); return 0; } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/time.c linux-2.6.39-pax/arch/x86/kernel/time.c --- linux-2.6.39/arch/x86/kernel/time.c 2011-03-15 19:33:08.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/time.c 2011-05-19 13:45:28.000000000 +0200 @@ -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 @@ unsigned long profile_pc(struct pt_regs * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/tls.c linux-2.6.39-pax/arch/x86/kernel/tls.c --- linux-2.6.39/arch/x86/kernel/tls.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/tls.c 2011-05-19 13:45:28.000000000 +0200 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/trampoline_32.S linux-2.6.39-pax/arch/x86/kernel/trampoline_32.S --- linux-2.6.39/arch/x86/kernel/trampoline_32.S 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/trampoline_32.S 2011-05-19 13:45:28.000000000 +0200 @@ -32,6 +32,12 @@ #include #include +#ifdef CONFIG_PAX_KERNEXEC +#define ta(X) (X) +#else +#define ta(X) ((X) - __PAGE_OFFSET) +#endif + #ifdef CONFIG_SMP .section ".x86_trampoline","a" @@ -62,7 +68,7 @@ r_base = . 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/trampoline_64.S linux-2.6.39-pax/arch/x86/kernel/trampoline_64.S --- linux-2.6.39/arch/x86/kernel/trampoline_64.S 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/trampoline_64.S 2011-05-19 13:45:28.000000000 +0200 @@ -90,7 +90,7 @@ startup_32: 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 @@ tidt: # 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/traps.c linux-2.6.39-pax/arch/x86/kernel/traps.c --- linux-2.6.39/arch/x86/kernel/traps.c 2011-03-15 19:33:08.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/traps.c 2011-05-19 13:45:28.000000000 +0200 @@ -70,12 +70,6 @@ asmlinkage int system_call(void); /* 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 inline void preempt_conditional_c } 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 @@ do_trap(int trapnr, int signr, char *str } #endif - if (!user_mode(regs)) + if (!user_mode_novm(regs)) goto kernel_trap; #ifdef CONFIG_X86_32 @@ -157,7 +151,7 @@ trap_signal: 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 @@ kernel_trap: 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 @@ do_general_protection(struct pt_regs *re 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 @@ gp_in_kernel: 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 @@ dotraplinkage void __kprobes do_debug(st /* 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 @@ dotraplinkage void __kprobes do_debug(st * 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 @@ void math_error(struct pt_regs *regs, in 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 @@ asmlinkage void __attribute__((weak)) sm 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 @@ void __math_state_restore(void) */ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/vm86_32.c linux-2.6.39-pax/arch/x86/kernel/vm86_32.c --- linux-2.6.39/arch/x86/kernel/vm86_32.c 2011-03-15 19:33:08.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/vm86_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -148,7 +148,7 @@ struct pt_regs *save_v86_state(struct ke 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); @@ -324,7 +324,7 @@ static void do_sys_vm86(struct kernel_vm 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 +529,7 @@ static void do_int(struct kernel_vm86_re 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/vmlinux.lds.S linux-2.6.39-pax/arch/x86/kernel/vmlinux.lds.S --- linux-2.6.39/arch/x86/kernel/vmlinux.lds.S 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/vmlinux.lds.S 2011-05-19 13:45:28.000000000 +0200 @@ -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 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF #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 @@ jiffies_64 = jiffies; 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); @@ -109,13 +129,47 @@ SECTIONS 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 */ @@ -127,16 +181,20 @@ SECTIONS /* 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) @@ -145,6 +203,8 @@ SECTIONS DATA_DATA CONSTRUCTORS + jiffies = jiffies_64; + /* rarely changed data like cpu maps */ READ_MOSTLY_DATA(INTERNODE_CACHE_BYTES) @@ -199,12 +259,6 @@ SECTIONS } 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) } @@ -220,12 +274,19 @@ SECTIONS #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 @@ -234,12 +295,27 @@ SECTIONS PERCPU_VADDR(INTERNODE_CACHE_BYTES, 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 /* * Code and data for a variety of lowlevel trampolines, to be @@ -306,19 +382,12 @@ SECTIONS } . = 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(INTERNODE_CACHE_BYTES, PAGE_SIZE) #endif @@ -337,16 +406,10 @@ SECTIONS .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) { @@ -362,6 +425,7 @@ SECTIONS __brk_base = .; . += 64 * 1024; /* 64k alignment slop space */ *(.brk_reservation) /* areas brk users have reserved */ + . = ALIGN(HPAGE_SIZE); __brk_limit = .; } @@ -388,13 +452,12 @@ SECTIONS * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/vsyscall_64.c linux-2.6.39-pax/arch/x86/kernel/vsyscall_64.c --- linux-2.6.39/arch/x86/kernel/vsyscall_64.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/kernel/vsyscall_64.c 2011-05-19 13:45:28.000000000 +0200 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa 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 @@ vgetcpu(unsigned *cpu, unsigned *node, s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.39-pax/arch/x86/kernel/x8664_ksyms_64.c --- linux-2.6.39/arch/x86/kernel/x8664_ksyms_64.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/x8664_ksyms_64.c 2011-05-19 13:45:28.000000000 +0200 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8); 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kernel/xsave.c linux-2.6.39-pax/arch/x86/kernel/xsave.c --- linux-2.6.39/arch/x86/kernel/xsave.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kernel/xsave.c 2011-05-19 13:45:28.000000000 +0200 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_ 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 @@ fx_only: * 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 @@ int restore_i387_xstate(void __user *buf 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kvm/emulate.c linux-2.6.39-pax/arch/x86/kvm/emulate.c --- linux-2.6.39/arch/x86/kvm/emulate.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kvm/emulate.c 2011-05-19 13:45:28.000000000 +0200 @@ -89,7 +89,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 @@ -190,6 +190,7 @@ struct group_dual { #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; " \ @@ -203,8 +204,6 @@ struct group_dual { /* 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);\ @@ -220,7 +219,6 @@ struct group_dual { #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kvm/lapic.c linux-2.6.39-pax/arch/x86/kvm/lapic.c --- linux-2.6.39/arch/x86/kvm/lapic.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kvm/lapic.c 2011-05-19 13:45:28.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kvm/mmu.c linux-2.6.39-pax/arch/x86/kvm/mmu.c --- linux-2.6.39/arch/x86/kvm/mmu.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kvm/mmu.c 2011-05-19 13:45:28.000000000 +0200 @@ -3240,7 +3240,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu * pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes); - invlpg_counter = atomic_read(&vcpu->kvm->arch.invlpg_counter); + invlpg_counter = atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter); /* * Assume that the pte write on a page table of the same type @@ -3275,7 +3275,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu * smp_rmb(); spin_lock(&vcpu->kvm->mmu_lock); - if (atomic_read(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter) + if (atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter) gentry = 0; kvm_mmu_free_some_pages(vcpu); ++vcpu->kvm->stat.mmu_pte_write; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kvm/paging_tmpl.h linux-2.6.39-pax/arch/x86/kvm/paging_tmpl.h --- linux-2.6.39/arch/x86/kvm/paging_tmpl.h 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kvm/paging_tmpl.h 2011-05-19 13:45:28.000000000 +0200 @@ -552,6 +552,8 @@ static int FNAME(page_fault)(struct kvm_ unsigned long mmu_seq; bool map_writable; + pax_track_stack(); + pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code); r = mmu_topup_memory_caches(vcpu); @@ -672,7 +674,7 @@ static void FNAME(invlpg)(struct kvm_vcp if (need_flush) kvm_flush_remote_tlbs(vcpu->kvm); - atomic_inc(&vcpu->kvm->arch.invlpg_counter); + atomic_inc_unchecked(&vcpu->kvm->arch.invlpg_counter); spin_unlock(&vcpu->kvm->mmu_lock); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kvm/svm.c linux-2.6.39-pax/arch/x86/kvm/svm.c --- linux-2.6.39/arch/x86/kvm/svm.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kvm/svm.c 2011-05-19 13:45:28.000000000 +0200 @@ -3278,7 +3278,11 @@ static void reload_tss(struct kvm_vcpu * 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(); } @@ -3656,6 +3660,10 @@ static void svm_vcpu_run(struct kvm_vcpu #endif #endif +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) + __set_fs(current_thread_info()->addr_limit); +#endif + reload_tss(vcpu); local_irq_disable(); @@ -3871,7 +3879,7 @@ static void svm_fpu_deactivate(struct kv 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kvm/vmx.c linux-2.6.39-pax/arch/x86/kvm/vmx.c --- linux-2.6.39/arch/x86/kvm/vmx.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kvm/vmx.c 2011-05-19 13:45:28.000000000 +0200 @@ -725,7 +725,11 @@ static void reload_tss(void) 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(); } @@ -1648,8 +1652,11 @@ static __init int hardware_setup(void) 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(); @@ -2693,7 +2700,7 @@ static int vmx_vcpu_setup(struct vcpu_vm 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)); @@ -4068,6 +4075,12 @@ static void __noclone vmx_vcpu_run(struc "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 */ "mov %0, %c[wordsize](%%"R"sp) \n\t" "pop %0 \n\t" @@ -4116,6 +4129,11 @@ static void __noclone vmx_vcpu_run(struc #endif [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)), [wordsize]"i"(sizeof(ulong)) + +#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 @@ -4130,7 +4148,16 @@ static void __noclone vmx_vcpu_run(struc 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) + loadsegment(fs, __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); @@ -4368,7 +4395,7 @@ static void vmx_set_supported_cpuid(u32 { } -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/kvm/x86.c linux-2.6.39-pax/arch/x86/kvm/x86.c --- linux-2.6.39/arch/x86/kvm/x86.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/kvm/x86.c 2011-05-19 14:23:27.000000000 +0200 @@ -94,7 +94,7 @@ static void update_cr8_intercept(struct 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; @@ -2050,6 +2050,8 @@ long kvm_arch_dev_ioctl(struct file *fil 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; @@ -2217,15 +2219,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str 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); @@ -2240,15 +2247,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(str 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: @@ -2526,7 +2537,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru 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; @@ -4672,7 +4683,7 @@ static unsigned long kvm_get_guest_ip(vo return ip; } -static struct perf_guest_info_callbacks kvm_guest_cbs = { +static const struct perf_guest_info_callbacks kvm_guest_cbs = { .is_in_guest = kvm_is_in_guest, .is_user_mode = kvm_is_user_mode, .get_guest_ip = kvm_get_guest_ip, @@ -4690,10 +4701,10 @@ void kvm_after_handle_nmi(struct kvm_vcp } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/atomic64_32.c linux-2.6.39-pax/arch/x86/lib/atomic64_32.c --- linux-2.6.39/arch/x86/lib/atomic64_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/lib/atomic64_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -8,18 +8,30 @@ long long atomic64_read_cx8(long long, const atomic64_t *v); EXPORT_SYMBOL(atomic64_read_cx8); +long long atomic64_read_unchecked_cx8(long long, const atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_read_unchecked_cx8); long long atomic64_set_cx8(long long, const atomic64_t *v); EXPORT_SYMBOL(atomic64_set_cx8); +long long atomic64_set_unchecked_cx8(long long, const atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_set_unchecked_cx8); long long atomic64_xchg_cx8(long long, unsigned high); EXPORT_SYMBOL(atomic64_xchg_cx8); long long atomic64_add_return_cx8(long long a, atomic64_t *v); EXPORT_SYMBOL(atomic64_add_return_cx8); +long long atomic64_add_return_unchecked_cx8(long long a, atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_add_return_unchecked_cx8); long long atomic64_sub_return_cx8(long long a, atomic64_t *v); EXPORT_SYMBOL(atomic64_sub_return_cx8); +long long atomic64_sub_return_unchecked_cx8(long long a, atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_sub_return_unchecked_cx8); long long atomic64_inc_return_cx8(long long a, atomic64_t *v); EXPORT_SYMBOL(atomic64_inc_return_cx8); +long long atomic64_inc_return_unchecked_cx8(long long a, atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_inc_return_unchecked_cx8); long long atomic64_dec_return_cx8(long long a, atomic64_t *v); EXPORT_SYMBOL(atomic64_dec_return_cx8); +long long atomic64_dec_return_unchecked_cx8(long long a, atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_dec_return_unchecked_cx8); long long atomic64_dec_if_positive_cx8(atomic64_t *v); EXPORT_SYMBOL(atomic64_dec_if_positive_cx8); int atomic64_inc_not_zero_cx8(atomic64_t *v); @@ -30,26 +42,46 @@ EXPORT_SYMBOL(atomic64_add_unless_cx8); #ifndef CONFIG_X86_CMPXCHG64 long long atomic64_read_386(long long, const atomic64_t *v); EXPORT_SYMBOL(atomic64_read_386); +long long atomic64_read_unchecked_386(long long, const atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_read_unchecked_386); long long atomic64_set_386(long long, const atomic64_t *v); EXPORT_SYMBOL(atomic64_set_386); +long long atomic64_set_unchecked_386(long long, const atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_set_unchecked_386); long long atomic64_xchg_386(long long, unsigned high); EXPORT_SYMBOL(atomic64_xchg_386); long long atomic64_add_return_386(long long a, atomic64_t *v); EXPORT_SYMBOL(atomic64_add_return_386); +long long atomic64_add_return_unchecked_386(long long a, atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_add_return_unchecked_386); long long atomic64_sub_return_386(long long a, atomic64_t *v); EXPORT_SYMBOL(atomic64_sub_return_386); +long long atomic64_sub_return_unchecked_386(long long a, atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_sub_return_unchecked_386); long long atomic64_inc_return_386(long long a, atomic64_t *v); EXPORT_SYMBOL(atomic64_inc_return_386); +long long atomic64_inc_return_unchecked_386(long long a, atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_inc_return_unchecked_386); long long atomic64_dec_return_386(long long a, atomic64_t *v); EXPORT_SYMBOL(atomic64_dec_return_386); +long long atomic64_dec_return_unchecked_386(long long a, atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_dec_return_unchecked_386); long long atomic64_add_386(long long a, atomic64_t *v); EXPORT_SYMBOL(atomic64_add_386); +long long atomic64_add_unchecked_386(long long a, atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_add_unchecked_386); long long atomic64_sub_386(long long a, atomic64_t *v); EXPORT_SYMBOL(atomic64_sub_386); +long long atomic64_sub_unchecked_386(long long a, atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_sub_unchecked_386); long long atomic64_inc_386(long long a, atomic64_t *v); EXPORT_SYMBOL(atomic64_inc_386); +long long atomic64_inc_unchecked_386(long long a, atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_inc_unchecked_386); long long atomic64_dec_386(long long a, atomic64_t *v); EXPORT_SYMBOL(atomic64_dec_386); +long long atomic64_dec_unchecked_386(long long a, atomic64_unchecked_t *v); +EXPORT_SYMBOL(atomic64_dec_unchecked_386); long long atomic64_dec_if_positive_386(atomic64_t *v); EXPORT_SYMBOL(atomic64_dec_if_positive_386); int atomic64_inc_not_zero_386(atomic64_t *v); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/atomic64_386_32.S linux-2.6.39-pax/arch/x86/lib/atomic64_386_32.S --- linux-2.6.39/arch/x86/lib/atomic64_386_32.S 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/lib/atomic64_386_32.S 2011-05-19 13:45:28.000000000 +0200 @@ -48,6 +48,10 @@ BEGIN(read) movl (v), %eax movl 4(v), %edx RET_ENDP +BEGIN(read_unchecked) + movl (v), %eax + movl 4(v), %edx +RET_ENDP #undef v #define v %esi @@ -55,6 +59,10 @@ BEGIN(set) movl %ebx, (v) movl %ecx, 4(v) RET_ENDP +BEGIN(set_unchecked) + movl %ebx, (v) + movl %ecx, 4(v) +RET_ENDP #undef v #define v %esi @@ -70,6 +78,20 @@ RET_ENDP BEGIN(add) addl %eax, (v) adcl %edx, 4(v) + +#ifdef CONFIG_PAX_REFCOUNT + jno 0f + subl %eax, (v) + sbbl %edx, 4(v) + int $4 +0: + _ASM_EXTABLE(0b, 0b) +#endif + +RET_ENDP +BEGIN(add_unchecked) + addl %eax, (v) + adcl %edx, 4(v) RET_ENDP #undef v @@ -77,6 +99,24 @@ RET_ENDP BEGIN(add_return) addl (v), %eax adcl 4(v), %edx + +#ifdef CONFIG_PAX_REFCOUNT + into +1234: + _ASM_EXTABLE(1234b, 2f) +#endif + + movl %eax, (v) + movl %edx, 4(v) + +#ifdef CONFIG_PAX_REFCOUNT +2: +#endif + +RET_ENDP +BEGIN(add_return_unchecked) + addl (v), %eax + adcl 4(v), %edx movl %eax, (v) movl %edx, 4(v) RET_ENDP @@ -86,6 +126,20 @@ RET_ENDP BEGIN(sub) subl %eax, (v) sbbl %edx, 4(v) + +#ifdef CONFIG_PAX_REFCOUNT + jno 0f + addl %eax, (v) + adcl %edx, 4(v) + int $4 +0: + _ASM_EXTABLE(0b, 0b) +#endif + +RET_ENDP +BEGIN(sub_unchecked) + subl %eax, (v) + sbbl %edx, 4(v) RET_ENDP #undef v @@ -96,6 +150,27 @@ BEGIN(sub_return) sbbl $0, %edx addl (v), %eax adcl 4(v), %edx + +#ifdef CONFIG_PAX_REFCOUNT + into +1234: + _ASM_EXTABLE(1234b, 2f) +#endif + + movl %eax, (v) + movl %edx, 4(v) + +#ifdef CONFIG_PAX_REFCOUNT +2: +#endif + +RET_ENDP +BEGIN(sub_return_unchecked) + negl %edx + negl %eax + sbbl $0, %edx + addl (v), %eax + adcl 4(v), %edx movl %eax, (v) movl %edx, 4(v) RET_ENDP @@ -105,6 +180,20 @@ RET_ENDP BEGIN(inc) addl $1, (v) adcl $0, 4(v) + +#ifdef CONFIG_PAX_REFCOUNT + jno 0f + subl $1, (v) + sbbl $0, 4(v) + int $4 +0: + _ASM_EXTABLE(0b, 0b) +#endif + +RET_ENDP +BEGIN(inc_unchecked) + addl $1, (v) + adcl $0, 4(v) RET_ENDP #undef v @@ -114,6 +203,26 @@ BEGIN(inc_return) movl 4(v), %edx addl $1, %eax adcl $0, %edx + +#ifdef CONFIG_PAX_REFCOUNT + into +1234: + _ASM_EXTABLE(1234b, 2f) +#endif + + movl %eax, (v) + movl %edx, 4(v) + +#ifdef CONFIG_PAX_REFCOUNT +2: +#endif + +RET_ENDP +BEGIN(inc_return_unchecked) + movl (v), %eax + movl 4(v), %edx + addl $1, %eax + adcl $0, %edx movl %eax, (v) movl %edx, 4(v) RET_ENDP @@ -123,6 +232,20 @@ RET_ENDP BEGIN(dec) subl $1, (v) sbbl $0, 4(v) + +#ifdef CONFIG_PAX_REFCOUNT + jno 0f + addl $1, (v) + adcl $0, 4(v) + int $4 +0: + _ASM_EXTABLE(0b, 0b) +#endif + +RET_ENDP +BEGIN(dec_unchecked) + subl $1, (v) + sbbl $0, 4(v) RET_ENDP #undef v @@ -132,6 +255,26 @@ BEGIN(dec_return) movl 4(v), %edx subl $1, %eax sbbl $0, %edx + +#ifdef CONFIG_PAX_REFCOUNT + into +1234: + _ASM_EXTABLE(1234b, 2f) +#endif + + movl %eax, (v) + movl %edx, 4(v) + +#ifdef CONFIG_PAX_REFCOUNT +2: +#endif + +RET_ENDP +BEGIN(dec_return_unchecked) + movl (v), %eax + movl 4(v), %edx + subl $1, %eax + sbbl $0, %edx movl %eax, (v) movl %edx, 4(v) RET_ENDP @@ -143,6 +286,13 @@ BEGIN(add_unless) adcl %edx, %edi addl (v), %eax adcl 4(v), %edx + +#ifdef CONFIG_PAX_REFCOUNT + into +1234: + _ASM_EXTABLE(1234b, 2f) +#endif + cmpl %eax, %esi je 3f 1: @@ -168,6 +318,13 @@ BEGIN(inc_not_zero) 1: addl $1, %eax adcl $0, %edx + +#ifdef CONFIG_PAX_REFCOUNT + into +1234: + _ASM_EXTABLE(1234b, 2f) +#endif + movl %eax, (v) movl %edx, 4(v) movl $1, %eax @@ -186,6 +343,13 @@ BEGIN(dec_if_positive) movl 4(v), %edx subl $1, %eax sbbl $0, %edx + +#ifdef CONFIG_PAX_REFCOUNT + into +1234: + _ASM_EXTABLE(1234b, 1f) +#endif + js 1f movl %eax, (v) movl %edx, 4(v) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/atomic64_cx8_32.S linux-2.6.39-pax/arch/x86/lib/atomic64_cx8_32.S --- linux-2.6.39/arch/x86/lib/atomic64_cx8_32.S 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/lib/atomic64_cx8_32.S 2011-05-19 13:45:28.000000000 +0200 @@ -39,6 +39,14 @@ ENTRY(atomic64_read_cx8) CFI_ENDPROC ENDPROC(atomic64_read_cx8) +ENTRY(atomic64_read_unchecked_cx8) + CFI_STARTPROC + + read64 %ecx + ret + CFI_ENDPROC +ENDPROC(atomic64_read_unchecked_cx8) + ENTRY(atomic64_set_cx8) CFI_STARTPROC @@ -52,6 +60,19 @@ ENTRY(atomic64_set_cx8) CFI_ENDPROC ENDPROC(atomic64_set_cx8) +ENTRY(atomic64_set_unchecked_cx8) + CFI_STARTPROC + +1: +/* we don't need LOCK_PREFIX since aligned 64-bit writes + * are atomic on 586 and newer */ + cmpxchg8b (%esi) + jne 1b + + ret + CFI_ENDPROC +ENDPROC(atomic64_set_unchecked_cx8) + ENTRY(atomic64_xchg_cx8) CFI_STARTPROC @@ -66,8 +87,8 @@ ENTRY(atomic64_xchg_cx8) CFI_ENDPROC ENDPROC(atomic64_xchg_cx8) -.macro addsub_return func ins insc -ENTRY(atomic64_\func\()_return_cx8) +.macro addsub_return func ins insc unchecked="" +ENTRY(atomic64_\func\()_return\unchecked\()_cx8) CFI_STARTPROC SAVE ebp SAVE ebx @@ -84,27 +105,43 @@ ENTRY(atomic64_\func\()_return_cx8) movl %edx, %ecx \ins\()l %esi, %ebx \insc\()l %edi, %ecx + +.ifb \unchecked +#ifdef CONFIG_PAX_REFCOUNT + into +2: + _ASM_EXTABLE(2b, 3f) +#endif +.endif + LOCK_PREFIX cmpxchg8b (%ebp) jne 1b - -10: movl %ebx, %eax movl %ecx, %edx + +.ifb \unchecked +#ifdef CONFIG_PAX_REFCOUNT +3: +#endif +.endif + RESTORE edi RESTORE esi RESTORE ebx RESTORE ebp ret CFI_ENDPROC -ENDPROC(atomic64_\func\()_return_cx8) +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8) .endm addsub_return add add adc addsub_return sub sub sbb +addsub_return add add adc _unchecked +addsub_return sub sub sbb _unchecked -.macro incdec_return func ins insc -ENTRY(atomic64_\func\()_return_cx8) +.macro incdec_return func ins insc unchecked +ENTRY(atomic64_\func\()_return\unchecked\()_cx8) CFI_STARTPROC SAVE ebx @@ -114,21 +151,38 @@ ENTRY(atomic64_\func\()_return_cx8) movl %edx, %ecx \ins\()l $1, %ebx \insc\()l $0, %ecx + +.ifb \unchecked +#ifdef CONFIG_PAX_REFCOUNT + into +2: + _ASM_EXTABLE(2b, 3f) +#endif +.endif + LOCK_PREFIX cmpxchg8b (%esi) jne 1b -10: movl %ebx, %eax movl %ecx, %edx + +.ifb \unchecked +#ifdef CONFIG_PAX_REFCOUNT +3: +#endif +.endif + RESTORE ebx ret CFI_ENDPROC -ENDPROC(atomic64_\func\()_return_cx8) +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8) .endm incdec_return inc add adc incdec_return dec sub sbb +incdec_return inc add adc _unchecked +incdec_return dec sub sbb _unchecked ENTRY(atomic64_dec_if_positive_cx8) CFI_STARTPROC @@ -140,6 +194,13 @@ ENTRY(atomic64_dec_if_positive_cx8) movl %edx, %ecx subl $1, %ebx sbb $0, %ecx + +#ifdef CONFIG_PAX_REFCOUNT + into +1234: + _ASM_EXTABLE(1234b, 2f) +#endif + js 2f LOCK_PREFIX cmpxchg8b (%esi) @@ -174,6 +235,13 @@ ENTRY(atomic64_add_unless_cx8) movl %edx, %ecx addl %esi, %ebx adcl %edi, %ecx + +#ifdef CONFIG_PAX_REFCOUNT + into +1234: + _ASM_EXTABLE(1234b, 3f) +#endif + LOCK_PREFIX cmpxchg8b (%ebp) jne 1b @@ -206,6 +274,13 @@ ENTRY(atomic64_inc_not_zero_cx8) movl %edx, %ecx addl $1, %ebx adcl $0, %ecx + +#ifdef CONFIG_PAX_REFCOUNT + into +1234: + _ASM_EXTABLE(1234b, 3f) +#endif + LOCK_PREFIX cmpxchg8b (%esi) jne 1b diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/checksum_32.S linux-2.6.39-pax/arch/x86/lib/checksum_32.S --- linux-2.6.39/arch/x86/lib/checksum_32.S 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/lib/checksum_32.S 2011-05-19 13:45:28.000000000 +0200 @@ -28,7 +28,8 @@ #include #include #include - +#include + /* * computes a partial checksum, e.g. for TCP/UDP fragments */ @@ -296,9 +297,24 @@ unsigned int csum_partial_copy_generic ( #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_cfi %gs + popl_cfi %es + jmp csum_partial_copy_generic +#endif + +ENTRY(csum_partial_copy_generic_from_user) + +#ifdef CONFIG_PAX_MEMORY_UDEREF + pushl_cfi %gs + popl_cfi %ds +#endif + +ENTRY(csum_partial_copy_generic) subl $4,%esp CFI_ADJUST_CFA_OFFSET 4 pushl_cfi %edi @@ -320,7 +336,7 @@ ENTRY(csum_partial_copy_generic) 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 @@ -332,30 +348,30 @@ DST( movw %bx, (%edi) ) 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 @@ -369,7 +385,7 @@ DST( movl %edx, 28(%edi) ) 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 @@ -381,12 +397,12 @@ DST( movl %ebx, (%edi) ) 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: @@ -397,7 +413,7 @@ DST( movb %cl, (%edi) ) 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 @@ -410,11 +426,15 @@ DST( movb %cl, (%edi) ) 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr - movl $-EFAULT,(%ebx) + movl $-EFAULT,%ss:(%ebx) jmp 5000b .previous + pushl_cfi %ss + popl_cfi %ds + pushl_cfi %ss + popl_cfi %es popl_cfi %ebx CFI_RESTORE ebx popl_cfi %esi @@ -424,26 +444,43 @@ DST( movb %cl, (%edi) ) popl_cfi %ecx # equivalent to addl $4,%esp 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_cfi %gs + popl_cfi %es + jmp csum_partial_copy_generic +#endif + +ENTRY(csum_partial_copy_generic_from_user) + +#ifdef CONFIG_PAX_MEMORY_UDEREF + pushl_cfi %gs + popl_cfi %ds +#endif + +ENTRY(csum_partial_copy_generic) pushl_cfi %ebx CFI_REL_OFFSET ebx, 0 pushl_cfi %edi @@ -464,7 +501,7 @@ ENTRY(csum_partial_copy_generic) 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 @@ -485,19 +522,19 @@ ENTRY(csum_partial_copy_generic) 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 @@ -505,10 +542,17 @@ DST( movb %dl, (%edi) ) 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_cfi %ss + popl_cfi %ds + pushl_cfi %ss + popl_cfi %es +#endif + popl_cfi %esi CFI_RESTORE esi popl_cfi %edi @@ -517,7 +561,7 @@ DST( movb %dl, (%edi) ) CFI_RESTORE ebx ret CFI_ENDPROC -ENDPROC(csum_partial_copy_generic) +ENDPROC(csum_partial_copy_generic_to_user) #undef ROUND #undef ROUND1 diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/clear_page_64.S linux-2.6.39-pax/arch/x86/lib/clear_page_64.S --- linux-2.6.39/arch/x86/lib/clear_page_64.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/lib/clear_page_64.S 2011-05-19 13:45:28.000000000 +0200 @@ -43,7 +43,7 @@ ENDPROC(clear_page) #include - .section .altinstr_replacement,"ax" + .section .altinstr_replacement,"a" 1: .byte 0xeb /* jmp */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/copy_page_64.S linux-2.6.39-pax/arch/x86/lib/copy_page_64.S --- linux-2.6.39/arch/x86/lib/copy_page_64.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/lib/copy_page_64.S 2011-05-19 13:45:28.000000000 +0200 @@ -104,7 +104,7 @@ ENDPROC(copy_page) #include - .section .altinstr_replacement,"ax" + .section .altinstr_replacement,"a" 1: .byte 0xeb /* jmp */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/copy_user_64.S linux-2.6.39-pax/arch/x86/lib/copy_user_64.S --- linux-2.6.39/arch/x86/lib/copy_user_64.S 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/lib/copy_user_64.S 2011-05-19 13:45:28.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/copy_user_nocache_64.S linux-2.6.39-pax/arch/x86/lib/copy_user_nocache_64.S --- linux-2.6.39/arch/x86/lib/copy_user_nocache_64.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/lib/copy_user_nocache_64.S 2011-05-19 13:45:28.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/csum-wrappers_64.c linux-2.6.39-pax/arch/x86/lib/csum-wrappers_64.c --- linux-2.6.39/arch/x86/lib/csum-wrappers_64.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/lib/csum-wrappers_64.c 2011-05-19 13:45:28.000000000 +0200 @@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _ len -= 2; } } + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if ((unsigned long)src < PAX_USER_SHADOW_BASE) + src += PAX_USER_SHADOW_BASE; +#endif + isum = csum_partial_copy_generic((__force const void *)src, dst, len, isum, errp, NULL); if (unlikely(*errp)) @@ -105,6 +111,12 @@ csum_partial_copy_to_user(const void *sr } *errp = 0; + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if ((unsigned long)dst < PAX_USER_SHADOW_BASE) + dst += PAX_USER_SHADOW_BASE; +#endif + return csum_partial_copy_generic(src, (void __force *)dst, len, isum, NULL, errp); } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/getuser.S linux-2.6.39-pax/arch/x86/lib/getuser.S --- linux-2.6.39/arch/x86/lib/getuser.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/lib/getuser.S 2011-05-19 13:45:28.000000000 +0200 @@ -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 @@ ENDPROC(__get_user_1) 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 @@ ENDPROC(__get_user_2) 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 @@ ENTRY(__get_user_8) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/insn.c linux-2.6.39-pax/arch/x86/lib/insn.c --- linux-2.6.39/arch/x86/lib/insn.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/lib/insn.c 2011-05-19 13:45:28.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/mmx_32.c linux-2.6.39-pax/arch/x86/lib/mmx_32.c --- linux-2.6.39/arch/x86/lib/mmx_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/lib/mmx_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; int i; + unsigned long cr0; if (unlikely(in_interrupt())) return __memcpy(to, from, len); @@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void * 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_clear_page(void *page) static void fast_copy_page(void *to, void *from) { int i; + unsigned long cr0; kernel_fpu_begin(); @@ -166,42 +196,70 @@ static void fast_copy_page(void *to, voi * 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_clear_page(void *page) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/putuser.S linux-2.6.39-pax/arch/x86/lib/putuser.S --- linux-2.6.39/arch/x86/lib/putuser.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/lib/putuser.S 2011-05-19 13:45:28.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/usercopy_32.c linux-2.6.39-pax/arch/x86/lib/usercopy_32.c --- linux-2.6.39/arch/x86/lib/usercopy_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/lib/usercopy_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -43,7 +43,7 @@ do { \ __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 @@ do { \ 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 @@ long strnlen_user(const char __user *s, might_fault(); __asm__ __volatile__( + __COPYUSER_SET_ES " testl %0, %0\n" " jz 3f\n" " andl %0,%%ecx\n" @@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, " 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 @@ EXPORT_SYMBOL(strnlen_user); #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 @@ __copy_user_intel(void __user *to, const " .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 @@ __copy_user_intel(void __user *to, const " 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 @@ __copy_user_zeroing_intel(void *to, cons 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 @@ __copy_user_zeroing_intel(void *to, cons " 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 @@ static unsigned long __copy_user_zeroing __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 @@ static unsigned long __copy_user_zeroing " 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 @@ static unsigned long __copy_user_intel_n __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 @@ static unsigned long __copy_user_intel_n " 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 @@ static unsigned long __copy_user_intel_n */ 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 @@ do { \ " 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 @@ survive: } #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 __copy_from_user_ll_nozero 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 @@ unsigned long __copy_from_user_ll_nocach 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/lib/usercopy_64.c linux-2.6.39-pax/arch/x86/lib/usercopy_64.c --- linux-2.6.39/arch/x86/lib/usercopy_64.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/lib/usercopy_64.c 2011-05-19 13:45:28.000000000 +0200 @@ -42,6 +42,12 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { long res; + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if ((unsigned long)src < PAX_USER_SHADOW_BASE) + src += PAX_USER_SHADOW_BASE; +#endif + __do_strncpy_from_user(dst, src, count, res); return res; } @@ -65,6 +71,12 @@ unsigned long __clear_user(void __user * { long __d0; might_fault(); + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if ((unsigned long)addr < PAX_USER_SHADOW_BASE) + addr += PAX_USER_SHADOW_BASE; +#endif + /* no memory constraint because it doesn't change any memory gcc knows about */ asm volatile( @@ -151,10 +163,18 @@ EXPORT_SYMBOL(strlen_user); 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)) { + +#ifdef CONFIG_PAX_MEMORY_UDEREF + 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; +#endif + return copy_user_generic((__force void *)to, (__force void *)from, len); - } - return len; + } + return len; } EXPORT_SYMBOL(copy_in_user); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/extable.c linux-2.6.39-pax/arch/x86/mm/extable.c --- linux-2.6.39/arch/x86/mm/extable.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/extable.c 2011-05-19 13:45:28.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/fault.c linux-2.6.39-pax/arch/x86/mm/fault.c --- linux-2.6.39/arch/x86/mm/fault.c 2011-03-15 19:33:08.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/fault.c 2011-05-21 12:16:51.000000000 +0200 @@ -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 @@ static inline int __kprobes notify_page_ 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 @@ check_prefetch_opcode(struct pt_regs *re 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 @@ is_prefetch(struct pt_regs *regs, unsign 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_fault(int si_signo, int s 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 @@ void vmalloc_sync_all(void) 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 @@ void vmalloc_sync_all(void) 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 @@ static noinline __kprobes int vmalloc_fa * 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 @@ static noinline __kprobes int vmalloc_fa * 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_errata93(struct pt_regs *r 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 int is_f00f_bug(struct pt_regs *r } 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,21 @@ show_fault_oops(struct pt_regs *regs, un 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) + 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 +774,68 @@ __bad_area_nosemaphore(struct pt_regs *r 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 +990,99 @@ static int spurious_fault_check(unsigned 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 +1155,9 @@ int show_unhandled_signals = 1; 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 +1191,33 @@ do_page_fault(struct pt_regs *regs, unsi { 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: %pS\n", (void *)regs->ip); + show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, 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 +1277,7 @@ do_page_fault(struct pt_regs *regs, unsi * 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 +1332,11 @@ retry: 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 +1348,24 @@ retry: 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 +1420,199 @@ good_area: 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/gup.c linux-2.6.39-pax/arch/x86/mm/gup.c --- linux-2.6.39/arch/x86/mm/gup.c 2011-03-15 19:33:08.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/gup.c 2011-05-19 13:45:28.000000000 +0200 @@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/highmem_32.c linux-2.6.39-pax/arch/x86/mm/highmem_32.c --- linux-2.6.39/arch/x86/mm/highmem_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/highmem_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/hugetlbpage.c linux-2.6.39-pax/arch/x86/mm/hugetlbpage.c --- linux-2.6.39/arch/x86/mm/hugetlbpage.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/mm/hugetlbpage.c 2011-05-19 13:45:28.000000000 +0200 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe 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 @@ full_search: 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 @@ static unsigned long hugetlb_get_unmappe { 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 @@ static unsigned long hugetlb_get_unmappe 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 can't 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 @@ fail: /* * Restore the topdown base: */ + mm->mmap_base = base; mm->free_area_cache = base; mm->cached_hole_size = ~0UL; @@ -399,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *f 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 @@ hugetlb_get_unmapped_area(struct file *f 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/init.c linux-2.6.39-pax/arch/x86/mm/init.c --- linux-2.6.39/arch/x86/mm/init.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/mm/init.c 2011-05-19 13:45:28.000000000 +0200 @@ -33,7 +33,7 @@ int direct_gbpages static void __init find_early_table_space(unsigned long end, int use_pse, int use_gbpages) { - unsigned long puds, pmds, ptes, tables, start = 0, good_end = end; + unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end; phys_addr_t base; puds = (end + PUD_SIZE - 1) >> PUD_SHIFT; @@ -315,7 +315,13 @@ unsigned long __init_refok init_memory_m */ int devmem_is_allowed(unsigned long pagenr) { - if (pagenr <= 256) + if (!pagenr) + return 1; +#ifdef CONFIG_VM86 + if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT)) + return 1; +#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; @@ -375,6 +381,86 @@ void free_init_pages(char *what, unsigne 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/init_32.c linux-2.6.39-pax/arch/x86/mm/init_32.c --- linux-2.6.39/arch/x86/mm/init_32.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/mm/init_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void) } /* - * 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 @@ static pte_t * __init one_page_table_ini 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 @@ page_table_range_init(unsigned long star 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 @@ page_table_range_init(unsigned long star 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 @@ page_table_range_init(unsigned long star } } -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 @@ kernel_physical_mapping_init(unsigned lo 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 @@ repeat: pfn = start_pfn; pgd_idx = pgd_index((pfn<> PAGE_SHIFT); +#endif if (pfn >= end_pfn) continue; @@ -294,14 +300,13 @@ repeat: #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 @@ repeat: __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 @@ repeat: 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); /* @@ -893,6 +898,7 @@ void set_kernel_text_rw(void) if (!kernel_set_to_readonly) return; + start = ktla_ktva(start); pr_debug("Set kernel text: %lx - %lx for read write\n", start, start+size); @@ -907,6 +913,7 @@ void set_kernel_text_ro(void) if (!kernel_set_to_readonly) return; + start = ktla_ktva(start); pr_debug("Set kernel text: %lx - %lx for read only\n", start, start+size); @@ -935,6 +942,7 @@ void mark_rodata_ro(void) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/init_64.c linux-2.6.39-pax/arch/x86/mm/init_64.c --- linux-2.6.39/arch/x86/mm/init_64.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/mm/init_64.c 2011-05-19 13:45:28.000000000 +0200 @@ -74,7 +74,7 @@ early_param("gbpages", parse_direct_gbpa * 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; @@ -107,12 +107,22 @@ void sync_global_pgds(unsigned long star 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; @@ -121,6 +131,7 @@ void sync_global_pgds(unsigned long star /* 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); @@ -128,7 +139,10 @@ void sync_global_pgds(unsigned long star 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); } @@ -202,7 +216,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 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. @@ -261,14 +277,12 @@ static void __init __init_extra_mapping( 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)); @@ -698,6 +712,12 @@ void __init mem_init(void) 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; @@ -858,8 +878,8 @@ int kern_addr_valid(unsigned long addr) 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 mm_struct *mm) @@ -893,7 +913,7 @@ int in_gate_area_no_mm(unsigned long add 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/iomap_32.c linux-2.6.39-pax/arch/x86/mm/iomap_32.c --- linux-2.6.39/arch/x86/mm/iomap_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/iomap_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/ioremap.c linux-2.6.39-pax/arch/x86/mm/ioremap.c --- linux-2.6.39/arch/x86/mm/ioremap.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/ioremap.c 2011-05-19 13:45:28.000000000 +0200 @@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(re 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 @@ static int __init early_ioremap_debug_se 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 @@ void __init early_ioremap_init(void) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.39-pax/arch/x86/mm/kmemcheck/kmemcheck.c --- linux-2.6.39/arch/x86/mm/kmemcheck/kmemcheck.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/kmemcheck/kmemcheck.c 2011-05-19 13:45:28.000000000 +0200 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/mmap.c linux-2.6.39-pax/arch/x86/mm/mmap.c --- linux-2.6.39/arch/x86/mm/mmap.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/mmap.c 2011-05-19 13:45:28.000000000 +0200 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * 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 @@ static unsigned long mmap_rnd(void) 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 @@ static unsigned long mmap_legacy_base(vo 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/mmio-mod.c linux-2.6.39-pax/arch/x86/mm/mmio-mod.c --- linux-2.6.39/arch/x86/mm/mmio-mod.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/mmio-mod.c 2011-05-19 13:45:28.000000000 +0200 @@ -235,7 +235,7 @@ static void post(struct kmmio_probe *p, static void ioremap_trace_core(resource_size_t offset, unsigned long size, void __iomem *addr) { - static atomic_t next_id; + static atomic_unchecked_t next_id; struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL); /* These are page-unaligned. */ struct mmiotrace_map map = { @@ -259,7 +259,7 @@ static void ioremap_trace_core(resource_ .private = trace }, .phys = offset, - .id = atomic_inc_return(&next_id) + .id = atomic_inc_return_unchecked(&next_id) }; map.map_id = trace->id; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/numa_32.c linux-2.6.39-pax/arch/x86/mm/numa_32.c --- linux-2.6.39/arch/x86/mm/numa_32.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/mm/numa_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int } #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/pageattr-test.c linux-2.6.39-pax/arch/x86/mm/pageattr-test.c --- linux-2.6.39/arch/x86/mm/pageattr-test.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/pageattr-test.c 2011-05-19 13:45:28.000000000 +0200 @@ -36,7 +36,7 @@ enum { static int pte_testbit(pte_t pte) { - return pte_flags(pte) & _PAGE_UNUSED1; + return pte_flags(pte) & _PAGE_CPA_TEST; } struct split_state { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/pageattr.c linux-2.6.39-pax/arch/x86/mm/pageattr.c --- linux-2.6.39/arch/x86/mm/pageattr.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/mm/pageattr.c 2011-05-19 13:45:28.000000000 +0200 @@ -261,7 +261,7 @@ static inline pgprot_t static_protection */ #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 @@ static inline pgprot_t static_protection * 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 @@ static inline pgprot_t static_protection 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 @@ static inline pgprot_t static_protection } #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 @@ EXPORT_SYMBOL_GPL(lookup_address); 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/pat.c linux-2.6.39-pax/arch/x86/mm/pat.c --- linux-2.6.39/arch/x86/mm/pat.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/pat.c 2011-05-19 13:45:28.000000000 +0200 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end) 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 @@ static inline int range_is_allowed(unsig 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 @@ int kernel_map_sync_memtype(u64 base, un 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 @@ static int reserve_pfn_range(u64 paddr, 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 @@ static int reserve_pfn_range(u64 paddr, 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/pgtable.c linux-2.6.39-pax/arch/x86/mm/pgtable.c --- linux-2.6.39/arch/x86/mm/pgtable.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/mm/pgtable.c 2011-05-19 13:45:28.000000000 +0200 @@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p 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_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 + +#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) {} +#else static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm) { BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm)); @@ -128,6 +170,7 @@ static void pgd_dtor(pgd_t *pgd) 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 +183,7 @@ static void pgd_dtor(pgd_t *pgd) * -- 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 +195,7 @@ static void pgd_dtor(pgd_t *pgd) * 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 +213,38 @@ void pud_populate(struct mm_struct *mm, */ 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 +257,55 @@ static int preallocate_pmds(pmd_t *pmds[ * 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); - - for (addr = i = 0; i < PREALLOCATED_PMDS; - i++, pud++, addr += PUD_SIZE) { - pmd_t *pmd = pmds[i]; +#ifdef CONFIG_X86_64 + pyd = pyd_offset(mm, 0L); +#else + pyd = pyd_offset(pgd, 0L); +#endif + + 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 +314,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm) 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 +328,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm) 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 +344,7 @@ out: 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/pgtable_32.c linux-2.6.39-pax/arch/x86/mm/pgtable_32.c --- linux-2.6.39/arch/x86/mm/pgtable_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/pgtable_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/setup_nx.c linux-2.6.39-pax/arch/x86/mm/setup_nx.c --- linux-2.6.39/arch/x86/mm/setup_nx.c 2011-03-15 19:33:09.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/mm/setup_nx.c 2011-05-19 13:45:28.000000000 +0200 @@ -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 @@ static int __init noexec_setup(char *str 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/mm/tlb.c linux-2.6.39-pax/arch/x86/mm/tlb.c --- linux-2.6.39/arch/x86/mm/tlb.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/mm/tlb.c 2011-05-19 13:45:28.000000000 +0200 @@ -65,7 +65,11 @@ void leave_mm(int cpu) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/oprofile/backtrace.c linux-2.6.39-pax/arch/x86/oprofile/backtrace.c --- linux-2.6.39/arch/x86/oprofile/backtrace.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/oprofile/backtrace.c 2011-05-19 13:45:28.000000000 +0200 @@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_fram 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 @@ x86_backtrace(struct pt_regs * const reg { 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, 0, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/pci/ce4100.c linux-2.6.39-pax/arch/x86/pci/ce4100.c --- linux-2.6.39/arch/x86/pci/ce4100.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/pci/ce4100.c 2011-05-19 14:23:28.000000000 +0200 @@ -302,7 +302,7 @@ static int ce4100_conf_write(unsigned in 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/pci/common.c linux-2.6.39-pax/arch/x86/pci/common.c --- linux-2.6.39/arch/x86/pci/common.c 2011-03-15 19:33:09.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/pci/common.c 2011-05-19 14:23:28.000000000 +0200 @@ -33,8 +33,8 @@ int noioapicreroute = 1; 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/pci/direct.c linux-2.6.39-pax/arch/x86/pci/direct.c --- linux-2.6.39/arch/x86/pci/direct.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/pci/direct.c 2011-05-19 14:23:28.000000000 +0200 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int #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 @@ static int pci_conf2_write(unsigned int #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 @@ struct pci_raw_ops pci_direct_conf2 = { * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/pci/fixup.c linux-2.6.39-pax/arch/x86/pci/fixup.c --- linux-2.6.39/arch/x86/pci/fixup.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/pci/fixup.c 2011-05-19 13:45:28.000000000 +0200 @@ -435,7 +435,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"), }, }, - { } + {} }; static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/pci/mmconfig_32.c linux-2.6.39-pax/arch/x86/pci/mmconfig_32.c --- linux-2.6.39/arch/x86/pci/mmconfig_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/pci/mmconfig_32.c 2011-05-19 14:23:28.000000000 +0200 @@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/pci/mmconfig_64.c linux-2.6.39-pax/arch/x86/pci/mmconfig_64.c --- linux-2.6.39/arch/x86/pci/mmconfig_64.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/pci/mmconfig_64.c 2011-05-19 14:23:28.000000000 +0200 @@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/pci/mrst.c linux-2.6.39-pax/arch/x86/pci/mrst.c --- linux-2.6.39/arch/x86/pci/mrst.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/pci/mrst.c 2011-05-19 14:23:28.000000000 +0200 @@ -218,7 +218,7 @@ static int mrst_pci_irq_enable(struct pc return 0; } -struct pci_ops pci_mrst_ops = { +const struct pci_ops pci_mrst_ops = { .read = pci_read, .write = pci_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/pci/numaq_32.c linux-2.6.39-pax/arch/x86/pci/numaq_32.c --- linux-2.6.39/arch/x86/pci/numaq_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/pci/numaq_32.c 2011-05-19 14:23:28.000000000 +0200 @@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/pci/olpc.c linux-2.6.39-pax/arch/x86/pci/olpc.c --- linux-2.6.39/arch/x86/pci/olpc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/pci/olpc.c 2011-05-19 14:23:28.000000000 +0200 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/pci/pcbios.c linux-2.6.39-pax/arch/x86/pci/pcbios.c --- linux-2.6.39/arch/x86/pci/pcbios.c 2011-03-15 19:33:09.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/pci/pcbios.c 2011-05-19 14:23:27.000000000 +0200 @@ -79,50 +79,93 @@ union bios32 { 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 @@ static int __devinit check_pcibios(void) 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 @@ static int __devinit check_pcibios(void) "=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 @@ static int pci_bios_read(unsigned int se 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 @@ static int pci_bios_read(unsigned int se : "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 @@ static int pci_bios_read(unsigned int se *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 @@ static int pci_bios_read(unsigned int se : "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 @@ static int pci_bios_read(unsigned int se *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 @@ static int pci_bios_read(unsigned int se : "1" (PCIBIOS_READ_CONFIG_DWORD), "b" (bx), "D" ((long)reg), - "S" (&pci_indirect)); + "S" (&pci_indirect), + "r" (__PCIBIOS_DS)); break; } @@ -254,7 +312,10 @@ static int pci_bios_write(unsigned int s 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 @@ static int pci_bios_write(unsigned int s "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 @@ static int pci_bios_write(unsigned int s "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 @@ static int pci_bios_write(unsigned int s "c" (value), "b" (bx), "D" ((long)reg), - "S" (&pci_indirect)); + "S" (&pci_indirect), + "r" (__PCIBIOS_DS)); break; } @@ -301,7 +371,7 @@ static int pci_bios_write(unsigned int s * 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 @@ static struct pci_raw_ops pci_bios_acces * 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 @@ struct irq_routing_table * pcibios_get_i 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 @@ struct irq_routing_table * pcibios_get_i "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 pcibios_set_irq_routing(struct pci_d { 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 @@ int pcibios_set_irq_routing(struct pci_d : "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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/pci/xen.c linux-2.6.39-pax/arch/x86/pci/xen.c --- linux-2.6.39/arch/x86/pci/xen.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/pci/xen.c 2011-05-19 14:23:28.000000000 +0200 @@ -62,7 +62,7 @@ static int acpi_register_gsi_xen_hvm(str #include #include -struct xen_pci_frontend_ops *xen_pci_frontend; +const struct xen_pci_frontend_ops *xen_pci_frontend; EXPORT_SYMBOL_GPL(xen_pci_frontend); #define XEN_PIRQ_MSI_DATA (MSI_DATA_TRIGGER_EDGE | \ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/platform/efi/efi_32.c linux-2.6.39-pax/arch/x86/platform/efi/efi_32.c --- linux-2.6.39/arch/x86/platform/efi/efi_32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/platform/efi/efi_32.c 2011-05-19 13:45:28.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/platform/efi/efi_stub_32.S linux-2.6.39-pax/arch/x86/platform/efi/efi_stub_32.S --- linux-2.6.39/arch/x86/platform/efi/efi_stub_32.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/platform/efi/efi_stub_32.S 2011-05-19 13:45:28.000000000 +0200 @@ -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 @@ ENTRY(efi_call_phys) * 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 @@ ENTRY(efi_call_phys) * 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 @@ ENTRY(efi_call_phys) /* * 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 @@ ENTRY(efi_call_phys) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/platform/olpc/olpc_dt.c linux-2.6.39-pax/arch/x86/platform/olpc/olpc_dt.c --- linux-2.6.39/arch/x86/platform/olpc/olpc_dt.c 2011-03-15 19:33:09.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/platform/olpc/olpc_dt.c 2011-05-19 14:23:28.000000000 +0200 @@ -154,7 +154,7 @@ void * __init prom_early_alloc(unsigned return res; } -static struct of_pdt_ops prom_olpc_ops __initdata = { +static const struct of_pdt_ops prom_olpc_ops = { .nextprop = olpc_dt_nextprop, .getproplen = olpc_dt_getproplen, .getproperty = olpc_dt_getproperty, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/platform/uv/tlb_uv.c linux-2.6.39-pax/arch/x86/platform/uv/tlb_uv.c --- linux-2.6.39/arch/x86/platform/uv/tlb_uv.c 2011-05-19 10:21:15.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/platform/uv/tlb_uv.c 2011-05-19 13:45:28.000000000 +0200 @@ -342,6 +342,8 @@ static void uv_reset_with_ipi(struct bau cpumask_t mask; struct reset_args reset_args; + pax_track_stack(); + reset_args.sender = sender; cpus_clear(mask); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/power/cpu.c linux-2.6.39-pax/arch/x86/power/cpu.c --- linux-2.6.39/arch/x86/power/cpu.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/power/cpu.c 2011-05-19 13:45:28.000000000 +0200 @@ -130,7 +130,7 @@ static void do_fpu_end(void) 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 @@ static void fix_processor_context(void) */ #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/vdso/Makefile linux-2.6.39-pax/arch/x86/vdso/Makefile --- linux-2.6.39/arch/x86/vdso/Makefile 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/vdso/Makefile 2011-05-19 13:45:28.000000000 +0200 @@ -123,7 +123,7 @@ quiet_cmd_vdso = VDSO $@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/vdso/vclock_gettime.c linux-2.6.39-pax/arch/x86/vdso/vclock_gettime.c --- linux-2.6.39/arch/x86/vdso/vclock_gettime.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/vdso/vclock_gettime.c 2011-05-19 13:45:28.000000000 +0200 @@ -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 static noinline int do_monotonic 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 @@ notrace int __vdso_clock_gettime(clockid 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 @@ notrace int __vdso_gettimeofday(struct t } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/vdso/vdso.lds.S linux-2.6.39-pax/arch/x86/vdso/vdso.lds.S --- linux-2.6.39/arch/x86/vdso/vdso.lds.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/vdso/vdso.lds.S 2011-05-19 13:45:28.000000000 +0200 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/vdso/vdso32-setup.c linux-2.6.39-pax/arch/x86/vdso/vdso32-setup.c --- linux-2.6.39/arch/x86/vdso/vdso32-setup.c 2011-05-19 10:21:16.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/vdso/vdso32-setup.c 2011-05-19 13:45:29.000000000 +0200 @@ -25,6 +25,7 @@ #include #include #include +#include enum { VDSO_DISABLED = 0, @@ -226,7 +227,7 @@ static inline void map_compat_vdso(int m 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 @@ static int __init gate_vma_init(void) 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 @@ int arch_setup_additional_pages(struct l 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 @@ int arch_setup_additional_pages(struct l } 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 @@ __initcall(ia32_binfmt_init); 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; } @@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(stru * Check to see if the corresponding 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/vdso/vextern.h linux-2.6.39-pax/arch/x86/vdso/vextern.h --- linux-2.6.39/arch/x86/vdso/vextern.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/vdso/vextern.h 2011-05-19 13:45:29.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/vdso/vma.c linux-2.6.39-pax/arch/x86/vdso/vma.c --- linux-2.6.39/arch/x86/vdso/vma.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/vdso/vma.c 2011-05-19 13:45:29.000000000 +0200 @@ -58,7 +58,7 @@ static int __init init_vdso_vars(void) 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 @@ int arch_setup_additional_pages(struct l 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 @@ int arch_setup_additional_pages(struct l VM_ALWAYSDUMP, vdso_pages); if (ret) { - current->mm->context.vdso = NULL; + current->mm->context.vdso = 0; goto up_fail; } @@ -134,10 +134,3 @@ up_fail: 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/xen/enlighten.c linux-2.6.39-pax/arch/x86/xen/enlighten.c --- linux-2.6.39/arch/x86/xen/enlighten.c 2011-05-19 10:21:16.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/xen/enlighten.c 2011-05-21 19:03:56.000000000 +0200 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); 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); @@ -1010,7 +1008,7 @@ static const struct pv_apic_ops xen_apic #endif }; -static void xen_reboot(int reason) +static __noreturn void xen_reboot(int reason) { struct sched_shutdown r = { .reason = reason }; @@ -1018,17 +1016,17 @@ static void xen_reboot(int reason) BUG(); } -static void xen_restart(char *msg) +static __noreturn void xen_restart(char *msg) { xen_reboot(SHUTDOWN_reboot); } -static void xen_emergency_restart(void) +static __noreturn void xen_emergency_restart(void) { xen_reboot(SHUTDOWN_reboot); } -static void xen_machine_halt(void) +static __noreturn void xen_machine_halt(void) { xen_reboot(SHUTDOWN_poweroff); } @@ -1127,7 +1125,17 @@ asmlinkage void __init xen_start_kernel( __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(); @@ -1158,13 +1166,6 @@ asmlinkage void __init xen_start_kernel( 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/xen/mmu.c linux-2.6.39-pax/arch/x86/xen/mmu.c --- linux-2.6.39/arch/x86/xen/mmu.c 2011-05-19 10:21:16.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/xen/mmu.c 2011-05-19 13:45:29.000000000 +0200 @@ -1791,6 +1791,8 @@ __init pgd_t *xen_setup_kernel_pagetable 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); @@ -1809,7 +1811,10 @@ __init pgd_t *xen_setup_kernel_pagetable 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.39-pax/arch/x86/xen/pci-swiotlb-xen.c --- linux-2.6.39/arch/x86/xen/pci-swiotlb-xen.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/xen/pci-swiotlb-xen.c 2011-05-19 14:23:29.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/xen/smp.c linux-2.6.39-pax/arch/x86/xen/smp.c --- linux-2.6.39/arch/x86/xen/smp.c 2011-05-19 10:21:16.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/xen/smp.c 2011-05-19 13:45:29.000000000 +0200 @@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_ { 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 @@ cpu_initialize_context(unsigned int cpu, 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 @@ static int __cpuinit xen_cpu_up(unsigned 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) - 16 + THREAD_SIZE; #endif xen_setup_runstate_info(cpu); xen_setup_timer(cpu); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/xen/xen-asm_32.S linux-2.6.39-pax/arch/x86/xen/xen-asm_32.S --- linux-2.6.39/arch/x86/xen/xen-asm_32.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/arch/x86/xen/xen-asm_32.S 2011-05-19 13:45:29.000000000 +0200 @@ -83,14 +83,14 @@ ENTRY(xen_iret) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/xen/xen-head.S linux-2.6.39-pax/arch/x86/xen/xen-head.S --- linux-2.6.39/arch/x86/xen/xen-head.S 2011-05-19 10:21:16.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/xen/xen-head.S 2011-05-19 13:45:29.000000000 +0200 @@ -19,6 +19,17 @@ ENTRY(startup_xen) #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/arch/x86/xen/xen-ops.h linux-2.6.39-pax/arch/x86/xen/xen-ops.h --- linux-2.6.39/arch/x86/xen/xen-ops.h 2011-05-19 10:21:16.000000000 +0200 +++ linux-2.6.39-pax/arch/x86/xen/xen-ops.h 2011-05-19 13:45:29.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/block/blk-iopoll.c linux-2.6.39-pax/block/blk-iopoll.c --- linux-2.6.39/block/blk-iopoll.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/block/blk-iopoll.c 2011-05-19 13:45:29.000000000 +0200 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/block/blk-map.c linux-2.6.39-pax/block/blk-map.c --- linux-2.6.39/block/blk-map.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/block/blk-map.c 2011-05-19 13:45:29.000000000 +0200 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/block/blk-softirq.c linux-2.6.39-pax/block/blk-softirq.c --- linux-2.6.39/block/blk-softirq.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/block/blk-softirq.c 2011-05-19 13:45:29.000000000 +0200 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/block/bsg.c linux-2.6.39-pax/block/bsg.c --- linux-2.6.39/block/bsg.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/block/bsg.c 2011-05-19 13:45:29.000000000 +0200 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/block/scsi_ioctl.c linux-2.6.39-pax/block/scsi_ioctl.c --- linux-2.6.39/block/scsi_ioctl.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/block/scsi_ioctl.c 2011-05-19 13:45:29.000000000 +0200 @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command); 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 sg_scsi_ioctl(struct request_queue * 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 @@ int sg_scsi_ioctl(struct request_queue * */ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/crypto/serpent.c linux-2.6.39-pax/crypto/serpent.c --- linux-2.6.39/crypto/serpent.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/crypto/serpent.c 2011-05-19 13:45:29.000000000 +0200 @@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_ u32 r0,r1,r2,r3,r4; int i; + pax_track_stack(); + /* Copy key, add padding */ for (i = 0; i < keylen; ++i) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/acpi_ipmi.c linux-2.6.39-pax/drivers/acpi/acpi_ipmi.c --- linux-2.6.39/drivers/acpi/acpi_ipmi.c 2011-03-15 19:33:10.000000000 +0100 +++ linux-2.6.39-pax/drivers/acpi/acpi_ipmi.c 2011-05-19 14:23:29.000000000 +0200 @@ -70,7 +70,7 @@ struct acpi_ipmi_device { struct ipmi_driver_data { struct list_head ipmi_devices; struct ipmi_smi_watcher bmc_events; - struct ipmi_user_hndl ipmi_hndlrs; + const struct ipmi_user_hndl ipmi_hndlrs; struct mutex ipmi_lock; }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/apei/cper.c linux-2.6.39-pax/drivers/acpi/apei/cper.c --- linux-2.6.39/drivers/acpi/apei/cper.c 2011-05-19 10:21:17.000000000 +0200 +++ linux-2.6.39-pax/drivers/acpi/apei/cper.c 2011-05-19 13:45:29.000000000 +0200 @@ -38,12 +38,12 @@ */ u64 cper_next_record_id(void) { - static atomic64_t seq; + static atomic64_unchecked_t seq; - if (!atomic64_read(&seq)) - atomic64_set(&seq, ((u64)get_seconds()) << 32); + if (!atomic64_read_unchecked(&seq)) + atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32); - return atomic64_inc_return(&seq); + return atomic64_inc_return_unchecked(&seq); } EXPORT_SYMBOL_GPL(cper_next_record_id); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/battery.c linux-2.6.39-pax/drivers/acpi/battery.c --- linux-2.6.39/drivers/acpi/battery.c 2011-05-19 10:21:17.000000000 +0200 +++ linux-2.6.39-pax/drivers/acpi/battery.c 2011-05-19 14:23:29.000000000 +0200 @@ -864,7 +864,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } static struct battery_file { - struct file_operations ops; + const struct file_operations ops; mode_t mode; const char *name; } acpi_battery_file[] = { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/dock.c linux-2.6.39-pax/drivers/acpi/dock.c --- linux-2.6.39/drivers/acpi/dock.c 2011-03-15 19:33:13.000000000 +0100 +++ linux-2.6.39-pax/drivers/acpi/dock.c 2011-05-19 14:23:29.000000000 +0200 @@ -77,7 +77,7 @@ struct dock_dependent_device { 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 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifi * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/ec_sys.c linux-2.6.39-pax/drivers/acpi/ec_sys.c --- linux-2.6.39/drivers/acpi/ec_sys.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/acpi/ec_sys.c 2011-05-19 14:23:29.000000000 +0200 @@ -92,7 +92,7 @@ static ssize_t acpi_ec_write_io(struct f 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/fan.c linux-2.6.39-pax/drivers/acpi/fan.c --- linux-2.6.39/drivers/acpi/fan.c 2011-03-15 19:33:13.000000000 +0100 +++ linux-2.6.39-pax/drivers/acpi/fan.c 2011-05-19 14:23:29.000000000 +0200 @@ -110,7 +110,7 @@ fan_set_cur_state(struct thermal_cooling return result; } -static struct thermal_cooling_device_ops fan_cooling_ops = { +static const struct thermal_cooling_device_ops fan_cooling_ops = { .get_max_state = fan_get_max_state, .get_cur_state = fan_get_cur_state, .set_cur_state = fan_set_cur_state, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/power_meter.c linux-2.6.39-pax/drivers/acpi/power_meter.c --- linux-2.6.39/drivers/acpi/power_meter.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/acpi/power_meter.c 2011-05-19 13:45:29.000000000 +0200 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d return res; temp /= 1000; - if (temp < 0) - return -EINVAL; mutex_lock(&resource->lock); resource->trip[attr->index - 7] = temp; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/proc.c linux-2.6.39-pax/drivers/acpi/proc.c --- linux-2.6.39/drivers/acpi/proc.c 2011-03-15 19:33:13.000000000 +0100 +++ linux-2.6.39-pax/drivers/acpi/proc.c 2011-05-19 13:45:29.000000000 +0200 @@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f size_t count, loff_t * ppos) { struct list_head *node, *next; - char strbuf[5]; - char str[5] = ""; - unsigned int len = count; + char strbuf[5] = {0}; - if (len > 4) - len = 4; - if (len < 0) + if (count > 4) + count = 4; + if (copy_from_user(strbuf, buffer, count)) return -EFAULT; - - if (copy_from_user(strbuf, buffer, len)) - 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 @@ acpi_system_write_wakeup_device(struct f 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/processor_driver.c linux-2.6.39-pax/drivers/acpi/processor_driver.c --- linux-2.6.39/drivers/acpi/processor_driver.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/acpi/processor_driver.c 2011-05-19 13:45:29.000000000 +0200 @@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add( return 0; #endif - BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0)); + BUG_ON(pr->id >= nr_cpu_ids); /* * Buggy BIOS check diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/processor_idle.c linux-2.6.39-pax/drivers/acpi/processor_idle.c --- linux-2.6.39/drivers/acpi/processor_idle.c 2011-03-15 19:33:13.000000000 +0100 +++ linux-2.6.39-pax/drivers/acpi/processor_idle.c 2011-05-19 13:45:29.000000000 +0200 @@ -121,7 +121,7 @@ static struct dmi_system_id __cpuinitdat DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, (void *)1}, - {}, + {} }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/processor_thermal.c linux-2.6.39-pax/drivers/acpi/processor_thermal.c --- linux-2.6.39/drivers/acpi/processor_thermal.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/acpi/processor_thermal.c 2011-05-19 14:23:29.000000000 +0200 @@ -244,7 +244,7 @@ processor_set_cur_state(struct thermal_c return result; } -struct thermal_cooling_device_ops processor_cooling_ops = { +const struct thermal_cooling_device_ops processor_cooling_ops = { .get_max_state = processor_get_max_state, .get_cur_state = processor_get_cur_state, .set_cur_state = processor_set_cur_state, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/sysfs.c linux-2.6.39-pax/drivers/acpi/sysfs.c --- linux-2.6.39/drivers/acpi/sysfs.c 2011-03-15 19:33:13.000000000 +0100 +++ linux-2.6.39-pax/drivers/acpi/sysfs.c 2011-05-19 14:23:29.000000000 +0200 @@ -149,12 +149,12 @@ static int param_get_debug_level(char *b return result; } -static struct kernel_param_ops param_ops_debug_layer = { +static const struct kernel_param_ops param_ops_debug_layer = { .set = param_set_uint, .get = param_get_debug_layer, }; -static struct kernel_param_ops param_ops_debug_level = { +static const struct kernel_param_ops param_ops_debug_level = { .set = param_set_uint, .get = param_get_debug_level, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/thermal.c linux-2.6.39-pax/drivers/acpi/thermal.c --- linux-2.6.39/drivers/acpi/thermal.c 2011-03-15 19:33:13.000000000 +0100 +++ linux-2.6.39-pax/drivers/acpi/thermal.c 2011-05-19 14:23:29.000000000 +0200 @@ -812,7 +812,7 @@ acpi_thermal_unbind_cooling_device(struc thermal_zone_unbind_cooling_device); } -static struct thermal_zone_device_ops acpi_thermal_zone_ops = { +static const struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/acpi/video.c linux-2.6.39-pax/drivers/acpi/video.c --- linux-2.6.39/drivers/acpi/video.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/acpi/video.c 2011-05-19 14:23:29.000000000 +0200 @@ -308,7 +308,7 @@ video_set_cur_state(struct thermal_cooli return acpi_video_device_lcd_set_level(video, level); } -static struct thermal_cooling_device_ops video_cooling_ops = { +static const struct thermal_cooling_device_ops video_cooling_ops = { .get_max_state = video_get_max_state, .get_cur_state = video_get_cur_state, .set_cur_state = video_set_cur_state, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/acard-ahci.c linux-2.6.39-pax/drivers/ata/acard-ahci.c --- linux-2.6.39/drivers/ata/acard-ahci.c 2011-03-15 19:33:13.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/acard-ahci.c 2011-05-19 14:23:29.000000000 +0200 @@ -87,7 +87,7 @@ static struct scsi_host_template acard_a 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/ahci.c linux-2.6.39-pax/drivers/ata/ahci.c --- linux-2.6.39/drivers/ata/ahci.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/ahci.c 2011-05-19 14:23:29.000000000 +0200 @@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/ahci.h linux-2.6.39-pax/drivers/ata/ahci.h --- linux-2.6.39/drivers/ata/ahci.h 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/ahci.h 2011-05-19 14:23:29.000000000 +0200 @@ -311,7 +311,7 @@ extern struct device_attribute *ahci_sde .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/ata_generic.c linux-2.6.39-pax/drivers/ata/ata_generic.c --- linux-2.6.39/drivers/ata/ata_generic.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/ata_generic.c 2011-05-19 14:23:29.000000000 +0200 @@ -101,7 +101,7 @@ static struct scsi_host_template generic 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/ata_piix.c linux-2.6.39-pax/drivers/ata/ata_piix.c --- linux-2.6.39/drivers/ata/ata_piix.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/ata_piix.c 2011-05-19 14:23:29.000000000 +0200 @@ -335,12 +335,12 @@ static struct scsi_host_template piix_sh 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, @@ -348,12 +348,12 @@ static struct ata_port_operations piix_p .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, @@ -369,7 +369,7 @@ static struct scsi_host_template piix_si .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/libahci.c linux-2.6.39-pax/drivers/ata/libahci.c --- linux-2.6.39/drivers/ata/libahci.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/libahci.c 2011-05-19 14:23:29.000000000 +0200 @@ -141,7 +141,7 @@ struct device_attribute *ahci_sdev_attrs }; 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/libata-acpi.c linux-2.6.39-pax/drivers/ata/libata-acpi.c --- linux-2.6.39/drivers/ata/libata-acpi.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/libata-acpi.c 2011-05-19 14:23:29.000000000 +0200 @@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_han 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/libata-core.c linux-2.6.39-pax/drivers/ata/libata-core.c --- linux-2.6.39/drivers/ata/libata-core.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/libata-core.c 2011-05-19 14:23:27.000000000 +0200 @@ -4747,7 +4747,7 @@ void ata_qc_free(struct ata_queued_cmd * 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; @@ -4763,7 +4763,7 @@ void __ata_qc_complete(struct ata_queued 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; @@ -5756,7 +5756,7 @@ static void ata_host_stop(struct device * 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; @@ -5768,6 +5768,7 @@ static void ata_finalize_port_ops(struct return; spin_lock(&lock); + pax_open_kernel(); for (cur = ops->inherits; cur; cur = cur->inherits) { void **inherit = (void **)cur; @@ -5781,8 +5782,9 @@ static void ata_finalize_port_ops(struct if (IS_ERR(*pp)) *pp = NULL; - ops->inherits = NULL; + ((struct ata_port_operations *)ops)->inherits = NULL; + pax_close_kernel(); spin_unlock(&lock); } @@ -5879,7 +5881,7 @@ int ata_host_start(struct ata_host *host */ /* 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); @@ -6583,7 +6585,7 @@ static void ata_dummy_error_handler(stru /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/libata-eh.c linux-2.6.39-pax/drivers/ata/libata-eh.c --- linux-2.6.39/drivers/ata/libata-eh.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/libata-eh.c 2011-05-19 14:23:27.000000000 +0200 @@ -2518,6 +2518,8 @@ void ata_eh_report(struct ata_port *ap) { struct ata_link *link; + pax_track_stack(); + ata_for_each_link(link, ap, HOST_FIRST) ata_eh_link_report(link); } @@ -3922,7 +3924,7 @@ void ata_do_eh(struct ata_port *ap, ata_ */ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/libata-pmp.c linux-2.6.39-pax/drivers/ata/libata-pmp.c --- linux-2.6.39/drivers/ata/libata-pmp.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/libata-pmp.c 2011-05-19 14:23:29.000000000 +0200 @@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(str */ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_acpi.c linux-2.6.39-pax/drivers/ata/pata_acpi.c --- linux-2.6.39/drivers/ata/pata_acpi.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_acpi.c 2011-05-19 14:23:29.000000000 +0200 @@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_ali.c linux-2.6.39-pax/drivers/ata/pata_ali.c --- linux-2.6.39/drivers/ata/pata_ali.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_ali.c 2011-05-19 14:23:29.000000000 +0200 @@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht * 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 @@ static const struct ata_port_operations * 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 @@ static struct ata_port_operations ali_20 /* * 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 @@ static struct ata_port_operations ali_c2 /* * 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 @@ static struct ata_port_operations ali_c4 /* * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_amd.c linux-2.6.39-pax/drivers/ata/pata_amd.c --- linux-2.6.39/drivers/ata/pata_amd.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_amd.c 2011-05-19 14:23:29.000000000 +0200 @@ -397,28 +397,28 @@ static const struct ata_port_operations .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 @@ static const struct ata_port_operations .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_arasan_cf.c linux-2.6.39-pax/drivers/ata/pata_arasan_cf.c --- linux-2.6.39/drivers/ata/pata_arasan_cf.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_arasan_cf.c 2011-05-19 14:23:29.000000000 +0200 @@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str /* Handle platform specific quirks */ if (pdata->quirk) { if (pdata->quirk & CF_BROKEN_PIO) { - ap->ops->set_piomode = NULL; + pax_open_kernel(); + *(void**)&ap->ops->set_piomode = NULL; + pax_close_kernel(); ap->pio_mask = 0; } if (pdata->quirk & CF_BROKEN_MWDMA) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_artop.c linux-2.6.39-pax/drivers/ata/pata_artop.c --- linux-2.6.39/drivers/ata/pata_artop.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_artop.c 2011-05-19 14:23:29.000000000 +0200 @@ -312,7 +312,7 @@ static struct scsi_host_template artop_s 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 @@ static struct ata_port_operations artop6 .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_at32.c linux-2.6.39-pax/drivers/ata/pata_at32.c --- linux-2.6.39/drivers/ata/pata_at32.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_at32.c 2011-05-19 14:23:29.000000000 +0200 @@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_at91.c linux-2.6.39-pax/drivers/ata/pata_at91.c --- linux-2.6.39/drivers/ata/pata_at91.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_at91.c 2011-05-19 14:23:29.000000000 +0200 @@ -212,7 +212,7 @@ static struct scsi_host_template pata_at 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_atiixp.c linux-2.6.39-pax/drivers/ata/pata_atiixp.c --- linux-2.6.39/drivers/ata/pata_atiixp.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_atiixp.c 2011-05-19 14:23:29.000000000 +0200 @@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_ .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_atp867x.c linux-2.6.39-pax/drivers/ata/pata_atp867x.c --- linux-2.6.39/drivers/ata/pata_atp867x.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_atp867x.c 2011-05-19 14:23:29.000000000 +0200 @@ -275,7 +275,7 @@ static struct scsi_host_template atp867x 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_bf54x.c linux-2.6.39-pax/drivers/ata/pata_bf54x.c --- linux-2.6.39/drivers/ata/pata_bf54x.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_bf54x.c 2011-05-19 14:23:29.000000000 +0200 @@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_cmd640.c linux-2.6.39-pax/drivers/ata/pata_cmd640.c --- linux-2.6.39/drivers/ata/pata_cmd640.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_cmd640.c 2011-05-19 14:23:29.000000000 +0200 @@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_cmd64x.c linux-2.6.39-pax/drivers/ata/pata_cmd64x.c --- linux-2.6.39/drivers/ata/pata_cmd64x.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_cmd64x.c 2011-05-19 14:23:29.000000000 +0200 @@ -268,18 +268,18 @@ static const struct ata_port_operations .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_cs5520.c linux-2.6.39-pax/drivers/ata/pata_cs5520.c --- linux-2.6.39/drivers/ata/pata_cs5520.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_cs5520.c 2011-05-19 14:23:29.000000000 +0200 @@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_ .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_cs5530.c linux-2.6.39-pax/drivers/ata/pata_cs5530.c --- linux-2.6.39/drivers/ata/pata_cs5530.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_cs5530.c 2011-05-19 14:23:29.000000000 +0200 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_cs5535.c linux-2.6.39-pax/drivers/ata/pata_cs5535.c --- linux-2.6.39/drivers/ata/pata_cs5535.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_cs5535.c 2011-05-19 14:23:29.000000000 +0200 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_cs5536.c linux-2.6.39-pax/drivers/ata/pata_cs5536.c --- linux-2.6.39/drivers/ata/pata_cs5536.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_cs5536.c 2011-05-19 14:23:29.000000000 +0200 @@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_cypress.c linux-2.6.39-pax/drivers/ata/pata_cypress.c --- linux-2.6.39/drivers/ata/pata_cypress.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_cypress.c 2011-05-19 14:23:29.000000000 +0200 @@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_efar.c linux-2.6.39-pax/drivers/ata/pata_efar.c --- linux-2.6.39/drivers/ata/pata_efar.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_efar.c 2011-05-19 14:23:29.000000000 +0200 @@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_hpt366.c linux-2.6.39-pax/drivers/ata/pata_hpt366.c --- linux-2.6.39/drivers/ata/pata_hpt366.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_hpt366.c 2011-05-19 14:23:29.000000000 +0200 @@ -276,7 +276,7 @@ static struct scsi_host_template hpt36x_ * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_hpt37x.c linux-2.6.39-pax/drivers/ata/pata_hpt37x.c --- linux-2.6.39/drivers/ata/pata_hpt37x.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_hpt37x.c 2011-05-19 14:23:29.000000000 +0200 @@ -589,7 +589,7 @@ static struct scsi_host_template hpt37x_ * 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, @@ -605,7 +605,7 @@ static struct ata_port_operations hpt370 * 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, }; @@ -615,7 +615,7 @@ static struct ata_port_operations hpt370 * 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, @@ -631,7 +631,7 @@ static struct ata_port_operations hpt302 * 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, }; @@ -641,7 +641,7 @@ static struct ata_port_operations hpt372 * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_hpt3x2n.c linux-2.6.39-pax/drivers/ata/pata_hpt3x2n.c --- linux-2.6.39/drivers/ata/pata_hpt3x2n.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_hpt3x2n.c 2011-05-19 14:23:29.000000000 +0200 @@ -350,7 +350,7 @@ static struct scsi_host_template hpt3x2n * 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, @@ -368,7 +368,7 @@ static struct ata_port_operations hpt3xx * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_hpt3x3.c linux-2.6.39-pax/drivers/ata/pata_hpt3x3.c --- linux-2.6.39/drivers/ata/pata_hpt3x3.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_hpt3x3.c 2011-05-19 14:23:29.000000000 +0200 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_icside.c linux-2.6.39-pax/drivers/ata/pata_icside.c --- linux-2.6.39/drivers/ata/pata_icside.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_icside.c 2011-05-19 14:23:29.000000000 +0200 @@ -320,7 +320,7 @@ static void pata_icside_postreset(struct } } -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_isapnp.c linux-2.6.39-pax/drivers/ata/pata_isapnp.c --- linux-2.6.39/drivers/ata/pata_isapnp.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_isapnp.c 2011-05-19 14:23:29.000000000 +0200 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_it8213.c linux-2.6.39-pax/drivers/ata/pata_it8213.c --- linux-2.6.39/drivers/ata/pata_it8213.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_it8213.c 2011-05-19 14:23:29.000000000 +0200 @@ -233,7 +233,7 @@ static struct scsi_host_template it8213_ }; -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_it821x.c linux-2.6.39-pax/drivers/ata/pata_it821x.c --- linux-2.6.39/drivers/ata/pata_it821x.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_it821x.c 2011-05-19 14:23:29.000000000 +0200 @@ -801,7 +801,7 @@ static struct scsi_host_template it821x_ 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 @@ static struct ata_port_operations it821x .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 @@ static struct ata_port_operations it821x .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_ixp4xx_cf.c linux-2.6.39-pax/drivers/ata/pata_ixp4xx_cf.c --- linux-2.6.39/drivers/ata/pata_ixp4xx_cf.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_ixp4xx_cf.c 2011-05-19 14:23:29.000000000 +0200 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_jmicron.c linux-2.6.39-pax/drivers/ata/pata_jmicron.c --- linux-2.6.39/drivers/ata/pata_jmicron.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_jmicron.c 2011-05-19 14:23:29.000000000 +0200 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_legacy.c linux-2.6.39-pax/drivers/ata/pata_legacy.c --- linux-2.6.39/drivers/ata/pata_legacy.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_legacy.c 2011-05-19 14:23:29.000000000 +0200 @@ -116,7 +116,7 @@ struct legacy_probe { 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 @@ static const struct ata_port_operations * 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 @@ static unsigned int pdc_data_xfer_vlb(st 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 @@ static void ht6560a_set_piomode(struct a 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 @@ static void ht6560b_set_piomode(struct a 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 void opti82c611a_set_piomode(stru } -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 @@ static unsigned int opti82c46x_qc_issue( 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 @@ static int qdi_port(struct platform_devi 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 @@ static int winbond_port(struct platform_ 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 @@ static __init int legacy_init_one(struct 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_macio.c linux-2.6.39-pax/drivers/ata/pata_macio.c --- linux-2.6.39/drivers/ata/pata_macio.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_macio.c 2011-05-19 14:23:29.000000000 +0200 @@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_marvell.c linux-2.6.39-pax/drivers/ata/pata_marvell.c --- linux-2.6.39/drivers/ata/pata_marvell.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_marvell.c 2011-05-19 14:23:29.000000000 +0200 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_mpc52xx.c linux-2.6.39-pax/drivers/ata/pata_mpc52xx.c --- linux-2.6.39/drivers/ata/pata_mpc52xx.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_mpc52xx.c 2011-05-19 14:23:29.000000000 +0200 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_mpiix.c linux-2.6.39-pax/drivers/ata/pata_mpiix.c --- linux-2.6.39/drivers/ata/pata_mpiix.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_mpiix.c 2011-05-19 14:23:29.000000000 +0200 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_netcell.c linux-2.6.39-pax/drivers/ata/pata_netcell.c --- linux-2.6.39/drivers/ata/pata_netcell.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_netcell.c 2011-05-19 14:23:29.000000000 +0200 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_ninja32.c linux-2.6.39-pax/drivers/ata/pata_ninja32.c --- linux-2.6.39/drivers/ata/pata_ninja32.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_ninja32.c 2011-05-19 14:23:29.000000000 +0200 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_ns87410.c linux-2.6.39-pax/drivers/ata/pata_ns87410.c --- linux-2.6.39/drivers/ata/pata_ns87410.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_ns87410.c 2011-05-19 14:23:29.000000000 +0200 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_ns87415.c linux-2.6.39-pax/drivers/ata/pata_ns87415.c --- linux-2.6.39/drivers/ata/pata_ns87415.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_ns87415.c 2011-05-19 14:23:29.000000000 +0200 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at } #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 @@ static struct ata_port_operations ns8741 }; #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_octeon_cf.c linux-2.6.39-pax/drivers/ata/pata_octeon_cf.c --- linux-2.6.39/drivers/ata/pata_octeon_cf.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_octeon_cf.c 2011-05-19 14:23:29.000000000 +0200 @@ -780,7 +780,7 @@ static unsigned int octeon_cf_qc_issue(s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_oldpiix.c linux-2.6.39-pax/drivers/ata/pata_oldpiix.c --- linux-2.6.39/drivers/ata/pata_oldpiix.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_oldpiix.c 2011-05-19 14:23:29.000000000 +0200 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_opti.c linux-2.6.39-pax/drivers/ata/pata_opti.c --- linux-2.6.39/drivers/ata/pata_opti.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_opti.c 2011-05-19 14:23:29.000000000 +0200 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_optidma.c linux-2.6.39-pax/drivers/ata/pata_optidma.c --- linux-2.6.39/drivers/ata/pata_optidma.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_optidma.c 2011-05-19 14:23:29.000000000 +0200 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma 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 @@ static struct ata_port_operations optidm .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_palmld.c linux-2.6.39-pax/drivers/ata/pata_palmld.c --- linux-2.6.39/drivers/ata/pata_palmld.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_palmld.c 2011-05-19 14:23:29.000000000 +0200 @@ -42,7 +42,7 @@ static struct scsi_host_template palmld_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_pcmcia.c linux-2.6.39-pax/drivers/ata/pata_pcmcia.c --- linux-2.6.39/drivers/ata/pata_pcmcia.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_pcmcia.c 2011-05-19 14:23:29.000000000 +0200 @@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_ 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 @@ static int pcmcia_init_one(struct pcmcia 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_pdc2027x.c linux-2.6.39-pax/drivers/ata/pata_pdc2027x.c --- linux-2.6.39/drivers/ata/pata_pdc2027x.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_pdc2027x.c 2011-05-19 14:23:29.000000000 +0200 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_pdc202xx_old.c linux-2.6.39-pax/drivers/ata/pata_pdc202xx_old.c --- linux-2.6.39/drivers/ata/pata_pdc202xx_old.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_pdc202xx_old.c 2011-05-19 14:23:29.000000000 +0200 @@ -295,7 +295,7 @@ static struct scsi_host_template pdc202x 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 @@ static struct ata_port_operations pdc202 .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_piccolo.c linux-2.6.39-pax/drivers/ata/pata_piccolo.c --- linux-2.6.39/drivers/ata/pata_piccolo.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_piccolo.c 2011-05-19 14:23:29.000000000 +0200 @@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_platform.c linux-2.6.39-pax/drivers/ata/pata_platform.c --- linux-2.6.39/drivers/ata/pata_platform.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_platform.c 2011-05-19 14:23:29.000000000 +0200 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_pxa.c linux-2.6.39-pax/drivers/ata/pata_pxa.c --- linux-2.6.39/drivers/ata/pata_pxa.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_pxa.c 2011-05-19 14:23:29.000000000 +0200 @@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_qdi.c linux-2.6.39-pax/drivers/ata/pata_qdi.c --- linux-2.6.39/drivers/ata/pata_qdi.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_qdi.c 2011-05-19 14:23:29.000000000 +0200 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht 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 @@ static struct ata_port_operations qdi650 .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_radisys.c linux-2.6.39-pax/drivers/ata/pata_radisys.c --- linux-2.6.39/drivers/ata/pata_radisys.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_radisys.c 2011-05-19 14:23:29.000000000 +0200 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_rb532_cf.c linux-2.6.39-pax/drivers/ata/pata_rb532_cf.c --- linux-2.6.39/drivers/ata/pata_rb532_cf.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_rb532_cf.c 2011-05-19 14:23:29.000000000 +0200 @@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_rdc.c linux-2.6.39-pax/drivers/ata/pata_rdc.c --- linux-2.6.39/drivers/ata/pata_rdc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_rdc.c 2011-05-19 14:23:29.000000000 +0200 @@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_p 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_rz1000.c linux-2.6.39-pax/drivers/ata/pata_rz1000.c --- linux-2.6.39/drivers/ata/pata_rz1000.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_rz1000.c 2011-05-19 14:23:29.000000000 +0200 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_samsung_cf.c linux-2.6.39-pax/drivers/ata/pata_samsung_cf.c --- linux-2.6.39/drivers/ata/pata_samsung_cf.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_samsung_cf.c 2011-05-19 14:23:29.000000000 +0200 @@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3 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 @@ static struct ata_port_operations pata_s .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_sc1200.c linux-2.6.39-pax/drivers/ata/pata_sc1200.c --- linux-2.6.39/drivers/ata/pata_sc1200.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_sc1200.c 2011-05-19 14:23:29.000000000 +0200 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_scc.c linux-2.6.39-pax/drivers/ata/pata_scc.c --- linux-2.6.39/drivers/ata/pata_scc.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_scc.c 2011-05-19 14:23:29.000000000 +0200 @@ -926,7 +926,7 @@ static struct scsi_host_template scc_sht 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_sch.c linux-2.6.39-pax/drivers/ata/pata_sch.c --- linux-2.6.39/drivers/ata/pata_sch.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_sch.c 2011-05-19 14:23:29.000000000 +0200 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_serverworks.c linux-2.6.39-pax/drivers/ata/pata_serverworks.c --- linux-2.6.39/drivers/ata/pata_serverworks.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_serverworks.c 2011-05-19 14:23:29.000000000 +0200 @@ -300,7 +300,7 @@ static struct scsi_host_template serverw 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 @@ static struct ata_port_operations server .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_sil680.c linux-2.6.39-pax/drivers/ata/pata_sil680.c --- linux-2.6.39/drivers/ata/pata_sil680.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_sil680.c 2011-05-19 14:23:29.000000000 +0200 @@ -225,8 +225,7 @@ static struct scsi_host_template sil680_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_sis.c linux-2.6.39-pax/drivers/ata/pata_sis.c --- linux-2.6.39/drivers/ata/pata_sis.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_sis.c 2011-05-19 14:23:29.000000000 +0200 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_sl82c105.c linux-2.6.39-pax/drivers/ata/pata_sl82c105.c --- linux-2.6.39/drivers/ata/pata_sl82c105.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_sl82c105.c 2011-05-19 14:23:29.000000000 +0200 @@ -241,7 +241,7 @@ static struct scsi_host_template sl82c10 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_triflex.c linux-2.6.39-pax/drivers/ata/pata_triflex.c --- linux-2.6.39/drivers/ata/pata_triflex.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pata_triflex.c 2011-05-19 14:23:29.000000000 +0200 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pata_via.c linux-2.6.39-pax/drivers/ata/pata_via.c --- linux-2.6.39/drivers/ata/pata_via.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/pata_via.c 2011-05-19 14:23:29.000000000 +0200 @@ -441,7 +441,7 @@ static struct scsi_host_template via_sht 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 @@ static struct ata_port_operations via_po .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/pdc_adma.c linux-2.6.39-pax/drivers/ata/pdc_adma.c --- linux-2.6.39/drivers/ata/pdc_adma.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/pdc_adma.c 2011-05-19 14:23:29.000000000 +0200 @@ -146,7 +146,7 @@ static struct scsi_host_template adma_at .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_dwc_460ex.c linux-2.6.39-pax/drivers/ata/sata_dwc_460ex.c --- linux-2.6.39/drivers/ata/sata_dwc_460ex.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_dwc_460ex.c 2011-05-19 14:23:29.000000000 +0200 @@ -1598,7 +1598,7 @@ static struct scsi_host_template sata_dw .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_fsl.c linux-2.6.39-pax/drivers/ata/sata_fsl.c --- linux-2.6.39/drivers/ata/sata_fsl.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_fsl.c 2011-05-19 14:23:29.000000000 +0200 @@ -1268,7 +1268,7 @@ static struct scsi_host_template sata_fs .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_inic162x.c linux-2.6.39-pax/drivers/ata/sata_inic162x.c --- linux-2.6.39/drivers/ata/sata_inic162x.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ata/sata_inic162x.c 2011-05-19 14:23:29.000000000 +0200 @@ -705,7 +705,7 @@ static int inic_port_start(struct ata_po 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_mv.c linux-2.6.39-pax/drivers/ata/sata_mv.c --- linux-2.6.39/drivers/ata/sata_mv.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_mv.c 2011-05-19 14:23:29.000000000 +0200 @@ -662,7 +662,7 @@ static struct scsi_host_template mv6_sht .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, @@ -682,7 +682,7 @@ static struct ata_port_operations mv5_op .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, @@ -716,7 +716,7 @@ static struct ata_port_operations mv6_op .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_nv.c linux-2.6.39-pax/drivers/ata/sata_nv.c --- linux-2.6.39/drivers/ata/sata_nv.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_nv.c 2011-05-19 14:23:29.000000000 +0200 @@ -465,7 +465,7 @@ static struct scsi_host_template nv_swnc * 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 @@ static struct ata_port_operations nv_gen .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 @@ static struct ata_port_operations nv_adm .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_promise.c linux-2.6.39-pax/drivers/ata/sata_promise.c --- linux-2.6.39/drivers/ata/sata_promise.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_promise.c 2011-05-19 14:23:29.000000000 +0200 @@ -194,7 +194,7 @@ static const struct ata_port_operations .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, @@ -207,14 +207,14 @@ static struct ata_port_operations pdc_sa /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_qstor.c linux-2.6.39-pax/drivers/ata/sata_qstor.c --- linux-2.6.39/drivers/ata/sata_qstor.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_qstor.c 2011-05-19 14:23:29.000000000 +0200 @@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_ .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_sil.c linux-2.6.39-pax/drivers/ata/sata_sil.c --- linux-2.6.39/drivers/ata/sata_sil.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_sil.c 2011-05-19 14:23:29.000000000 +0200 @@ -181,7 +181,7 @@ static struct scsi_host_template sil_sht .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_sil24.c linux-2.6.39-pax/drivers/ata/sata_sil24.c --- linux-2.6.39/drivers/ata/sata_sil24.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_sil24.c 2011-05-19 14:23:29.000000000 +0200 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_sis.c linux-2.6.39-pax/drivers/ata/sata_sis.c --- linux-2.6.39/drivers/ata/sata_sis.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_sis.c 2011-05-19 14:23:29.000000000 +0200 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_svw.c linux-2.6.39-pax/drivers/ata/sata_svw.c --- linux-2.6.39/drivers/ata/sata_svw.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_svw.c 2011-05-19 14:23:29.000000000 +0200 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata }; -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_sx4.c linux-2.6.39-pax/drivers/ata/sata_sx4.c --- linux-2.6.39/drivers/ata/sata_sx4.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_sx4.c 2011-05-19 14:23:29.000000000 +0200 @@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat }; /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_uli.c linux-2.6.39-pax/drivers/ata/sata_uli.c --- linux-2.6.39/drivers/ata/sata_uli.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_uli.c 2011-05-19 14:23:29.000000000 +0200 @@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_via.c linux-2.6.39-pax/drivers/ata/sata_via.c --- linux-2.6.39/drivers/ata/sata_via.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_via.c 2011-05-19 14:23:29.000000000 +0200 @@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ata/sata_vsc.c linux-2.6.39-pax/drivers/ata/sata_vsc.c --- linux-2.6.39/drivers/ata/sata_vsc.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/ata/sata_vsc.c 2011-05-19 14:23:29.000000000 +0200 @@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat }; -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/adummy.c linux-2.6.39-pax/drivers/atm/adummy.c --- linux-2.6.39/drivers/atm/adummy.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/atm/adummy.c 2011-05-19 13:45:29.000000000 +0200 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); return 0; } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/ambassador.c linux-2.6.39-pax/drivers/atm/ambassador.c --- linux-2.6.39/drivers/atm/ambassador.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/atm/ambassador.c 2011-05-19 13:45:29.000000000 +0200 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, 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 @@ static void rx_complete (amb_dev * dev, 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 responsibility atm_vcc->push (atm_vcc, skb); @@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, } 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 @@ static int amb_send (struct atm_vcc * at } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/atmtcp.c linux-2.6.39-pax/drivers/atm/atmtcp.c --- linux-2.6.39/drivers/atm/atmtcp.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/atm/atmtcp.c 2011-05-19 13:45:29.000000000 +0200 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc 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 @@ static int atmtcp_v_send(struct atm_vcc 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 @@ static int atmtcp_v_send(struct atm_vcc 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 @@ static int atmtcp_c_send(struct atm_vcc 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 @@ static int atmtcp_c_send(struct atm_vcc __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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/eni.c linux-2.6.39-pax/drivers/atm/eni.c --- linux-2.6.39/drivers/atm/eni.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/atm/eni.c 2011-05-19 13:45:29.000000000 +0200 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc) 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 @@ static int rx_aal5(struct atm_vcc *vcc) 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 @@ static int rx_aal5(struct atm_vcc *vcc) "(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 @@ rx_dequeued++; 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 @@ static void dequeue_tx(struct atm_dev *d 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/firestream.c linux-2.6.39-pax/drivers/atm/firestream.c --- linux-2.6.39/drivers/atm/firestream.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/atm/firestream.c 2011-05-19 13:45:29.000000000 +0200 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct } } - 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 @@ static void process_incoming (struct fs_ #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 @@ static void process_incoming (struct fs_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/fore200e.c linux-2.6.39-pax/drivers/atm/fore200e.c --- linux-2.6.39/drivers/atm/fore200e.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/atm/fore200e.c 2011-05-19 13:45:29.000000000 +0200 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200 #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 @@ fore200e_push_rpd(struct fore200e* fore2 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 @@ fore200e_push_rpd(struct fore200e* fore2 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 @@ fore200e_rx_irq(struct fore200e* fore200 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 @@ fore200e_send(struct atm_vcc *vcc, struc 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/he.c linux-2.6.39-pax/drivers/atm/he.c --- linux-2.6.39/drivers/atm/he.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/atm/he.c 2011-05-19 13:45:29.000000000 +0200 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i 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 @@ he_service_rbrq(struct he_dev *he_dev, i 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 @@ he_service_rbrq(struct he_dev *he_dev, i 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 @@ __enqueue_tpd(struct he_dev *he_dev, str 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 @@ he_send(struct atm_vcc *vcc, struct sk_b 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 @@ he_send(struct atm_vcc *vcc, struct sk_b 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 @@ he_send(struct atm_vcc *vcc, struct sk_b 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 @@ he_send(struct atm_vcc *vcc, struct sk_b 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 @@ he_send(struct atm_vcc *vcc, struct sk_b __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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/horizon.c linux-2.6.39-pax/drivers/atm/horizon.c --- linux-2.6.39/drivers/atm/horizon.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/atm/horizon.c 2011-05-19 13:45:29.000000000 +0200 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, { 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 responsibility vcc->push (vcc, skb); @@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/idt77252.c linux-2.6.39-pax/drivers/atm/idt77252.c --- linux-2.6.39/drivers/atm/idt77252.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/atm/idt77252.c 2011-05-19 13:45:29.000000000 +0200 @@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); } atomic_dec(&scq->used); @@ -1074,13 +1074,13 @@ dequeue_rx(struct idt77252_dev *card, st 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 @@ dequeue_rx(struct idt77252_dev *card, st 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 @@ dequeue_rx(struct idt77252_dev *card, st "(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 @@ dequeue_rx(struct idt77252_dev *card, st 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 @@ dequeue_rx(struct idt77252_dev *card, st __net_timestamp(skb); vcc->push(vcc, skb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); return; } @@ -1192,7 +1192,7 @@ dequeue_rx(struct idt77252_dev *card, st __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 @@ idt77252_rx_raw(struct idt77252_dev *car 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 @@ idt77252_rx_raw(struct idt77252_dev *car 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 @@ idt77252_send_skb(struct atm_vcc *vcc, s 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 @@ idt77252_send_skb(struct atm_vcc *vcc, s 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 @@ idt77252_send_skb(struct atm_vcc *vcc, s 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 @@ idt77252_send_oam(struct atm_vcc *vcc, v 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/iphase.c linux-2.6.39-pax/drivers/atm/iphase.c --- linux-2.6.39/drivers/atm/iphase.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/atm/iphase.c 2011-05-19 13:45:29.000000000 +0200 @@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev) 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 @@ static int rx_pkt(struct atm_dev *dev) 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 @@ static void rx_dle_intr(struct atm_dev * 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 @@ static void rx_dle_intr(struct atm_dev * 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 @@ static void rx_dle_intr(struct atm_dev * 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 @@ static int ia_ioctl(struct atm_dev *dev, { 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 @@ static int ia_pkt_tx (struct atm_vcc *vc 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 @@ static int ia_pkt_tx (struct atm_vcc *vc 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/lanai.c linux-2.6.39-pax/drivers/atm/lanai.c --- linux-2.6.39/drivers/atm/lanai.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/atm/lanai.c 2011-05-19 13:45:29.000000000 +0200 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l 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 @@ static void vcc_rx_aal5(struct lanai_vcc 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 @@ static int handle_service(struct lanai_d 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 @@ static int handle_service(struct lanai_d 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 @@ static int handle_service(struct lanai_d } 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 @@ static int handle_service(struct lanai_d 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/nicstar.c linux-2.6.39-pax/drivers/atm/nicstar.c --- linux-2.6.39/drivers/atm/nicstar.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/atm/nicstar.c 2011-05-19 13:45:29.000000000 +0200 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, 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 @@ static int ns_send(struct atm_vcc *vcc, 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 @@ static int ns_send(struct atm_vcc *vcc, 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 @@ static int ns_send(struct atm_vcc *vcc, } 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 @@ static void dequeue_rx(ns_dev * card, ns 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 @@ static void dequeue_rx(ns_dev * card, ns 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 @@ static void dequeue_rx(ns_dev * card, ns 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 @@ static void dequeue_rx(ns_dev * card, ns 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 @@ static void dequeue_rx(ns_dev * card, ns ("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 @@ static void dequeue_rx(ns_dev * card, ns ("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 @@ static void dequeue_rx(ns_dev * card, ns 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 @@ static void dequeue_rx(ns_dev * card, ns /* 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 @@ static void dequeue_rx(ns_dev * card, ns 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 @@ static void dequeue_rx(ns_dev * card, ns 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 @@ static void dequeue_rx(ns_dev * card, ns 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 @@ static void dequeue_rx(ns_dev * card, ns 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 @@ static void dequeue_rx(ns_dev * card, ns 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 @@ static void dequeue_rx(ns_dev * card, ns 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 @@ static void dequeue_rx(ns_dev * card, ns 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 @@ static void dequeue_rx(ns_dev * card, ns #endif /* NS_USE_DESTRUCTORS */ __net_timestamp(hb); vcc->push(vcc, hb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); } } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/solos-pci.c linux-2.6.39-pax/drivers/atm/solos-pci.c --- linux-2.6.39/drivers/atm/solos-pci.c 2011-05-19 10:21:18.000000000 +0200 +++ linux-2.6.39-pax/drivers/atm/solos-pci.c 2011-05-19 13:45:29.000000000 +0200 @@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); vcc->push(vcc, skb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); break; case PKT_STATUS: @@ -900,6 +900,8 @@ static int print_buffer(struct sk_buff * char msg[500]; char item[10]; + pax_track_stack(); + len = buf->len; for (i = 0; i < len; i++){ if(i % 8 == 0) @@ -1009,7 +1011,7 @@ static uint32_t fpga_tx(struct solos_car 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/suni.c linux-2.6.39-pax/drivers/atm/suni.c --- linux-2.6.39/drivers/atm/suni.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/atm/suni.c 2011-05-19 13:45:29.000000000 +0200 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock); #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/uPD98402.c linux-2.6.39-pax/drivers/atm/uPD98402.c --- linux-2.6.39/drivers/atm/uPD98402.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/atm/uPD98402.c 2011-05-19 13:45:29.000000000 +0200 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d 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 @@ static int uPD98402_ioctl(struct atm_dev #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 @@ static void uPD98402_int(struct atm_dev 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 @@ static int uPD98402_start(struct atm_dev 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/atm/zatm.c linux-2.6.39-pax/drivers/atm/zatm.c --- linux-2.6.39/drivers/atm/zatm.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/atm/zatm.c 2011-05-19 13:45:29.000000000 +0200 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } 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 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy 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 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/base/iommu.c linux-2.6.39-pax/drivers/base/iommu.c --- linux-2.6.39/drivers/base/iommu.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/base/iommu.c 2011-05-19 14:23:29.000000000 +0200 @@ -23,9 +23,8 @@ #include #include -static struct iommu_ops *iommu_ops; - -void register_iommu(struct iommu_ops *ops) +static const struct iommu_ops *iommu_ops; +void register_iommu(const struct iommu_ops *ops) { if (iommu_ops) BUG(); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/base/power/generic_ops.c linux-2.6.39-pax/drivers/base/power/generic_ops.c --- linux-2.6.39/drivers/base/power/generic_ops.c 2011-03-15 19:33:13.000000000 +0100 +++ linux-2.6.39-pax/drivers/base/power/generic_ops.c 2011-05-19 14:23:29.000000000 +0200 @@ -215,7 +215,7 @@ int pm_generic_restore(struct device *de EXPORT_SYMBOL_GPL(pm_generic_restore); #endif /* CONFIG_PM_SLEEP */ -struct dev_pm_ops generic_subsys_pm_ops = { +const struct dev_pm_ops generic_subsys_pm_ops = { #ifdef CONFIG_PM_SLEEP .suspend = pm_generic_suspend, .resume = pm_generic_resume, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/base/power/wakeup.c linux-2.6.39-pax/drivers/base/power/wakeup.c --- linux-2.6.39/drivers/base/power/wakeup.c 2011-05-19 10:21:19.000000000 +0200 +++ linux-2.6.39-pax/drivers/base/power/wakeup.c 2011-05-19 13:45:29.000000000 +0200 @@ -29,14 +29,14 @@ bool events_check_enabled; * They need to be modified together atomically, so it's better to use one * atomic variable to hold them both. */ -static atomic_t combined_event_count = ATOMIC_INIT(0); +static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0); #define IN_PROGRESS_BITS (sizeof(int) * 4) #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1) static void split_counters(unsigned int *cnt, unsigned int *inpr) { - unsigned int comb = atomic_read(&combined_event_count); + unsigned int comb = atomic_read_unchecked(&combined_event_count); *cnt = (comb >> IN_PROGRESS_BITS); *inpr = comb & MAX_IN_PROGRESS; @@ -351,7 +351,7 @@ static void wakeup_source_activate(struc ws->last_time = ktime_get(); /* Increment the counter of events in progress. */ - atomic_inc(&combined_event_count); + atomic_inc_unchecked(&combined_event_count); } /** @@ -441,7 +441,7 @@ static void wakeup_source_deactivate(str * Increment the counter of registered wakeup events and decrement the * couter of wakeup events in progress simultaneously. */ - atomic_add(MAX_IN_PROGRESS, &combined_event_count); + atomic_add_unchecked(MAX_IN_PROGRESS, &combined_event_count); } /** diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/block/DAC960.c linux-2.6.39-pax/drivers/block/DAC960.c --- linux-2.6.39/drivers/block/DAC960.c 2011-05-19 10:21:19.000000000 +0200 +++ linux-2.6.39-pax/drivers/block/DAC960.c 2011-05-19 13:45:29.000000000 +0200 @@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur unsigned long flags; int Channel, TargetID; + pax_track_stack(); + if (!init_dma_loaf(Controller->PCIDevice, &local_dma, DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) + sizeof(DAC960_SCSI_Inquiry_T) + diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/block/cciss.c linux-2.6.39-pax/drivers/block/cciss.c --- linux-2.6.39/drivers/block/cciss.c 2011-05-19 10:21:19.000000000 +0200 +++ linux-2.6.39-pax/drivers/block/cciss.c 2011-05-19 14:23:29.000000000 +0200 @@ -103,7 +103,7 @@ MODULE_DEVICE_TABLE(pci, cciss_pci_devic * product = Marketing Name for the board * access = Address of the struct of function pointers */ -static struct board_type products[] = { +static const struct board_type products[] = { {0x40700E11, "Smart Array 5300", &SA5_access}, {0x40800E11, "Smart Array 5i", &SA5B_access}, {0x40820E11, "Smart Array 532", &SA5B_access}, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/block/cciss.h linux-2.6.39-pax/drivers/block/cciss.h --- linux-2.6.39/drivers/block/cciss.h 2011-05-19 10:21:19.000000000 +0200 +++ linux-2.6.39-pax/drivers/block/cciss.h 2011-05-19 14:23:29.000000000 +0200 @@ -393,7 +393,7 @@ static bool SA5_performant_intr_pending( return register_value & SA5_OUTDB_STATUS_PERF_BIT; } -static struct access_method SA5_access = { +static const struct access_method SA5_access = { SA5_submit_command, SA5_intr_mask, SA5_fifo_full, @@ -401,7 +401,7 @@ static struct access_method SA5_access = SA5_completed, }; -static struct access_method SA5B_access = { +static const struct access_method SA5B_access = { SA5_submit_command, SA5B_intr_mask, SA5_fifo_full, @@ -409,7 +409,7 @@ static struct access_method SA5B_access SA5_completed, }; -static struct access_method SA5_performant_access = { +static const struct access_method SA5_performant_access = { SA5_submit_command, SA5_performant_intr_mask, SA5_fifo_full, @@ -420,7 +420,7 @@ static struct access_method SA5_performa struct board_type { __u32 board_id; char *product_name; - struct access_method *access; + const struct access_method *access; int nr_cmds; /* Max cmds this kind of ctlr can handle. */ }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/block/cpqarray.c linux-2.6.39-pax/drivers/block/cpqarray.c --- linux-2.6.39/drivers/block/cpqarray.c 2011-05-19 10:21:19.000000000 +0200 +++ linux-2.6.39-pax/drivers/block/cpqarray.c 2011-05-19 14:23:27.000000000 +0200 @@ -80,7 +80,7 @@ static int eisa[8]; * product = Marketing Name for the board * access = Address of the struct of function pointers */ -static struct board_type products[] = { +static const struct board_type products[] = { { 0x0040110E, "IDA", &smart1_access }, { 0x0140110E, "IDA-2", &smart1_access }, { 0x1040110E, "IAES", &smart1_access }, @@ -911,6 +911,8 @@ static void do_ida_request(struct reques struct scatterlist tmp_sg[SG_MAX]; int i, dir, seg; + pax_track_stack(); + queue_next: creq = blk_peek_request(q); if (!creq) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/block/cpqarray.h linux-2.6.39-pax/drivers/block/cpqarray.h --- linux-2.6.39/drivers/block/cpqarray.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/block/cpqarray.h 2011-05-19 14:23:29.000000000 +0200 @@ -69,7 +69,7 @@ struct access_method { struct board_type { __u32 board_id; char *product_name; - struct access_method *access; + const struct access_method *access; }; struct ctlr_info { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/block/drbd/drbd_int.h linux-2.6.39-pax/drivers/block/drbd/drbd_int.h --- linux-2.6.39/drivers/block/drbd/drbd_int.h 2011-05-19 10:21:19.000000000 +0200 +++ linux-2.6.39-pax/drivers/block/drbd/drbd_int.h 2011-05-19 13:45:29.000000000 +0200 @@ -736,7 +736,7 @@ struct drbd_request; struct drbd_epoch { struct list_head list; unsigned int barrier_nr; - atomic_t epoch_size; /* increased on every request added. */ + atomic_unchecked_t epoch_size; /* increased on every request added. */ atomic_t active; /* increased on every req. added, and dec on every finished. */ unsigned long flags; }; @@ -1108,7 +1108,7 @@ struct drbd_conf { void *int_dig_in; void *int_dig_vv; wait_queue_head_t seq_wait; - atomic_t packet_seq; + atomic_unchecked_t packet_seq; unsigned int peer_seq; spinlock_t peer_seq_lock; unsigned int minor; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/block/drbd/drbd_main.c linux-2.6.39-pax/drivers/block/drbd/drbd_main.c --- linux-2.6.39/drivers/block/drbd/drbd_main.c 2011-05-19 10:21:19.000000000 +0200 +++ linux-2.6.39-pax/drivers/block/drbd/drbd_main.c 2011-05-19 13:45:29.000000000 +0200 @@ -2387,7 +2387,7 @@ static int _drbd_send_ack(struct drbd_co p.sector = sector; p.block_id = block_id; p.blksize = blksize; - p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq)); + p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq)); if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED) return false; @@ -2686,7 +2686,7 @@ int drbd_send_dblock(struct drbd_conf *m p.sector = cpu_to_be64(req->sector); p.block_id = (unsigned long)req; p.seq_num = cpu_to_be32(req->seq_num = - atomic_add_return(1, &mdev->packet_seq)); + atomic_add_return_unchecked(1, &mdev->packet_seq)); dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw); @@ -2971,7 +2971,7 @@ void drbd_init_set_defaults(struct drbd_ atomic_set(&mdev->unacked_cnt, 0); atomic_set(&mdev->local_cnt, 0); atomic_set(&mdev->net_cnt, 0); - atomic_set(&mdev->packet_seq, 0); + atomic_set_unchecked(&mdev->packet_seq, 0); atomic_set(&mdev->pp_in_use, 0); atomic_set(&mdev->pp_in_use_by_net, 0); atomic_set(&mdev->rs_sect_in, 0); @@ -3051,8 +3051,8 @@ void drbd_mdev_cleanup(struct drbd_conf mdev->receiver.t_state); /* no need to lock it, I'm the only thread alive */ - if (atomic_read(&mdev->current_epoch->epoch_size) != 0) - dev_err(DEV, "epoch_size:%d\n", atomic_read(&mdev->current_epoch->epoch_size)); + if (atomic_read_unchecked(&mdev->current_epoch->epoch_size) != 0) + dev_err(DEV, "epoch_size:%d\n", atomic_read_unchecked(&mdev->current_epoch->epoch_size)); mdev->al_writ_cnt = mdev->bm_writ_cnt = mdev->read_cnt = diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/block/drbd/drbd_nl.c linux-2.6.39-pax/drivers/block/drbd/drbd_nl.c --- linux-2.6.39/drivers/block/drbd/drbd_nl.c 2011-05-19 10:21:19.000000000 +0200 +++ linux-2.6.39-pax/drivers/block/drbd/drbd_nl.c 2011-05-19 13:45:29.000000000 +0200 @@ -2298,7 +2298,7 @@ static void drbd_connector_callback(stru module_put(THIS_MODULE); } -static atomic_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */ +static atomic_unchecked_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */ static unsigned short * __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data, @@ -2369,7 +2369,7 @@ void drbd_bcast_state(struct drbd_conf * cn_reply->id.idx = CN_IDX_DRBD; cn_reply->id.val = CN_VAL_DRBD; - cn_reply->seq = atomic_add_return(1, &drbd_nl_seq); + cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq); cn_reply->ack = 0; /* not used here. */ cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + (int)((char *)tl - (char *)reply->tag_list); @@ -2401,7 +2401,7 @@ void drbd_bcast_ev_helper(struct drbd_co cn_reply->id.idx = CN_IDX_DRBD; cn_reply->id.val = CN_VAL_DRBD; - cn_reply->seq = atomic_add_return(1, &drbd_nl_seq); + cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq); cn_reply->ack = 0; /* not used here. */ cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + (int)((char *)tl - (char *)reply->tag_list); @@ -2479,7 +2479,7 @@ void drbd_bcast_ee(struct drbd_conf *mde cn_reply->id.idx = CN_IDX_DRBD; cn_reply->id.val = CN_VAL_DRBD; - cn_reply->seq = atomic_add_return(1,&drbd_nl_seq); + cn_reply->seq = atomic_add_return_unchecked(1,&drbd_nl_seq); cn_reply->ack = 0; // not used here. cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + (int)((char*)tl - (char*)reply->tag_list); @@ -2518,7 +2518,7 @@ void drbd_bcast_sync_progress(struct drb cn_reply->id.idx = CN_IDX_DRBD; cn_reply->id.val = CN_VAL_DRBD; - cn_reply->seq = atomic_add_return(1, &drbd_nl_seq); + cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq); cn_reply->ack = 0; /* not used here. */ cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + (int)((char *)tl - (char *)reply->tag_list); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/block/drbd/drbd_receiver.c linux-2.6.39-pax/drivers/block/drbd/drbd_receiver.c --- linux-2.6.39/drivers/block/drbd/drbd_receiver.c 2011-05-19 10:21:19.000000000 +0200 +++ linux-2.6.39-pax/drivers/block/drbd/drbd_receiver.c 2011-05-19 13:45:29.000000000 +0200 @@ -894,7 +894,7 @@ retry: sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10; sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; - atomic_set(&mdev->packet_seq, 0); + atomic_set_unchecked(&mdev->packet_seq, 0); mdev->peer_seq = 0; drbd_thread_start(&mdev->asender); @@ -990,7 +990,7 @@ static enum finish_epoch drbd_may_finish do { next_epoch = NULL; - epoch_size = atomic_read(&epoch->epoch_size); + epoch_size = atomic_read_unchecked(&epoch->epoch_size); switch (ev & ~EV_CLEANUP) { case EV_PUT: @@ -1025,7 +1025,7 @@ static enum finish_epoch drbd_may_finish rv = FE_DESTROYED; } else { epoch->flags = 0; - atomic_set(&epoch->epoch_size, 0); + atomic_set_unchecked(&epoch->epoch_size, 0); /* atomic_set(&epoch->active, 0); is already zero */ if (rv == FE_STILL_LIVE) rv = FE_RECYCLED; @@ -1196,14 +1196,14 @@ static int receive_Barrier(struct drbd_c drbd_wait_ee_list_empty(mdev, &mdev->active_ee); drbd_flush(mdev); - if (atomic_read(&mdev->current_epoch->epoch_size)) { + if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) { epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO); if (epoch) break; } epoch = mdev->current_epoch; - wait_event(mdev->ee_wait, atomic_read(&epoch->epoch_size) == 0); + wait_event(mdev->ee_wait, atomic_read_unchecked(&epoch->epoch_size) == 0); D_ASSERT(atomic_read(&epoch->active) == 0); D_ASSERT(epoch->flags == 0); @@ -1215,11 +1215,11 @@ static int receive_Barrier(struct drbd_c } epoch->flags = 0; - atomic_set(&epoch->epoch_size, 0); + atomic_set_unchecked(&epoch->epoch_size, 0); atomic_set(&epoch->active, 0); spin_lock(&mdev->epoch_lock); - if (atomic_read(&mdev->current_epoch->epoch_size)) { + if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) { list_add(&epoch->list, &mdev->current_epoch->list); mdev->current_epoch = epoch; mdev->epochs++; @@ -1668,7 +1668,7 @@ static int receive_Data(struct drbd_conf spin_unlock(&mdev->peer_seq_lock); drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size); - atomic_inc(&mdev->current_epoch->epoch_size); + atomic_inc_unchecked(&mdev->current_epoch->epoch_size); return drbd_drain_block(mdev, data_size); } @@ -1694,7 +1694,7 @@ static int receive_Data(struct drbd_conf spin_lock(&mdev->epoch_lock); e->epoch = mdev->current_epoch; - atomic_inc(&e->epoch->epoch_size); + atomic_inc_unchecked(&e->epoch->epoch_size); atomic_inc(&e->epoch->active); spin_unlock(&mdev->epoch_lock); @@ -3905,7 +3905,7 @@ static void drbd_disconnect(struct drbd_ D_ASSERT(list_empty(&mdev->done_ee)); /* ok, no more ee's on the fly, it is safe to reset the epoch_size */ - atomic_set(&mdev->current_epoch->epoch_size, 0); + atomic_set_unchecked(&mdev->current_epoch->epoch_size, 0); D_ASSERT(list_empty(&mdev->current_epoch->list)); } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/block/nbd.c linux-2.6.39-pax/drivers/block/nbd.c --- linux-2.6.39/drivers/block/nbd.c 2011-03-15 19:33:14.000000000 +0100 +++ linux-2.6.39-pax/drivers/block/nbd.c 2011-05-19 13:45:29.000000000 +0200 @@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device * struct kvec iov; sigset_t blocked, oldset; + pax_track_stack(); + if (unlikely(!sock)) { printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n", lo->disk->disk_name, (send ? "send" : "recv")); @@ -571,6 +573,8 @@ static void do_nbd_request(struct reques static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo, unsigned int cmd, unsigned long arg) { + pax_track_stack(); + switch (cmd) { case NBD_DISCONNECT: { struct request sreq; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/block/smart1,2.h linux-2.6.39-pax/drivers/block/smart1,2.h --- linux-2.6.39/drivers/block/smart1,2.h 2011-05-19 10:21:19.000000000 +0200 +++ linux-2.6.39-pax/drivers/block/smart1,2.h 2011-05-19 14:23:29.000000000 +0200 @@ -107,7 +107,7 @@ static unsigned long smart4_intr_pending return 0 ; } -static struct access_method smart4_access = { +static const struct access_method smart4_access = { smart4_submit_command, smart4_intr_mask, smart4_fifo_full, @@ -143,7 +143,7 @@ static unsigned long smart2_intr_pending return readl(h->vaddr + INTR_PENDING); } -static struct access_method smart2_access = { +static const struct access_method smart2_access = { smart2_submit_command, smart2_intr_mask, smart2_fifo_full, @@ -179,7 +179,7 @@ static unsigned long smart2e_intr_pendin return inl(h->io_mem_addr + INTR_PENDING); } -static struct access_method smart2e_access = { +static const struct access_method smart2e_access = { smart2e_submit_command, smart2e_intr_mask, smart2e_fifo_full, @@ -269,7 +269,7 @@ static unsigned long smart1_intr_pending return chan; } -static struct access_method smart1_access = { +static const struct access_method smart1_access = { smart1_submit_command, smart1_intr_mask, smart1_fifo_full, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/block/xsysace.c linux-2.6.39-pax/drivers/block/xsysace.c --- linux-2.6.39/drivers/block/xsysace.c 2011-05-19 10:21:19.000000000 +0200 +++ linux-2.6.39-pax/drivers/block/xsysace.c 2011-05-19 14:23:29.000000000 +0200 @@ -262,7 +262,7 @@ static void ace_dataout_8(struct ace_dev ace->data_ptr = src; } -static struct ace_reg_ops ace_reg_8_ops = { +static const struct ace_reg_ops ace_reg_8_ops = { .in = ace_in_8, .out = ace_out_8, .datain = ace_datain_8, @@ -327,14 +327,14 @@ static void ace_dataout_le16(struct ace_ ace->data_ptr = src; } -static struct ace_reg_ops ace_reg_be16_ops = { +static const struct ace_reg_ops ace_reg_be16_ops = { .in = ace_in_be16, .out = ace_out_be16, .datain = ace_datain_be16, .dataout = ace_dataout_be16, }; -static struct ace_reg_ops ace_reg_le16_ops = { +static const struct ace_reg_ops ace_reg_le16_ops = { .in = ace_in_le16, .out = ace_out_le16, .datain = ace_datain_le16, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/agp/frontend.c linux-2.6.39-pax/drivers/char/agp/frontend.c --- linux-2.6.39/drivers/char/agp/frontend.c 2011-03-15 19:33:14.000000000 +0100 +++ linux-2.6.39-pax/drivers/char/agp/frontend.c 2011-05-19 13:45:29.000000000 +0200 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/hpet.c linux-2.6.39-pax/drivers/char/hpet.c --- linux-2.6.39/drivers/char/hpet.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/char/hpet.c 2011-05-19 13:45:29.000000000 +0200 @@ -553,7 +553,7 @@ static inline unsigned long hpet_time_di } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/ipmi/ipmi_devintf.c linux-2.6.39-pax/drivers/char/ipmi/ipmi_devintf.c --- linux-2.6.39/drivers/char/ipmi/ipmi_devintf.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/char/ipmi/ipmi_devintf.c 2011-05-19 14:23:29.000000000 +0200 @@ -109,8 +109,7 @@ static int ipmi_fasync(int fd, struct fi return (result); } -static struct ipmi_user_hndl ipmi_hndlrs = -{ +static const struct ipmi_user_hndl ipmi_hndlrs = { .ipmi_recv_hndl = file_receive_handler, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.39-pax/drivers/char/ipmi/ipmi_msghandler.c --- linux-2.6.39/drivers/char/ipmi/ipmi_msghandler.c 2011-03-15 19:33:15.000000000 +0100 +++ linux-2.6.39-pax/drivers/char/ipmi/ipmi_msghandler.c 2011-05-19 14:23:27.000000000 +0200 @@ -82,7 +82,7 @@ struct ipmi_user { struct kref refcount; /* The upper layer that handles receive messages. */ - struct ipmi_user_hndl *handler; + const struct ipmi_user_hndl *handler; void *handler_data; /* The interface this user is bound to. */ @@ -414,7 +414,7 @@ struct ipmi_smi { 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 @@ static DEFINE_MUTEX(smi_watchers_mutex); #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) { @@ -875,7 +875,7 @@ static int intf_err_seq(ipmi_smi_t int int ipmi_create_user(unsigned int if_num, - struct ipmi_user_hndl *handler, + const struct ipmi_user_hndl *handler, void *handler_data, ipmi_user_t *user) { @@ -2844,7 +2844,7 @@ int ipmi_register_smi(struct ipmi_smi_ha 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; @@ -4196,6 +4196,8 @@ static void send_panic_events(char *str) struct ipmi_smi_msg smi_msg; struct ipmi_recv_msg recv_msg; + pax_track_stack(); + si = (struct ipmi_system_interface_addr *) &addr; si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE; si->channel = IPMI_BMC_CHANNEL; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/ipmi/ipmi_poweroff.c linux-2.6.39-pax/drivers/char/ipmi/ipmi_poweroff.c --- linux-2.6.39/drivers/char/ipmi/ipmi_poweroff.c 2011-05-19 10:21:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/char/ipmi/ipmi_poweroff.c 2011-05-19 14:23:29.000000000 +0200 @@ -133,7 +133,7 @@ static void receive_handler(struct ipmi_ complete(comp); } -static struct ipmi_user_hndl ipmi_poweroff_handler = { +static const struct ipmi_user_hndl ipmi_poweroff_handler = { .ipmi_recv_hndl = receive_handler }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.39-pax/drivers/char/ipmi/ipmi_si_intf.c --- linux-2.6.39/drivers/char/ipmi/ipmi_si_intf.c 2011-05-19 10:21:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/char/ipmi/ipmi_si_intf.c 2011-05-19 13:45:29.000000000 +0200 @@ -276,7 +276,7 @@ struct smi_info { 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; @@ -285,9 +285,9 @@ struct smi_info { }; #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 @@ -3198,7 +3198,7 @@ static int try_smi_init(struct smi_info 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/ipmi/ipmi_watchdog.c linux-2.6.39-pax/drivers/char/ipmi/ipmi_watchdog.c --- linux-2.6.39/drivers/char/ipmi/ipmi_watchdog.c 2011-03-15 19:33:15.000000000 +0100 +++ linux-2.6.39-pax/drivers/char/ipmi/ipmi_watchdog.c 2011-05-19 14:23:29.000000000 +0200 @@ -216,7 +216,7 @@ static int set_param_timeout(const char return rv; } -static struct kernel_param_ops param_ops_timeout = { +static const struct kernel_param_ops param_ops_timeout = { .set = set_param_timeout, .get = param_get_int, }; @@ -278,14 +278,14 @@ static int set_param_wdog_ifnum(const ch return 0; } -static struct kernel_param_ops param_ops_wdog_ifnum = { +static const struct kernel_param_ops param_ops_wdog_ifnum = { .set = set_param_wdog_ifnum, .get = param_get_int, }; #define param_check_wdog_ifnum param_check_int -static struct kernel_param_ops param_ops_str = { +static const struct kernel_param_ops param_ops_str = { .set = set_param_str, .get = get_param_str, }; @@ -953,7 +953,7 @@ static void ipmi_wdog_pretimeout_handler pretimeout_since_last_heartbeat = 1; } -static struct ipmi_user_hndl ipmi_hndlrs = { +static const struct ipmi_user_hndl ipmi_hndlrs = { .ipmi_recv_hndl = ipmi_wdog_msg_handler, .ipmi_watchdog_pretimeout = ipmi_wdog_pretimeout_handler }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/mem.c linux-2.6.39-pax/drivers/char/mem.c --- linux-2.6.39/drivers/char/mem.c 2011-05-19 10:21:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/char/mem.c 2011-05-19 13:45:29.000000000 +0200 @@ -117,6 +117,7 @@ static ssize_t read_mem(struct file *fil while (count > 0) { unsigned long remaining; + char *temp; sz = size_inside_page(p, count); @@ -132,7 +133,23 @@ static ssize_t read_mem(struct file *fil 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; @@ -395,9 +412,8 @@ static ssize_t read_kmem(struct file *fi 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) { @@ -419,6 +435,8 @@ static ssize_t read_kmem(struct file *fi } #endif while (low_count > 0) { + char *temp; + sz = size_inside_page(p, low_count); /* @@ -428,7 +446,22 @@ static ssize_t read_kmem(struct file *fi */ 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; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/mmtimer.c linux-2.6.39-pax/drivers/char/mmtimer.c --- linux-2.6.39/drivers/char/mmtimer.c 2011-05-19 10:21:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/char/mmtimer.c 2011-05-19 14:23:29.000000000 +0200 @@ -53,7 +53,7 @@ MODULE_LICENSE("GPL"); #define RTC_BITS 55 /* 55 bits for this implementation */ -static struct k_clock sgi_clock; +static const struct k_clock sgi_clock; extern unsigned long sn_rtc_cycles_per_second; @@ -772,7 +772,7 @@ static int sgi_clock_getres(const clocki return 0; } -static struct k_clock sgi_clock = { +static const struct k_clock sgi_clock = { .clock_set = sgi_clock_set, .clock_get = sgi_clock_get, .clock_getres = sgi_clock_getres, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/nvram.c linux-2.6.39-pax/drivers/char/nvram.c --- linux-2.6.39/drivers/char/nvram.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/char/nvram.c 2011-05-19 13:45:29.000000000 +0200 @@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/random.c linux-2.6.39-pax/drivers/char/random.c --- linux-2.6.39/drivers/char/random.c 2011-05-19 10:21:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/char/random.c 2011-05-19 13:45:29.000000000 +0200 @@ -909,7 +909,7 @@ static ssize_t extract_entropy_user(stru 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; } @@ -1214,7 +1214,7 @@ EXPORT_SYMBOL(generate_random_uuid); #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/sonypi.c linux-2.6.39-pax/drivers/char/sonypi.c --- linux-2.6.39/drivers/char/sonypi.c 2011-05-19 10:21:27.000000000 +0200 +++ linux-2.6.39-pax/drivers/char/sonypi.c 2011-05-19 13:45:29.000000000 +0200 @@ -55,6 +55,7 @@ #include #include #include +#include #include @@ -491,7 +492,7 @@ static struct sonypi_device { 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_fasync(int fd, st 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 @@ static int sonypi_misc_open(struct inode { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/tpm/tpm.c linux-2.6.39-pax/drivers/char/tpm/tpm.c --- linux-2.6.39/drivers/char/tpm/tpm.c 2011-05-19 10:21:27.000000000 +0200 +++ linux-2.6.39-pax/drivers/char/tpm/tpm.c 2011-05-19 13:45:29.000000000 +0200 @@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c 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; @@ -844,6 +844,8 @@ ssize_t tpm_show_pubek(struct device *de struct tpm_chip *chip = dev_get_drvdata(dev); + pax_track_stack(); + tpm_cmd.header.in = tpm_readpubek_header; err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE, "attempting to read the PUBEK"); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/tpm/tpm_bios.c linux-2.6.39-pax/drivers/char/tpm/tpm_bios.c --- linux-2.6.39/drivers/char/tpm/tpm_bios.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/char/tpm/tpm_bios.c 2011-05-19 13:45:29.000000000 +0200 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start 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 @@ static void *tpm_bios_measurements_next( 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 @@ static int tpm_binary_bios_measurements_ 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 @@ static int read_log(struct tpm_bios_log 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/ttyprintk.c linux-2.6.39-pax/drivers/char/ttyprintk.c --- linux-2.6.39/drivers/char/ttyprintk.c 2011-05-19 10:21:27.000000000 +0200 +++ linux-2.6.39-pax/drivers/char/ttyprintk.c 2011-05-19 14:23:29.000000000 +0200 @@ -170,7 +170,7 @@ static const struct tty_operations ttypr .ioctl = tpk_ioctl, }; -struct tty_port_operations null_ops = { }; +const struct tty_port_operations null_ops = { }; static struct tty_driver *ttyprintk_driver; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/char/xilinx_hwicap/xilinx_hwicap.c linux-2.6.39-pax/drivers/char/xilinx_hwicap/xilinx_hwicap.c --- linux-2.6.39/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2011-05-19 10:21:27.000000000 +0200 +++ linux-2.6.39-pax/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2011-05-19 14:23:29.000000000 +0200 @@ -678,14 +678,14 @@ static int __devinit hwicap_setup(struct return retval; } -static struct hwicap_driver_config buffer_icap_config = { +static const struct hwicap_driver_config buffer_icap_config = { .get_configuration = buffer_icap_get_configuration, .set_configuration = buffer_icap_set_configuration, .get_status = buffer_icap_get_status, .reset = buffer_icap_reset, }; -static struct hwicap_driver_config fifo_icap_config = { +static const struct hwicap_driver_config fifo_icap_config = { .get_configuration = fifo_icap_get_configuration, .set_configuration = fifo_icap_set_configuration, .get_status = fifo_icap_get_status, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/crypto/hifn_795x.c linux-2.6.39-pax/drivers/crypto/hifn_795x.c --- linux-2.6.39/drivers/crypto/hifn_795x.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/crypto/hifn_795x.c 2011-05-19 13:45:29.000000000 +0200 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device 0xCA, 0x34, 0x2B, 0x2E}; struct scatterlist sg; + pax_track_stack(); + memset(src, 0, sizeof(src)); memset(ctx.key, 0, sizeof(ctx.key)); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/crypto/padlock-aes.c linux-2.6.39-pax/drivers/crypto/padlock-aes.c --- linux-2.6.39/drivers/crypto/padlock-aes.c 2011-03-15 19:33:16.000000000 +0100 +++ linux-2.6.39-pax/drivers/crypto/padlock-aes.c 2011-05-19 13:45:29.000000000 +0200 @@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm struct crypto_aes_ctx gen_aes; int cpu; + pax_track_stack(); + if (key_len % 8) { *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; return -EINVAL; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/dca/dca-core.c linux-2.6.39-pax/drivers/dca/dca-core.c --- linux-2.6.39/drivers/dca/dca-core.c 2011-05-19 10:21:28.000000000 +0200 +++ linux-2.6.39-pax/drivers/dca/dca-core.c 2011-05-19 14:23:29.000000000 +0200 @@ -325,7 +325,7 @@ EXPORT_SYMBOL_GPL(dca_get_tag); * @ops - pointer to struct of dca operation function pointers * @priv_size - size of extra mem to be added for provider's needs */ -struct dca_provider *alloc_dca_provider(struct dca_ops *ops, int priv_size) +struct dca_provider *alloc_dca_provider(const struct dca_ops *ops, int priv_size) { struct dca_provider *dca; int alloc_size; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/dma/ioat/dca.c linux-2.6.39-pax/drivers/dma/ioat/dca.c --- linux-2.6.39/drivers/dma/ioat/dca.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/dma/ioat/dca.c 2011-05-19 14:23:29.000000000 +0200 @@ -234,7 +234,7 @@ static int ioat_dca_dev_managed(struct d return 0; } -static struct dca_ops ioat_dca_ops = { +static const struct dca_ops ioat_dca_ops = { .add_requester = ioat_dca_add_requester, .remove_requester = ioat_dca_remove_requester, .get_tag = ioat_dca_get_tag, @@ -384,7 +384,7 @@ static u8 ioat2_dca_get_tag(struct dca_p return tag; } -static struct dca_ops ioat2_dca_ops = { +static const struct dca_ops ioat2_dca_ops = { .add_requester = ioat2_dca_add_requester, .remove_requester = ioat2_dca_remove_requester, .get_tag = ioat2_dca_get_tag, @@ -579,7 +579,7 @@ static u8 ioat3_dca_get_tag(struct dca_p return tag; } -static struct dca_ops ioat3_dca_ops = { +static const struct dca_ops ioat3_dca_ops = { .add_requester = ioat3_dca_add_requester, .remove_requester = ioat3_dca_remove_requester, .get_tag = ioat3_dca_get_tag, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/edac/amd64_edac.h linux-2.6.39-pax/drivers/edac/amd64_edac.h --- linux-2.6.39/drivers/edac/amd64_edac.h 2011-05-19 10:21:28.000000000 +0200 +++ linux-2.6.39-pax/drivers/edac/amd64_edac.h 2011-05-19 14:23:29.000000000 +0200 @@ -333,7 +333,7 @@ struct chip_select { }; struct amd64_pvt { - struct low_ops *ops; + const struct low_ops *ops; /* pci_device handles which we utilize */ struct pci_dev *F1, *F2, *F3; @@ -443,7 +443,7 @@ struct low_ops { struct amd64_family_type { const char *ctl_name; u16 f1_id, f3_id; - struct low_ops ops; + const struct low_ops ops; }; int __amd64_write_pci_cfg_dword(struct pci_dev *pdev, int offset, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/edac/edac_mc_sysfs.c linux-2.6.39-pax/drivers/edac/edac_mc_sysfs.c --- linux-2.6.39/drivers/edac/edac_mc_sysfs.c 2011-05-19 10:21:28.000000000 +0200 +++ linux-2.6.39-pax/drivers/edac/edac_mc_sysfs.c 2011-05-19 14:23:29.000000000 +0200 @@ -760,7 +760,7 @@ static void edac_inst_grp_release(struct } /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/edac/edac_pci_sysfs.c linux-2.6.39-pax/drivers/edac/edac_pci_sysfs.c --- linux-2.6.39/drivers/edac/edac_pci_sysfs.c 2011-05-19 10:21:28.000000000 +0200 +++ linux-2.6.39-pax/drivers/edac/edac_pci_sysfs.c 2011-05-19 13:45:29.000000000 +0200 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */ static int edac_pci_poll_msec = 1000; /* one second workq period */ -static atomic_t pci_parity_count = ATOMIC_INIT(0); -static atomic_t pci_nonparity_count = ATOMIC_INIT(0); +static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0); +static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0); static struct kobject *edac_pci_top_main_kobj; static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0); @@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(str edac_printk(KERN_CRIT, EDAC_PCI, "Signaled System Error on %s\n", pci_name(dev)); - atomic_inc(&pci_nonparity_count); + atomic_inc_unchecked(&pci_nonparity_count); } if (status & (PCI_STATUS_PARITY)) { @@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(str "Master Data Parity Error on %s\n", pci_name(dev)); - atomic_inc(&pci_parity_count); + atomic_inc_unchecked(&pci_parity_count); } if (status & (PCI_STATUS_DETECTED_PARITY)) { @@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(str "Detected Parity Error on %s\n", pci_name(dev)); - atomic_inc(&pci_parity_count); + atomic_inc_unchecked(&pci_parity_count); } } @@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(str edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " "Signaled System Error on %s\n", pci_name(dev)); - atomic_inc(&pci_nonparity_count); + atomic_inc_unchecked(&pci_nonparity_count); } if (status & (PCI_STATUS_PARITY)) { @@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(str "Master Data Parity Error on " "%s\n", pci_name(dev)); - atomic_inc(&pci_parity_count); + atomic_inc_unchecked(&pci_parity_count); } if (status & (PCI_STATUS_DETECTED_PARITY)) { @@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(str "Detected Parity Error on %s\n", pci_name(dev)); - atomic_inc(&pci_parity_count); + atomic_inc_unchecked(&pci_parity_count); } } } @@ -677,7 +677,7 @@ void edac_pci_do_parity_check(void) if (!check_pci_errors) return; - before_count = atomic_read(&pci_parity_count); + before_count = atomic_read_unchecked(&pci_parity_count); /* scan all PCI devices looking for a Parity Error on devices and * bridges. @@ -689,7 +689,7 @@ void edac_pci_do_parity_check(void) /* Only if operator has selected panic on PCI Error */ if (edac_pci_get_panic_on_pe()) { /* If the count is different 'after' from 'before' */ - if (before_count != atomic_read(&pci_parity_count)) + if (before_count != atomic_read_unchecked(&pci_parity_count)) panic("EDAC: PCI Parity Error"); } } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/firewire/core-cdev.c linux-2.6.39-pax/drivers/firewire/core-cdev.c --- linux-2.6.39/drivers/firewire/core-cdev.c 2011-05-19 10:21:29.000000000 +0200 +++ linux-2.6.39-pax/drivers/firewire/core-cdev.c 2011-05-19 13:45:29.000000000 +0200 @@ -1312,8 +1312,7 @@ static int init_iso_resource(struct clie 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/firewire/core-transaction.c linux-2.6.39-pax/drivers/firewire/core-transaction.c --- linux-2.6.39/drivers/firewire/core-transaction.c 2011-03-15 19:33:17.000000000 +0100 +++ linux-2.6.39-pax/drivers/firewire/core-transaction.c 2011-05-19 13:45:29.000000000 +0200 @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -420,6 +421,8 @@ int fw_run_transaction(struct fw_card *c struct transaction_callback_data d; struct fw_transaction t; + pax_track_stack(); + init_timer_on_stack(&t.split_timeout_timer); init_completion(&d.done); d.payload = payload; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/firmware/dmi_scan.c linux-2.6.39-pax/drivers/firmware/dmi_scan.c --- linux-2.6.39/drivers/firmware/dmi_scan.c 2011-03-15 19:33:17.000000000 +0100 +++ linux-2.6.39-pax/drivers/firmware/dmi_scan.c 2011-05-19 13:45:29.000000000 +0200 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void) } } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpio/vr41xx_giu.c linux-2.6.39-pax/drivers/gpio/vr41xx_giu.c --- linux-2.6.39/drivers/gpio/vr41xx_giu.c 2011-05-19 10:21:29.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpio/vr41xx_giu.c 2011-05-19 13:45:29.000000000 +0200 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq) printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n", maskl, pendl, maskh, pendh); - atomic_inc(&irq_err_count); + atomic_inc_unchecked(&irq_err_count); return -EINVAL; } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.39-pax/drivers/gpu/drm/drm_crtc_helper.c --- linux-2.6.39/drivers/gpu/drm/drm_crtc_helper.c 2011-03-15 19:33:17.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/drm_crtc_helper.c 2011-05-19 13:45:29.000000000 +0200 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d struct drm_crtc *tmp; int crtc_mask = 1; - WARN(!crtc, "checking null crtc?\n"); + BUG_ON(!crtc); dev = crtc->dev; @@ -343,6 +343,8 @@ bool drm_crtc_helper_set_mode(struct drm struct drm_encoder *encoder; bool ret = true; + pax_track_stack(); + crtc->enabled = drm_helper_crtc_in_use(crtc); if (!crtc->enabled) return true; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/drm_drv.c linux-2.6.39-pax/drivers/gpu/drm/drm_drv.c --- linux-2.6.39/drivers/gpu/drm/drm_drv.c 2011-05-19 10:21:29.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/drm_drv.c 2011-05-19 13:45:29.000000000 +0200 @@ -386,7 +386,7 @@ long drm_ioctl(struct file *filp, 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/drm_fops.c linux-2.6.39-pax/drivers/gpu/drm/drm_fops.c --- linux-2.6.39/drivers/gpu/drm/drm_fops.c 2011-03-15 19:33:17.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/drm_fops.c 2011-05-19 13:45:29.000000000 +0200 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device * } 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 @@ int drm_open(struct inode *inode, struct 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 @@ int drm_release(struct inode *inode, str 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 @@ int drm_release(struct inode *inode, str 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 @@ int drm_release(struct inode *inode, str * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/drm_global.c linux-2.6.39-pax/drivers/gpu/drm/drm_global.c --- linux-2.6.39/drivers/gpu/drm/drm_global.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/drm_global.c 2011-05-19 13:45:29.000000000 +0200 @@ -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 @@ void drm_global_init(void) 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 @@ void drm_global_release(void) 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 @@ int drm_global_item_ref(struct drm_globa 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 @@ int drm_global_item_ref(struct drm_globa goto out_err; } - ++item->refcount; + atomic_inc(&item->refcount); ref->object = item->object; object = item->object; mutex_unlock(&item->mutex); @@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_gl 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/drm_info.c linux-2.6.39-pax/drivers/gpu/drm/drm_info.c --- linux-2.6.39/drivers/gpu/drm/drm_info.c 2011-05-19 10:21:29.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/drm_info.c 2011-05-19 13:45:29.000000000 +0200 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void 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; @@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void 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]; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/drm_ioctl.c linux-2.6.39-pax/drivers/gpu/drm/drm_ioctl.c --- linux-2.6.39/drivers/gpu/drm/drm_ioctl.c 2011-05-19 10:21:29.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/drm_ioctl.c 2011-05-19 13:45:29.000000000 +0200 @@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev, 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/drm_lock.c linux-2.6.39-pax/drivers/gpu/drm/drm_lock.c --- linux-2.6.39/drivers/gpu/drm/drm_lock.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/drm_lock.c 2011-05-19 13:45:29.000000000 +0200 @@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi 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 @@ int drm_unlock(struct drm_device *dev, v 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i810/i810_dma.c linux-2.6.39-pax/drivers/gpu/drm/i810/i810_dma.c --- linux-2.6.39/drivers/gpu/drm/i810/i810_dma.c 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/i810/i810_dma.c 2011-05-19 13:45:29.000000000 +0200 @@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de 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]; @@ -1111,8 +1111,8 @@ static int i810_dma_mc(struct drm_device 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i810/i810_drv.h linux-2.6.39-pax/drivers/gpu/drm/i810/i810_drv.h --- linux-2.6.39/drivers/gpu/drm/i810/i810_drv.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/i810/i810_drv.h 2011-05-19 13:45:29.000000000 +0200 @@ -108,8 +108,8 @@ typedef struct drm_i810_private { int page_flipping; wait_queue_head_t irq_queue; - atomic_t irq_received; - atomic_t irq_emitted; + atomic_unchecked_t irq_received; + atomic_unchecked_t irq_emitted; int front_offset; } drm_i810_private_t; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/dvo.h linux-2.6.39-pax/drivers/gpu/drm/i915/dvo.h --- linux-2.6.39/drivers/gpu/drm/i915/dvo.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/dvo.h 2011-05-19 14:23:29.000000000 +0200 @@ -122,23 +122,23 @@ struct intel_dvo_dev_ops { * * \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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.39-pax/drivers/gpu/drm/i915/dvo_ch7017.c --- linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7017.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/dvo_ch7017.c 2011-05-19 14:23:29.000000000 +0200 @@ -390,7 +390,7 @@ static void ch7017_destroy(struct intel_ } } -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.39-pax/drivers/gpu/drm/i915/dvo_ch7xxx.c --- linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-05-19 14:23:29.000000000 +0200 @@ -320,7 +320,7 @@ static void ch7xxx_destroy(struct intel_ } } -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.39-pax/drivers/gpu/drm/i915/dvo_ivch.c --- linux-2.6.39/drivers/gpu/drm/i915/dvo_ivch.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/dvo_ivch.c 2011-05-19 14:23:29.000000000 +0200 @@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dv } } -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.39-pax/drivers/gpu/drm/i915/dvo_sil164.c --- linux-2.6.39/drivers/gpu/drm/i915/dvo_sil164.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/dvo_sil164.c 2011-05-19 14:23:29.000000000 +0200 @@ -252,7 +252,7 @@ static void sil164_destroy(struct intel_ } } -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.39-pax/drivers/gpu/drm/i915/dvo_tfp410.c --- linux-2.6.39/drivers/gpu/drm/i915/dvo_tfp410.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/dvo_tfp410.c 2011-05-19 14:23:29.000000000 +0200 @@ -293,7 +293,7 @@ static void tfp410_destroy(struct intel_ } } -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.39-pax/drivers/gpu/drm/i915/i915_debugfs.c --- linux-2.6.39/drivers/gpu/drm/i915/i915_debugfs.c 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/i915_debugfs.c 2011-05-19 13:45:29.000000000 +0200 @@ -496,7 +496,7 @@ static int i915_interrupt_info(struct se I915_READ(GTIMR)); } seq_printf(m, "Interrupts received: %d\n", - atomic_read(&dev_priv->irq_received)); + atomic_read_unchecked(&dev_priv->irq_received)); for (i = 0; i < I915_NUM_RINGS; i++) { if (IS_GEN6(dev)) { seq_printf(m, "Graphics Interrupt mask (%s): %08x\n", diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/i915_dma.c linux-2.6.39-pax/drivers/gpu/drm/i915/i915_dma.c --- linux-2.6.39/drivers/gpu/drm/i915/i915_dma.c 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/i915_dma.c 2011-05-19 13:45:29.000000000 +0200 @@ -1171,7 +1171,7 @@ static bool i915_switcheroo_can_switch(s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/i915_drv.c linux-2.6.39-pax/drivers/gpu/drm/i915/i915_drv.c --- linux-2.6.39/drivers/gpu/drm/i915/i915_drv.c 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/i915_drv.c 2011-05-19 13:45:29.000000000 +0200 @@ -679,7 +679,7 @@ static const struct dev_pm_ops i915_pm_o .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/i915_drv.h linux-2.6.39-pax/drivers/gpu/drm/i915/i915_drv.h --- linux-2.6.39/drivers/gpu/drm/i915/i915_drv.h 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/i915_drv.h 2011-05-19 13:45:29.000000000 +0200 @@ -287,7 +287,7 @@ typedef struct drm_i915_private { int current_page; int page_flipping; - atomic_t irq_received; + atomic_unchecked_t irq_received; /* protects the irq masks */ spinlock_t irq_lock; @@ -848,7 +848,7 @@ struct drm_i915_gem_object { * will be page flipped away on the next vblank. When it * reaches 0, dev_priv->pending_flip_queue will be woken up. */ - atomic_t pending_flip; + atomic_unchecked_t pending_flip; }; #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base) @@ -1232,7 +1232,7 @@ extern int intel_setup_gmbus(struct drm_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-2.6.39-pax/drivers/gpu/drm/i915/i915_gem_execbuffer.c --- linux-2.6.39/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-05-19 13:45:29.000000000 +0200 @@ -192,7 +192,7 @@ i915_gem_object_set_to_gpu_domain(struct i915_gem_release_mmap(obj); if (obj->base.pending_write_domain) - cd->flips |= atomic_read(&obj->pending_flip); + cd->flips |= atomic_read_unchecked(&obj->pending_flip); /* The actual obj->write_domain will be updated with * pending_write_domain after we emit the accumulated flush for all diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/i915_irq.c linux-2.6.39-pax/drivers/gpu/drm/i915/i915_irq.c --- linux-2.6.39/drivers/gpu/drm/i915/i915_irq.c 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/i915_irq.c 2011-05-19 14:23:27.000000000 +0200 @@ -1101,7 +1101,7 @@ irqreturn_t i915_driver_irq_handler(DRM_ int ret = IRQ_NONE, pipe; bool blc_event = false; - atomic_inc(&dev_priv->irq_received); + atomic_inc_unchecked(&dev_priv->irq_received); if (HAS_PCH_SPLIT(dev)) return ironlake_irq_handler(dev); @@ -1655,7 +1655,7 @@ void i915_driver_irq_preinstall(struct d drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int pipe; - atomic_set(&dev_priv->irq_received, 0); + atomic_set_unchecked(&dev_priv->irq_received, 0); INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); INIT_WORK(&dev_priv->error_work, i915_error_work_func); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/i915/intel_display.c linux-2.6.39-pax/drivers/gpu/drm/i915/intel_display.c --- linux-2.6.39/drivers/gpu/drm/i915/intel_display.c 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/i915/intel_display.c 2011-05-19 13:45:29.000000000 +0200 @@ -2244,7 +2244,7 @@ intel_pipe_set_base(struct drm_crtc *crt wait_event(dev_priv->pending_flip_queue, atomic_read(&dev_priv->mm.wedged) || - atomic_read(&obj->pending_flip) == 0); + atomic_read_unchecked(&obj->pending_flip) == 0); /* Big Hammer, we also need to ensure that any pending * MI_WAIT_FOR_EVENT inside a user batch buffer on the @@ -2712,7 +2712,7 @@ static void intel_crtc_wait_for_pending_ obj = to_intel_framebuffer(crtc->fb)->obj; dev_priv = crtc->dev->dev_private; wait_event(dev_priv->pending_flip_queue, - atomic_read(&obj->pending_flip) == 0); + atomic_read_unchecked(&obj->pending_flip) == 0); } static bool intel_crtc_driving_pch(struct drm_crtc *crtc) @@ -6016,7 +6016,7 @@ static void do_intel_finish_page_flip(st atomic_clear_mask(1 << intel_crtc->plane, &obj->pending_flip.counter); - if (atomic_read(&obj->pending_flip) == 0) + if (atomic_read_unchecked(&obj->pending_flip) == 0) wake_up(&dev_priv->pending_flip_queue); schedule_work(&work->work); @@ -6145,7 +6145,7 @@ static int intel_crtc_page_flip(struct d /* Block clients from rendering to the new back buffer until * the flip occurs and the object is no longer visible. */ - atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip); + atomic_add_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip); switch (INTEL_INFO(dev)->gen) { case 2: diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/mga/mga_drv.h linux-2.6.39-pax/drivers/gpu/drm/mga/mga_drv.h --- linux-2.6.39/drivers/gpu/drm/mga/mga_drv.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/mga/mga_drv.h 2011-05-19 13:45:30.000000000 +0200 @@ -120,9 +120,9 @@ typedef struct drm_mga_private { u32 clear_cmd; u32 maccess; - atomic_t vbl_received; /**< Number of vblanks received. */ + atomic_unchecked_t vbl_received; /**< Number of vblanks received. */ wait_queue_head_t fence_queue; - atomic_t last_fence_retired; + atomic_unchecked_t last_fence_retired; u32 next_fence_to_post; unsigned int fb_cpp; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/mga/mga_irq.c linux-2.6.39-pax/drivers/gpu/drm/mga/mga_irq.c --- linux-2.6.39/drivers/gpu/drm/mga/mga_irq.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/mga/mga_irq.c 2011-05-19 13:45:30.000000000 +0200 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de if (crtc != 0) return 0; - return atomic_read(&dev_priv->vbl_received); + return atomic_read_unchecked(&dev_priv->vbl_received); } @@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_I /* VBLANK interrupt */ if (status & MGA_VLINEPEN) { MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR); - atomic_inc(&dev_priv->vbl_received); + atomic_inc_unchecked(&dev_priv->vbl_received); drm_handle_vblank(dev, 0); handled = 1; } @@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_I if ((prim_start & ~0x03) != (prim_end & ~0x03)) MGA_WRITE(MGA_PRIMEND, prim_end); - atomic_inc(&dev_priv->last_fence_retired); + atomic_inc_unchecked(&dev_priv->last_fence_retired); DRM_WAKEUP(&dev_priv->fence_queue); handled = 1; } @@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_dev * using fences. */ DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ, - (((cur_fence = atomic_read(&dev_priv->last_fence_retired)) + (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired)) - *sequence) <= (1 << 23))); *sequence = cur_fence; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_acpi.c linux-2.6.39-pax/drivers/gpu/drm/nouveau/nouveau_acpi.c --- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_acpi.c 2011-03-15 19:33:18.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/nouveau/nouveau_acpi.c 2011-05-19 14:23:29.000000000 +0200 @@ -141,7 +141,7 @@ static int nouveau_dsm_get_client_id(str return VGA_SWITCHEROO_DIS; } -static struct vga_switcheroo_handler nouveau_dsm_handler = { +static const struct vga_switcheroo_handler nouveau_dsm_handler = { .switchto = nouveau_dsm_switchto, .power_state = nouveau_dsm_power_state, .init = nouveau_dsm_init, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.39-pax/drivers/gpu/drm/nouveau/nouveau_drv.h --- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-05-23 17:18:22.000000000 +0200 @@ -228,7 +228,7 @@ struct nouveau_channel { struct list_head pending; uint32_t sequence; uint32_t sequence_ack; - atomic_t last_sequence_irq; + atomic_unchecked_t last_sequence_irq; } fence; /* DMA push buffer */ @@ -520,8 +520,8 @@ struct nouveau_vram_engine { struct nouveau_engine { struct nouveau_instmem_engine instmem; - struct nouveau_mc_engine mc; - struct nouveau_timer_engine timer; + struct nouveau_mc_engine mc; + struct nouveau_timer_engine timer; struct nouveau_fb_engine fb; struct nouveau_pgraph_engine graph; struct nouveau_fifo_engine fifo; @@ -529,7 +529,7 @@ struct nouveau_engine { struct nouveau_gpio_engine gpio; struct nouveau_pm_engine pm; struct nouveau_crypt_engine crypt; - struct nouveau_vram_engine vram; + struct nouveau_vram_engine vram; }; struct nouveau_pll_vals { @@ -662,7 +662,7 @@ struct drm_nouveau_private { struct drm_global_reference mem_global_ref; struct ttm_bo_global_ref bo_global_ref; struct ttm_bo_device bdev; - atomic_t validate_sequence; + atomic_unchecked_t validate_sequence; } ttm; struct { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.39-pax/drivers/gpu/drm/nouveau/nouveau_fence.c --- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-05-19 13:45:30.000000000 +0200 @@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan if (USE_REFCNT(dev)) sequence = nvchan_rd32(chan, 0x48); else - sequence = atomic_read(&chan->fence.last_sequence_irq); + sequence = atomic_read_unchecked(&chan->fence.last_sequence_irq); if (chan->fence.sequence_ack == sequence) goto out; @@ -553,7 +553,7 @@ nouveau_fence_channel_init(struct nouvea out_initialised: INIT_LIST_HEAD(&chan->fence.pending); spin_lock_init(&chan->fence.lock); - atomic_set(&chan->fence.last_sequence_irq, 0); + atomic_set_unchecked(&chan->fence.last_sequence_irq, 0); return 0; } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.39-pax/drivers/gpu/drm/nouveau/nouveau_gem.c --- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-05-19 13:45:30.000000000 +0200 @@ -249,7 +249,7 @@ validate_init(struct nouveau_channel *ch int trycnt = 0; int ret, i; - sequence = atomic_add_return(1, &dev_priv->ttm.validate_sequence); + sequence = atomic_add_return_unchecked(1, &dev_priv->ttm.validate_sequence); retry: if (++trycnt > 100000) { NV_ERROR(dev, "%s failed and gave up.\n", __func__); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.39-pax/drivers/gpu/drm/nouveau/nouveau_state.c --- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_state.c 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/nouveau/nouveau_state.c 2011-05-19 13:45:30.000000000 +0200 @@ -583,7 +583,7 @@ static bool nouveau_switcheroo_can_switc 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.39-pax/drivers/gpu/drm/nouveau/nv04_graph.c --- linux-2.6.39/drivers/gpu/drm/nouveau/nv04_graph.c 2011-03-15 19:33:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/nouveau/nv04_graph.c 2011-05-19 13:45:30.000000000 +0200 @@ -552,7 +552,7 @@ static int nv04_graph_mthd_set_ref(struct nouveau_channel *chan, u32 class, u32 mthd, u32 data) { - atomic_set(&chan->fence.last_sequence_irq, data); + atomic_set_unchecked(&chan->fence.last_sequence_irq, data); return 0; } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/r128/r128_cce.c linux-2.6.39-pax/drivers/gpu/drm/r128/r128_cce.c --- linux-2.6.39/drivers/gpu/drm/r128/r128_cce.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/r128/r128_cce.c 2011-05-19 13:45:30.000000000 +0200 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d /* GH: Simple idle check. */ - atomic_set(&dev_priv->idle_count, 0); + atomic_set_unchecked(&dev_priv->idle_count, 0); /* We don't support anything other than bus-mastering ring mode, * but the ring can be in either AGP or PCI space for the ring diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/r128/r128_drv.h linux-2.6.39-pax/drivers/gpu/drm/r128/r128_drv.h --- linux-2.6.39/drivers/gpu/drm/r128/r128_drv.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/r128/r128_drv.h 2011-05-19 13:45:30.000000000 +0200 @@ -90,14 +90,14 @@ typedef struct drm_r128_private { int is_pci; unsigned long cce_buffers_offset; - atomic_t idle_count; + atomic_unchecked_t idle_count; int page_flipping; int current_page; u32 crtc_offset; u32 crtc_offset_cntl; - atomic_t vbl_received; + atomic_unchecked_t vbl_received; u32 color_fmt; unsigned int front_offset; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/r128/r128_irq.c linux-2.6.39-pax/drivers/gpu/drm/r128/r128_irq.c --- linux-2.6.39/drivers/gpu/drm/r128/r128_irq.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/r128/r128_irq.c 2011-05-19 13:45:30.000000000 +0200 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d if (crtc != 0) return 0; - return atomic_read(&dev_priv->vbl_received); + return atomic_read_unchecked(&dev_priv->vbl_received); } irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS) @@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_ /* VBLANK interrupt */ if (status & R128_CRTC_VBLANK_INT) { R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK); - atomic_inc(&dev_priv->vbl_received); + atomic_inc_unchecked(&dev_priv->vbl_received); drm_handle_vblank(dev, 0); return IRQ_HANDLED; } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/r128/r128_state.c linux-2.6.39-pax/drivers/gpu/drm/r128/r128_state.c --- linux-2.6.39/drivers/gpu/drm/r128/r128_state.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/r128/r128_state.c 2011-05-19 13:45:30.000000000 +0200 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv) { - if (atomic_read(&dev_priv->idle_count) == 0) + if (atomic_read_unchecked(&dev_priv->idle_count) == 0) r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0); else - atomic_set(&dev_priv->idle_count, 0); + atomic_set_unchecked(&dev_priv->idle_count, 0); } #endif diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/atom.c linux-2.6.39-pax/drivers/gpu/drm/radeon/atom.c --- linux-2.6.39/drivers/gpu/drm/radeon/atom.c 2011-05-19 10:21:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/atom.c 2011-05-19 13:45:30.000000000 +0200 @@ -1245,6 +1245,8 @@ struct atom_context *atom_parse(struct c char name[512]; int i; + pax_track_stack(); + ctx->card = card; ctx->bios = bios; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.39-pax/drivers/gpu/drm/radeon/mkregtable.c --- linux-2.6.39/drivers/gpu/drm/radeon/mkregtable.c 2011-03-15 19:33:20.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/mkregtable.c 2011-05-19 13:45:30.000000000 +0200 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/radeon.h linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon.h --- linux-2.6.39/drivers/gpu/drm/radeon/radeon.h 2011-05-19 10:21:31.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon.h 2011-05-19 13:45:30.000000000 +0200 @@ -189,7 +189,7 @@ extern int sumo_get_temp(struct radeon_d */ struct radeon_fence_driver { uint32_t scratch_reg; - atomic_t seq; + atomic_unchecked_t seq; uint32_t last_seq; unsigned long last_jiffies; unsigned long last_timeout; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_atombios.c --- linux-2.6.39/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-19 10:21:31.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-19 13:45:30.000000000 +0200 @@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from struct radeon_gpio_rec gpio; struct radeon_hpd hpd; + pax_track_stack(); + if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset)) return false; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/radeon_atpx_handler.c linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_atpx_handler.c --- linux-2.6.39/drivers/gpu/drm/radeon/radeon_atpx_handler.c 2011-05-19 10:21:31.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_atpx_handler.c 2011-05-19 14:23:29.000000000 +0200 @@ -234,7 +234,7 @@ static int radeon_atpx_get_client_id(str return VGA_SWITCHEROO_DIS; } -static struct vga_switcheroo_handler radeon_atpx_handler = { +static const struct vga_switcheroo_handler radeon_atpx_handler = { .switchto = radeon_atpx_switchto, .power_state = radeon_atpx_power_state, .init = radeon_atpx_init, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_device.c --- linux-2.6.39/drivers/gpu/drm/radeon/radeon_device.c 2011-05-19 10:21:31.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_device.c 2011-05-19 13:45:30.000000000 +0200 @@ -674,7 +674,7 @@ static bool radeon_switcheroo_can_switch 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_display.c --- linux-2.6.39/drivers/gpu/drm/radeon/radeon_display.c 2011-05-19 10:21:31.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_display.c 2011-05-19 13:45:30.000000000 +0200 @@ -934,6 +934,8 @@ void radeon_compute_pll_legacy(struct ra uint32_t post_div; u32 pll_out_min, pll_out_max; + pax_track_stack(); + DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div); freq = freq * 1000; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_drv.h --- linux-2.6.39/drivers/gpu/drm/radeon/radeon_drv.h 2011-05-19 10:21:31.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_drv.h 2011-05-19 13:45:30.000000000 +0200 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private { /* SW interrupt */ wait_queue_head_t swi_queue; - atomic_t swi_emitted; + atomic_unchecked_t swi_emitted; int vblank_crtc; uint32_t irq_enable_reg; uint32_t r500_disp_irq_reg; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_fence.c --- linux-2.6.39/drivers/gpu/drm/radeon/radeon_fence.c 2011-05-19 10:21:31.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_fence.c 2011-05-19 13:45:30.000000000 +0200 @@ -49,7 +49,7 @@ int radeon_fence_emit(struct radeon_devi write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags); return 0; } - fence->seq = atomic_add_return(1, &rdev->fence_drv.seq); + fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv.seq); if (!rdev->cp.ready) { /* FIXME: cp is not running assume everythings is done right * away @@ -352,7 +352,7 @@ int radeon_fence_driver_init(struct rade return r; } WREG32(rdev->fence_drv.scratch_reg, 0); - atomic_set(&rdev->fence_drv.seq, 0); + atomic_set_unchecked(&rdev->fence_drv.seq, 0); INIT_LIST_HEAD(&rdev->fence_drv.created); INIT_LIST_HEAD(&rdev->fence_drv.emited); INIT_LIST_HEAD(&rdev->fence_drv.signaled); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_ioc32.c --- linux-2.6.39/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-05-19 13:45:30.000000000 +0200 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_irq.c --- linux-2.6.39/drivers/gpu/drm/radeon/radeon_irq.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_irq.c 2011-05-19 13:45:30.000000000 +0200 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de unsigned int ret; RING_LOCALS; - atomic_inc(&dev_priv->swi_emitted); - ret = atomic_read(&dev_priv->swi_emitted); + atomic_inc_unchecked(&dev_priv->swi_emitted); + ret = atomic_read_unchecked(&dev_priv->swi_emitted); BEGIN_RING(4); OUT_RING_REG(RADEON_LAST_SWI_REG, ret); @@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; - atomic_set(&dev_priv->swi_emitted, 0); + atomic_set_unchecked(&dev_priv->swi_emitted, 0); DRM_INIT_WAITQUEUE(&dev_priv->swi_queue); dev->max_vblank_count = 0x001fffff; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_state.c --- linux-2.6.39/drivers/gpu/drm/radeon/radeon_state.c 2011-05-19 10:21:31.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_state.c 2011-05-19 13:45:30.000000000 +0200 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de 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 @@ static int radeon_cp_getparam(struct drm { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_ttm.c --- linux-2.6.39/drivers/gpu/drm/radeon/radeon_ttm.c 2011-05-19 10:21:31.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/radeon_ttm.c 2011-05-19 13:45:30.000000000 +0200 @@ -603,8 +603,9 @@ void radeon_ttm_set_active_vram_size(str 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 @@ static int radeon_ttm_fault(struct vm_ar 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 @@ int radeon_mmap(struct file *filp, struc 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/radeon/rs690.c linux-2.6.39-pax/drivers/gpu/drm/radeon/rs690.c --- linux-2.6.39/drivers/gpu/drm/radeon/rs690.c 2011-05-19 10:21:32.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/radeon/rs690.c 2011-05-19 13:45:30.000000000 +0200 @@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.39-pax/drivers/gpu/drm/ttm/ttm_bo_vm.c --- linux-2.6.39/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-15 19:33:21.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-05-19 13:45:30.000000000 +0200 @@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_ 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 @@ static int ttm_bo_vm_fault(struct vm_are 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 @@ out_unlock: 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6.39-pax/drivers/gpu/drm/ttm/ttm_page_alloc.c --- linux-2.6.39/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-05-19 10:21:32.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-05-19 13:45:30.000000000 +0200 @@ -397,9 +397,9 @@ static int ttm_pool_get_num_unused_pages */ static int ttm_pool_mm_shrink(struct shrinker *shrink, int shrink_pages, gfp_t gfp_mask) { - static atomic_t start_pool = ATOMIC_INIT(0); + static atomic_unchecked_t start_pool = ATOMIC_INIT(0); unsigned i; - unsigned pool_offset = atomic_add_return(1, &start_pool); + unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool); struct ttm_page_pool *pool; pool_offset = pool_offset % NUM_POOLS; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/via/via_drv.h linux-2.6.39-pax/drivers/gpu/drm/via/via_drv.h --- linux-2.6.39/drivers/gpu/drm/via/via_drv.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/via/via_drv.h 2011-05-19 13:45:30.000000000 +0200 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer { typedef uint32_t maskarray_t[5]; typedef struct drm_via_irq { - atomic_t irq_received; + atomic_unchecked_t irq_received; uint32_t pending_mask; uint32_t enable_mask; wait_queue_head_t irq_queue; @@ -75,7 +75,7 @@ typedef struct drm_via_private { struct timeval last_vblank; int last_vblank_valid; unsigned usec_per_vblank; - atomic_t vbl_received; + atomic_unchecked_t vbl_received; drm_via_state_t hc_state; char pci_buf[VIA_PCI_BUF_SIZE]; const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE]; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/via/via_irq.c linux-2.6.39-pax/drivers/gpu/drm/via/via_irq.c --- linux-2.6.39/drivers/gpu/drm/via/via_irq.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/via/via_irq.c 2011-05-19 13:45:30.000000000 +0200 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de if (crtc != 0) return 0; - return atomic_read(&dev_priv->vbl_received); + return atomic_read_unchecked(&dev_priv->vbl_received); } irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) @@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_I status = VIA_READ(VIA_REG_INTERRUPT); if (status & VIA_IRQ_VBLANK_PENDING) { - atomic_inc(&dev_priv->vbl_received); - if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) { + atomic_inc_unchecked(&dev_priv->vbl_received); + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) { do_gettimeofday(&cur_vblank); if (dev_priv->last_vblank_valid) { dev_priv->usec_per_vblank = @@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_I dev_priv->last_vblank = cur_vblank; dev_priv->last_vblank_valid = 1; } - if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) { + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) { DRM_DEBUG("US per vblank is: %u\n", dev_priv->usec_per_vblank); } @@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_I for (i = 0; i < dev_priv->num_irqs; ++i) { if (status & cur_irq->pending_mask) { - atomic_inc(&cur_irq->irq_received); + atomic_inc_unchecked(&cur_irq->irq_received); DRM_WAKEUP(&cur_irq->irq_queue); handled = 1; if (dev_priv->irq_map[drm_via_irq_dma0_td] == i) @@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *d DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ, ((VIA_READ(masks[irq][2]) & masks[irq][3]) == masks[irq][4])); - cur_irq_sequence = atomic_read(&cur_irq->irq_received); + cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received); } else { DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ, (((cur_irq_sequence = - atomic_read(&cur_irq->irq_received)) - + atomic_read_unchecked(&cur_irq->irq_received)) - *sequence) <= (1 << 23))); } *sequence = cur_irq_sequence; @@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct dr } for (i = 0; i < dev_priv->num_irqs; ++i) { - atomic_set(&cur_irq->irq_received, 0); + atomic_set_unchecked(&cur_irq->irq_received, 0); cur_irq->enable_mask = dev_priv->irq_masks[i][0]; cur_irq->pending_mask = dev_priv->irq_masks[i][1]; DRM_INIT_WAITQUEUE(&cur_irq->irq_queue); @@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) { case VIA_IRQ_RELATIVE: irqwait->request.sequence += - atomic_read(&cur_irq->irq_received); + atomic_read_unchecked(&cur_irq->irq_received); irqwait->request.type &= ~_DRM_VBLANK_RELATIVE; case VIA_IRQ_ABSOLUTE: break; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.39-pax/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h --- linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-03-15 19:33:21.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-05-19 13:45:30.000000000 +0200 @@ -240,7 +240,7 @@ struct vmw_private { * Fencing and IRQs. */ - atomic_t fence_seq; + atomic_unchecked_t fence_seq; wait_queue_head_t fence_queue; wait_queue_head_t fifo_queue; atomic_t fence_queue_waiters; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.6.39-pax/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c --- linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-05-19 13:45:30.000000000 +0200 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev while (!vmw_lag_lt(queue, us)) { spin_lock(&queue->lock); if (list_empty(&queue->head)) - sequence = atomic_read(&dev_priv->fence_seq); + sequence = atomic_read_unchecked(&dev_priv->fence_seq); else { fence = list_first_entry(&queue->head, struct vmw_fence, head); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.39-pax/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c --- linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-05-19 14:23:27.000000000 +0200 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de (unsigned int) min, (unsigned int) fifo->capabilities); - atomic_set(&dev_priv->fence_seq, dev_priv->last_read_sequence); + atomic_set_unchecked(&dev_priv->fence_seq, dev_priv->last_read_sequence); iowrite32(dev_priv->last_read_sequence, fifo_mem + SVGA_FIFO_FENCE); vmw_fence_queue_init(&fifo->fence_queue); return vmw_fifo_send_fence(dev_priv, &dummy); @@ -476,7 +476,7 @@ int vmw_fifo_send_fence(struct vmw_priva fm = vmw_fifo_reserve(dev_priv, bytes); if (unlikely(fm == NULL)) { - *sequence = atomic_read(&dev_priv->fence_seq); + *sequence = atomic_read_unchecked(&dev_priv->fence_seq); ret = -ENOMEM; (void)vmw_fallback_wait(dev_priv, false, true, *sequence, false, 3*HZ); @@ -484,7 +484,7 @@ int vmw_fifo_send_fence(struct vmw_priva } do { - *sequence = atomic_add_return(1, &dev_priv->fence_seq); + *sequence = atomic_add_return_unchecked(1, &dev_priv->fence_seq); } while (*sequence == 0); if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) { @@ -534,7 +534,7 @@ static int vmw_fifo_vm_fault(struct vm_a 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.39-pax/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c --- linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-05-19 13:45:30.000000000 +0200 @@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva * emitted. Then the fence is stale and signaled. */ - ret = ((atomic_read(&dev_priv->fence_seq) - sequence) + ret = ((atomic_read_unchecked(&dev_priv->fence_seq) - sequence) > VMW_FENCE_WRAP); return ret; @@ -131,7 +131,7 @@ int vmw_fallback_wait(struct vmw_private if (fifo_idle) down_read(&fifo_state->rwsem); - signal_seq = atomic_read(&dev_priv->fence_seq); + signal_seq = atomic_read_unchecked(&dev_priv->fence_seq); ret = 0; for (;;) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/gpu/vga/vga_switcheroo.c linux-2.6.39-pax/drivers/gpu/vga/vga_switcheroo.c --- linux-2.6.39/drivers/gpu/vga/vga_switcheroo.c 2011-05-19 10:21:32.000000000 +0200 +++ linux-2.6.39-pax/drivers/gpu/vga/vga_switcheroo.c 2011-05-19 14:23:29.000000000 +0200 @@ -53,7 +53,7 @@ struct vgasr_priv { int registered_clients; struct vga_switcheroo_client clients[VGA_SWITCHEROO_MAX_CLIENTS]; - struct vga_switcheroo_handler *handler; + const struct vga_switcheroo_handler *handler; }; static int vga_switcheroo_debugfs_init(struct vgasr_priv *priv); @@ -62,7 +62,7 @@ static void vga_switcheroo_debugfs_fini( /* only one switcheroo per system */ static struct vgasr_priv vgasr_priv; -int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler) +int vga_switcheroo_register_handler(const struct vga_switcheroo_handler *handler) { mutex_lock(&vgasr_mutex); if (vgasr_priv.handler) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/hid/hid-core.c linux-2.6.39-pax/drivers/hid/hid-core.c --- linux-2.6.39/drivers/hid/hid-core.c 2011-05-19 10:21:32.000000000 +0200 +++ linux-2.6.39-pax/drivers/hid/hid-core.c 2011-05-19 13:45:30.000000000 +0200 @@ -1888,7 +1888,7 @@ static bool hid_ignore(struct hid_device int hid_add_device(struct hid_device *hdev) { - static atomic_t id = ATOMIC_INIT(0); + static atomic_unchecked_t id = ATOMIC_INIT(0); int ret; if (WARN_ON(hdev->status & HID_STAT_ADDED)) @@ -1903,7 +1903,7 @@ int hid_add_device(struct hid_device *hd /* XXX hack, any other cleaner solution after the driver core * is converted to allow more than 20 bytes as the device name? */ dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus, - hdev->vendor, hdev->product, atomic_inc_return(&id)); + hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id)); hid_debug_register(hdev, dev_name(&hdev->dev)); ret = device_add(&hdev->dev); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/hid/hid-picolcd.c linux-2.6.39-pax/drivers/hid/hid-picolcd.c --- linux-2.6.39/drivers/hid/hid-picolcd.c 2011-05-19 10:21:33.000000000 +0200 +++ linux-2.6.39-pax/drivers/hid/hid-picolcd.c 2011-05-19 14:23:29.000000000 +0200 @@ -1037,7 +1037,7 @@ static int picolcd_check_lcd_fb(struct l return fb && fb == picolcd_fbinfo((struct picolcd_data *)lcd_get_data(ldev)); } -static struct lcd_ops picolcd_lcdops = { +static const struct lcd_ops picolcd_lcdops = { .get_contrast = picolcd_get_contrast, .set_contrast = picolcd_set_contrast, .check_fb = picolcd_check_lcd_fb, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/hid/usbhid/hiddev.c linux-2.6.39-pax/drivers/hid/usbhid/hiddev.c --- linux-2.6.39/drivers/hid/usbhid/hiddev.c 2011-03-15 19:33:23.000000000 +0100 +++ linux-2.6.39-pax/drivers/hid/usbhid/hiddev.c 2011-05-19 13:45:30.000000000 +0200 @@ -613,7 +613,7 @@ static long hiddev_ioctl(struct file *fi break; case HIDIOCAPPLICATION: - if (arg < 0 || arg >= hid->maxapplication) + if (arg >= hid->maxapplication) break; for (i = 0; i < hid->maxcollection; i++) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/hwmon/ibmaem.c linux-2.6.39-pax/drivers/hwmon/ibmaem.c --- linux-2.6.39/drivers/hwmon/ibmaem.c 2011-03-15 19:33:27.000000000 +0100 +++ linux-2.6.39-pax/drivers/hwmon/ibmaem.c 2011-05-19 14:23:29.000000000 +0200 @@ -238,7 +238,7 @@ struct aem_read_sensor_resp { struct aem_driver_data { struct list_head aem_devices; struct ipmi_smi_watcher bmc_events; - struct ipmi_user_hndl ipmi_hndlrs; + const struct ipmi_user_hndl ipmi_hndlrs; }; static void aem_register_bmc(int iface, struct device *dev); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/hwmon/ibmpex.c linux-2.6.39-pax/drivers/hwmon/ibmpex.c --- linux-2.6.39/drivers/hwmon/ibmpex.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/hwmon/ibmpex.c 2011-05-19 14:23:29.000000000 +0200 @@ -110,7 +110,7 @@ struct ibmpex_bmc_data { struct ibmpex_driver_data { struct list_head bmc_data; struct ipmi_smi_watcher bmc_events; - struct ipmi_user_hndl ipmi_hndlrs; + const struct ipmi_user_hndl ipmi_hndlrs; }; static struct ibmpex_driver_data driver_data = { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/hwmon/sht15.c linux-2.6.39-pax/drivers/hwmon/sht15.c --- linux-2.6.39/drivers/hwmon/sht15.c 2011-05-19 10:21:33.000000000 +0200 +++ linux-2.6.39-pax/drivers/hwmon/sht15.c 2011-05-19 13:45:30.000000000 +0200 @@ -113,7 +113,7 @@ struct sht15_data { int supply_uV; int supply_uV_valid; struct work_struct update_supply_work; - atomic_t interrupt_handled; + atomic_unchecked_t interrupt_handled; }; /** @@ -246,13 +246,13 @@ static inline int sht15_update_single_va return ret; gpio_direction_input(data->pdata->gpio_data); - atomic_set(&data->interrupt_handled, 0); + atomic_set_unchecked(&data->interrupt_handled, 0); enable_irq(gpio_to_irq(data->pdata->gpio_data)); if (gpio_get_value(data->pdata->gpio_data) == 0) { disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data)); /* Only relevant if the interrupt hasn't occurred. */ - if (!atomic_read(&data->interrupt_handled)) + if (!atomic_read_unchecked(&data->interrupt_handled)) schedule_work(&data->read_work); } ret = wait_event_timeout(data->wait_queue, @@ -399,7 +399,7 @@ static irqreturn_t sht15_interrupt_fired struct sht15_data *data = d; /* First disable the interrupt */ disable_irq_nosync(irq); - atomic_inc(&data->interrupt_handled); + atomic_inc_unchecked(&data->interrupt_handled); /* Then schedule a reading work struct */ if (data->flag != SHT15_READING_NOTHING) schedule_work(&data->read_work); @@ -450,11 +450,11 @@ static void sht15_bh_read_data(struct wo here as could have gone low in meantime so verify it hasn't! */ - atomic_set(&data->interrupt_handled, 0); + atomic_set_unchecked(&data->interrupt_handled, 0); enable_irq(gpio_to_irq(data->pdata->gpio_data)); /* If still not occurred or another handler has been scheduled */ if (gpio_get_value(data->pdata->gpio_data) - || atomic_read(&data->interrupt_handled)) + || atomic_read_unchecked(&data->interrupt_handled)) return; } /* Read the data back from the device */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/hwmon/w83791d.c linux-2.6.39-pax/drivers/hwmon/w83791d.c --- linux-2.6.39/drivers/hwmon/w83791d.c 2011-05-19 10:21:33.000000000 +0200 +++ linux-2.6.39-pax/drivers/hwmon/w83791d.c 2011-05-19 13:45:30.000000000 +0200 @@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-at91.c linux-2.6.39-pax/drivers/i2c/busses/i2c-at91.c --- linux-2.6.39/drivers/i2c/busses/i2c-at91.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-at91.c 2011-05-19 14:23:29.000000000 +0200 @@ -181,7 +181,7 @@ static u32 at91_func(struct i2c_adapter return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } -static struct i2c_algorithm at91_algorithm = { +static const struct i2c_algorithm at91_algorithm = { .master_xfer = at91_xfer, .functionality = at91_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-bfin-twi.c linux-2.6.39-pax/drivers/i2c/busses/i2c-bfin-twi.c --- linux-2.6.39/drivers/i2c/busses/i2c-bfin-twi.c 2011-03-15 19:33:28.000000000 +0100 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-bfin-twi.c 2011-05-19 14:23:29.000000000 +0200 @@ -599,7 +599,7 @@ static u32 bfin_twi_functionality(struct I2C_FUNC_I2C | I2C_FUNC_SMBUS_I2C_BLOCK; } -static struct i2c_algorithm bfin_twi_algorithm = { +static const struct i2c_algorithm bfin_twi_algorithm = { .master_xfer = bfin_twi_master_xfer, .smbus_xfer = bfin_twi_smbus_xfer, .functionality = bfin_twi_functionality, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-davinci.c linux-2.6.39-pax/drivers/i2c/busses/i2c-davinci.c --- linux-2.6.39/drivers/i2c/busses/i2c-davinci.c 2011-05-19 10:21:33.000000000 +0200 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-davinci.c 2011-05-19 14:23:29.000000000 +0200 @@ -630,7 +630,7 @@ static inline void i2c_davinci_cpufreq_d } #endif -static struct i2c_algorithm i2c_davinci_algo = { +static const struct i2c_algorithm i2c_davinci_algo = { .master_xfer = i2c_davinci_xfer, .functionality = i2c_davinci_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-designware.c linux-2.6.39-pax/drivers/i2c/busses/i2c-designware.c --- linux-2.6.39/drivers/i2c/busses/i2c-designware.c 2011-05-19 10:21:33.000000000 +0200 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-designware.c 2011-05-19 14:23:29.000000000 +0200 @@ -689,7 +689,7 @@ tx_aborted: return IRQ_HANDLED; } -static struct i2c_algorithm i2c_dw_algo = { +static const struct i2c_algorithm i2c_dw_algo = { .master_xfer = i2c_dw_xfer, .functionality = i2c_dw_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-eg20t.c linux-2.6.39-pax/drivers/i2c/busses/i2c-eg20t.c --- linux-2.6.39/drivers/i2c/busses/i2c-eg20t.c 2011-05-19 10:21:33.000000000 +0200 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-eg20t.c 2011-05-19 14:23:29.000000000 +0200 @@ -708,7 +708,7 @@ static u32 pch_i2c_func(struct i2c_adapt return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR; } -static struct i2c_algorithm pch_algorithm = { +static const struct i2c_algorithm pch_algorithm = { .master_xfer = pch_i2c_xfer, .functionality = pch_i2c_func }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-imx.c linux-2.6.39-pax/drivers/i2c/busses/i2c-imx.c --- linux-2.6.39/drivers/i2c/busses/i2c-imx.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-imx.c 2011-05-19 14:23:29.000000000 +0200 @@ -457,7 +457,7 @@ static u32 i2c_imx_func(struct i2c_adapt return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } -static struct i2c_algorithm i2c_imx_algo = { +static const struct i2c_algorithm i2c_imx_algo = { .master_xfer = i2c_imx_xfer, .functionality = i2c_imx_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-intel-mid.c linux-2.6.39-pax/drivers/i2c/busses/i2c-intel-mid.c --- linux-2.6.39/drivers/i2c/busses/i2c-intel-mid.c 2011-05-19 10:21:33.000000000 +0200 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-intel-mid.c 2011-05-19 14:23:29.000000000 +0200 @@ -917,7 +917,7 @@ err: return IRQ_HANDLED; } -static struct i2c_algorithm intel_mid_i2c_algorithm = { +static const struct i2c_algorithm intel_mid_i2c_algorithm = { .master_xfer = intel_mid_i2c_xfer, .functionality = intel_mid_i2c_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-nforce2.c linux-2.6.39-pax/drivers/i2c/busses/i2c-nforce2.c --- linux-2.6.39/drivers/i2c/busses/i2c-nforce2.c 2011-03-15 19:33:28.000000000 +0100 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-nforce2.c 2011-05-19 14:23:29.000000000 +0200 @@ -303,7 +303,7 @@ static u32 nforce2_func(struct i2c_adapt I2C_FUNC_SMBUS_BLOCK_DATA : 0); } -static struct i2c_algorithm smbus_algorithm = { +static const struct i2c_algorithm smbus_algorithm = { .smbus_xfer = nforce2_access, .functionality = nforce2_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-pmcmsp.c linux-2.6.39-pax/drivers/i2c/busses/i2c-pmcmsp.c --- linux-2.6.39/drivers/i2c/busses/i2c-pmcmsp.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-pmcmsp.c 2011-05-19 14:23:29.000000000 +0200 @@ -615,7 +615,7 @@ static u32 pmcmsptwi_i2c_func(struct i2c /* -- Initialization -- */ -static struct i2c_algorithm pmcmsptwi_algo = { +static const struct i2c_algorithm pmcmsptwi_algo = { .master_xfer = pmcmsptwi_master_xfer, .functionality = pmcmsptwi_i2c_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-pnx.c linux-2.6.39-pax/drivers/i2c/busses/i2c-pnx.c --- linux-2.6.39/drivers/i2c/busses/i2c-pnx.c 2011-05-19 10:21:34.000000000 +0200 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-pnx.c 2011-05-19 14:23:29.000000000 +0200 @@ -535,7 +535,7 @@ static u32 i2c_pnx_func(struct i2c_adapt return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } -static struct i2c_algorithm pnx_algorithm = { +static const struct i2c_algorithm pnx_algorithm = { .master_xfer = i2c_pnx_xfer, .functionality = i2c_pnx_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-puv3.c linux-2.6.39-pax/drivers/i2c/busses/i2c-puv3.c --- linux-2.6.39/drivers/i2c/busses/i2c-puv3.c 2011-05-19 10:21:34.000000000 +0200 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-puv3.c 2011-05-19 14:23:29.000000000 +0200 @@ -176,7 +176,7 @@ static u32 puv3_i2c_func(struct i2c_adap return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } -static struct i2c_algorithm puv3_i2c_algorithm = { +static const struct i2c_algorithm puv3_i2c_algorithm = { .master_xfer = puv3_i2c_xfer, .functionality = puv3_i2c_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-s6000.c linux-2.6.39-pax/drivers/i2c/busses/i2c-s6000.c --- linux-2.6.39/drivers/i2c/busses/i2c-s6000.c 2011-05-19 10:21:34.000000000 +0200 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-s6000.c 2011-05-19 14:23:29.000000000 +0200 @@ -243,7 +243,7 @@ static u32 s6i2c_functionality(struct i2 return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } -static struct i2c_algorithm s6i2c_algorithm = { +static const struct i2c_algorithm s6i2c_algorithm = { .master_xfer = s6i2c_master_xfer, .functionality = s6i2c_functionality, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/i2c/busses/i2c-sh_mobile.c linux-2.6.39-pax/drivers/i2c/busses/i2c-sh_mobile.c --- linux-2.6.39/drivers/i2c/busses/i2c-sh_mobile.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/i2c/busses/i2c-sh_mobile.c 2011-05-19 14:23:29.000000000 +0200 @@ -529,7 +529,7 @@ static u32 sh_mobile_i2c_func(struct i2c return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } -static struct i2c_algorithm sh_mobile_i2c_algorithm = { +static const struct i2c_algorithm sh_mobile_i2c_algorithm = { .functionality = sh_mobile_i2c_func, .master_xfer = sh_mobile_i2c_xfer, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ide/ide-cd.c linux-2.6.39-pax/drivers/ide/ide-cd.c --- linux-2.6.39/drivers/ide/ide-cd.c 2011-05-19 10:21:34.000000000 +0200 +++ linux-2.6.39-pax/drivers/ide/ide-cd.c 2011-05-19 13:45:30.000000000 +0200 @@ -769,7 +769,7 @@ static void cdrom_do_block_pc(ide_drive_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ide/ide-floppy.c linux-2.6.39-pax/drivers/ide/ide-floppy.c --- linux-2.6.39/drivers/ide/ide-floppy.c 2011-05-19 10:21:34.000000000 +0200 +++ linux-2.6.39-pax/drivers/ide/ide-floppy.c 2011-05-19 13:45:30.000000000 +0200 @@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d u8 pc_buf[256], header_len, desc_cnt; int i, rc = 1, blocks, length; + pax_track_stack(); + ide_debug_log(IDE_DBG_FUNC, "enter"); drive->bios_cyl = 0; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ide/it821x.c linux-2.6.39-pax/drivers/ide/it821x.c --- linux-2.6.39/drivers/ide/it821x.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ide/it821x.c 2011-05-19 14:23:29.000000000 +0200 @@ -508,7 +508,7 @@ static void it821x_quirkproc(ide_drive_t } -static struct ide_dma_ops it821x_pass_through_dma_ops = { +static const struct ide_dma_ops it821x_pass_through_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, .dma_start = it821x_dma_start, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ide/setup-pci.c linux-2.6.39-pax/drivers/ide/setup-pci.c --- linux-2.6.39/drivers/ide/setup-pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ide/setup-pci.c 2011-05-19 13:45:30.000000000 +0200 @@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev int ret, i, n_ports = dev2 ? 4 : 2; struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL }; + pax_track_stack(); + for (i = 0; i < n_ports / 2; i++) { ret = ide_setup_pci_controller(pdev[i], d, !i); if (ret < 0) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ide/trm290.c linux-2.6.39-pax/drivers/ide/trm290.c --- linux-2.6.39/drivers/ide/trm290.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ide/trm290.c 2011-05-19 14:23:29.000000000 +0200 @@ -314,7 +314,7 @@ static const struct ide_tp_ops trm290_tp .output_data = ide_output_data, }; -static struct ide_dma_ops trm290_dma_ops = { +static const struct ide_dma_ops trm290_dma_ops = { .dma_host_set = trm290_dma_host_set, .dma_setup = trm290_dma_setup, .dma_start = trm290_dma_start, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/core/cm.c linux-2.6.39-pax/drivers/infiniband/core/cm.c --- linux-2.6.39/drivers/infiniband/core/cm.c 2011-05-19 10:21:34.000000000 +0200 +++ linux-2.6.39-pax/drivers/infiniband/core/cm.c 2011-05-19 13:45:30.000000000 +0200 @@ -113,7 +113,7 @@ static char const counter_group_names[CM 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 @@ static void cm_dup_req_handler(struct cm 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 @@ static void cm_dup_rep_handler(struct cm 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 @@ static int cm_rtu_handler(struct cm_work 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; } @@ -2115,7 +2115,7 @@ static int cm_dreq_handler(struct cm_wor 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; @@ -2140,7 +2140,7 @@ static int cm_dreq_handler(struct cm_wor 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; @@ -2154,7 +2154,7 @@ static int cm_dreq_handler(struct cm_wor 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: @@ -2521,7 +2521,7 @@ static int cm_mra_handler(struct cm_work 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; @@ -2530,7 +2530,7 @@ static int cm_mra_handler(struct cm_work 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: @@ -2692,7 +2692,7 @@ static int cm_lap_handler(struct cm_work 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; @@ -2708,7 +2708,7 @@ static int cm_lap_handler(struct cm_work 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: @@ -2992,7 +2992,7 @@ static int cm_sidr_req_handler(struct cm 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. */ } @@ -3204,10 +3204,10 @@ static void cm_send_handler(struct ib_ma 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]); @@ -3417,7 +3417,7 @@ static void cm_recv_handler(struct ib_ma } 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, @@ -3615,7 +3615,7 @@ static ssize_t cm_show_counter(struct ko 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/core/fmr_pool.c linux-2.6.39-pax/drivers/infiniband/core/fmr_pool.c --- linux-2.6.39/drivers/infiniband/core/fmr_pool.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/infiniband/core/fmr_pool.c 2011-05-19 13:45:30.000000000 +0200 @@ -97,8 +97,8 @@ struct ib_fmr_pool { struct task_struct *thread; - atomic_t req_ser; - atomic_t flush_ser; + atomic_unchecked_t req_ser; + atomic_unchecked_t flush_ser; wait_queue_head_t force_wait; }; @@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *p struct ib_fmr_pool *pool = pool_ptr; do { - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) { + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) { ib_fmr_batch_release(pool); - atomic_inc(&pool->flush_ser); + atomic_inc_unchecked(&pool->flush_ser); wake_up_interruptible(&pool->force_wait); if (pool->flush_function) @@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *p } set_current_state(TASK_INTERRUPTIBLE); - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 && + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 && !kthread_should_stop()) schedule(); __set_current_state(TASK_RUNNING); @@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(s pool->dirty_watermark = params->dirty_watermark; pool->dirty_len = 0; spin_lock_init(&pool->pool_lock); - atomic_set(&pool->req_ser, 0); - atomic_set(&pool->flush_ser, 0); + atomic_set_unchecked(&pool->req_ser, 0); + atomic_set_unchecked(&pool->flush_ser, 0); init_waitqueue_head(&pool->force_wait); pool->thread = kthread_run(ib_fmr_cleanup_thread, @@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool } spin_unlock_irq(&pool->pool_lock); - serial = atomic_inc_return(&pool->req_ser); + serial = atomic_inc_return_unchecked(&pool->req_ser); wake_up_process(pool->thread); if (wait_event_interruptible(pool->force_wait, - atomic_read(&pool->flush_ser) - serial >= 0)) + atomic_read_unchecked(&pool->flush_ser) - serial >= 0)) return -EINTR; return 0; @@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr } else { list_add_tail(&fmr->list, &pool->dirty_list); if (++pool->dirty_len >= pool->dirty_watermark) { - atomic_inc(&pool->req_ser); + atomic_inc_unchecked(&pool->req_ser); wake_up_process(pool->thread); } } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.39-pax/drivers/infiniband/hw/cxgb4/mem.c --- linux-2.6.39/drivers/infiniband/hw/cxgb4/mem.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/infiniband/hw/cxgb4/mem.c 2011-05-19 13:45:30.000000000 +0200 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r int err; struct fw_ri_tpte tpt; u32 stag_idx; - static atomic_t key; + static atomic_unchecked_t key; if (c4iw_fatal_error(rdev)) return -EIO; @@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_r &rdev->resource.tpt_fifo_lock); if (!stag_idx) return -ENOMEM; - *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff); + *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff); } PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n", __func__, stag_state, type, pdid, stag_idx); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/ipath/ipath_dma.c linux-2.6.39-pax/drivers/infiniband/hw/ipath/ipath_dma.c --- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_dma.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/infiniband/hw/ipath/ipath_dma.c 2011-05-19 14:23:29.000000000 +0200 @@ -175,7 +175,7 @@ static void ipath_dma_free_coherent(stru free_pages((unsigned long) cpu_addr, get_order(size)); } -struct ib_dma_mapping_ops ipath_dma_mapping_ops = { +const struct ib_dma_mapping_ops ipath_dma_mapping_ops = { ipath_mapping_error, ipath_dma_map_single, ipath_dma_unmap_single, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.39-pax/drivers/infiniband/hw/ipath/ipath_fs.c --- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_fs.c 2011-03-15 19:33:29.000000000 +0100 +++ linux-2.6.39-pax/drivers/infiniband/hw/ipath/ipath_fs.c 2011-05-19 13:45:30.000000000 +0200 @@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru struct infinipath_counters counters; struct ipath_devdata *dd; + pax_track_stack(); + dd = file->f_path.dentry->d_inode->i_private; dd->ipath_f_read_counters(dd, &counters); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/ipath/ipath_rc.c linux-2.6.39-pax/drivers/infiniband/hw/ipath/ipath_rc.c --- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_rc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/infiniband/hw/ipath/ipath_rc.c 2011-05-19 13:45:30.000000000 +0200 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de struct ib_atomic_eth *ateth; struct ipath_ack_entry *e; u64 vaddr; - atomic64_t *maddr; + atomic64_unchecked_t *maddr; u64 sdata; u32 rkey; u8 next; @@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *de IB_ACCESS_REMOTE_ATOMIC))) goto nack_acc_unlck; /* Perform atomic OP and save result. */ - maddr = (atomic64_t *) qp->r_sge.sge.vaddr; + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr; sdata = be64_to_cpu(ateth->swap_data); e = &qp->s_ack_queue[qp->r_head_ack_queue]; e->atomic_data = (opcode == OP(FETCH_ADD)) ? - (u64) atomic64_add_return(sdata, maddr) - sdata : + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata : (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr, be64_to_cpu(ateth->compare_data), sdata); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/ipath/ipath_ruc.c linux-2.6.39-pax/drivers/infiniband/hw/ipath/ipath_ruc.c --- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-05-19 13:45:30.000000000 +0200 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip unsigned long flags; struct ib_wc wc; u64 sdata; - atomic64_t *maddr; + atomic64_unchecked_t *maddr; enum ib_wc_status send_status; /* @@ -382,11 +382,11 @@ again: IB_ACCESS_REMOTE_ATOMIC))) goto acc_err; /* Perform atomic OP and save result. */ - maddr = (atomic64_t *) qp->r_sge.sge.vaddr; + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr; sdata = wqe->wr.wr.atomic.compare_add; *(u64 *) sqp->s_sge.sge.vaddr = (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ? - (u64) atomic64_add_return(sdata, maddr) - sdata : + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata : (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr, sdata, wqe->wr.wr.atomic.swap); goto send_comp; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/ipath/ipath_verbs.h linux-2.6.39-pax/drivers/infiniband/hw/ipath/ipath_verbs.h --- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_verbs.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/infiniband/hw/ipath/ipath_verbs.h 2011-05-19 14:23:29.000000000 +0200 @@ -931,6 +931,6 @@ extern unsigned int ib_ipath_max_srq_wrs extern const u32 ib_ipath_rnr_table[]; -extern struct ib_dma_mapping_ops ipath_dma_mapping_ops; +extern const struct ib_dma_mapping_ops ipath_dma_mapping_ops; #endif /* IPATH_VERBS_H */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/nes/nes.c linux-2.6.39-pax/drivers/infiniband/hw/nes/nes.c --- linux-2.6.39/drivers/infiniband/hw/nes/nes.c 2011-05-19 10:21:34.000000000 +0200 +++ linux-2.6.39-pax/drivers/infiniband/hw/nes/nes.c 2011-05-19 13:45:30.000000000 +0200 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi LIST_HEAD(nes_adapter_list); static LIST_HEAD(nes_dev_list); -atomic_t qps_destroyed; +atomic_unchecked_t qps_destroyed; static unsigned int ee_flsh_adapter; static unsigned int sysfs_nonidx_addr; @@ -275,7 +275,7 @@ static void nes_cqp_rem_ref_callback(str struct nes_qp *nesqp = cqp_request->cqp_callback_pointer; struct nes_adapter *nesadapter = nesdev->nesadapter; - atomic_inc(&qps_destroyed); + atomic_inc_unchecked(&qps_destroyed); /* Free the control structures */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/nes/nes.h linux-2.6.39-pax/drivers/infiniband/hw/nes/nes.h --- linux-2.6.39/drivers/infiniband/hw/nes/nes.h 2011-03-15 19:33:29.000000000 +0100 +++ linux-2.6.39-pax/drivers/infiniband/hw/nes/nes.h 2011-05-19 13:45:30.000000000 +0200 @@ -175,17 +175,17 @@ extern unsigned int nes_debug_level; extern unsigned int wqm_quanta; extern struct list_head nes_adapter_list; -extern atomic_t cm_connects; -extern atomic_t cm_accepts; -extern atomic_t cm_disconnects; -extern atomic_t cm_closes; -extern atomic_t cm_connecteds; -extern atomic_t cm_connect_reqs; -extern atomic_t cm_rejects; -extern atomic_t mod_qp_timouts; -extern atomic_t qps_created; -extern atomic_t qps_destroyed; -extern atomic_t sw_qps_destroyed; +extern atomic_unchecked_t cm_connects; +extern atomic_unchecked_t cm_accepts; +extern atomic_unchecked_t cm_disconnects; +extern atomic_unchecked_t cm_closes; +extern atomic_unchecked_t cm_connecteds; +extern atomic_unchecked_t cm_connect_reqs; +extern atomic_unchecked_t cm_rejects; +extern atomic_unchecked_t mod_qp_timouts; +extern atomic_unchecked_t qps_created; +extern atomic_unchecked_t qps_destroyed; +extern atomic_unchecked_t sw_qps_destroyed; extern u32 mh_detected; extern u32 mh_pauses_sent; extern u32 cm_packets_sent; @@ -194,14 +194,14 @@ extern u32 cm_packets_created; extern u32 cm_packets_received; extern u32 cm_packets_dropped; extern u32 cm_packets_retrans; -extern atomic_t cm_listens_created; -extern atomic_t cm_listens_destroyed; +extern atomic_unchecked_t cm_listens_created; +extern atomic_unchecked_t cm_listens_destroyed; extern u32 cm_backlog_drops; -extern atomic_t cm_loopbacks; -extern atomic_t cm_nodes_created; -extern atomic_t cm_nodes_destroyed; -extern atomic_t cm_accel_dropped_pkts; -extern atomic_t cm_resets_recvd; +extern atomic_unchecked_t cm_loopbacks; +extern atomic_unchecked_t cm_nodes_created; +extern atomic_unchecked_t cm_nodes_destroyed; +extern atomic_unchecked_t cm_accel_dropped_pkts; +extern atomic_unchecked_t cm_resets_recvd; extern u32 int_mod_timer_init; extern u32 int_mod_cq_depth_256; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.39-pax/drivers/infiniband/hw/nes/nes_cm.c --- linux-2.6.39/drivers/infiniband/hw/nes/nes_cm.c 2011-05-19 10:21:34.000000000 +0200 +++ linux-2.6.39-pax/drivers/infiniband/hw/nes/nes_cm.c 2011-05-19 13:45:30.000000000 +0200 @@ -68,14 +68,14 @@ u32 cm_packets_dropped; u32 cm_packets_retrans; u32 cm_packets_created; u32 cm_packets_received; -atomic_t cm_listens_created; -atomic_t cm_listens_destroyed; +atomic_unchecked_t cm_listens_created; +atomic_unchecked_t cm_listens_destroyed; u32 cm_backlog_drops; -atomic_t cm_loopbacks; -atomic_t cm_nodes_created; -atomic_t cm_nodes_destroyed; -atomic_t cm_accel_dropped_pkts; -atomic_t cm_resets_recvd; +atomic_unchecked_t cm_loopbacks; +atomic_unchecked_t cm_nodes_created; +atomic_unchecked_t cm_nodes_destroyed; +atomic_unchecked_t cm_accel_dropped_pkts; +atomic_unchecked_t cm_resets_recvd; static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *); @@ -151,13 +151,13 @@ static struct nes_cm_ops nes_cm_api = { static struct nes_cm_core *g_cm_core; -atomic_t cm_connects; -atomic_t cm_accepts; -atomic_t cm_disconnects; -atomic_t cm_closes; -atomic_t cm_connecteds; -atomic_t cm_connect_reqs; -atomic_t cm_rejects; +atomic_unchecked_t cm_connects; +atomic_unchecked_t cm_accepts; +atomic_unchecked_t cm_disconnects; +atomic_unchecked_t cm_closes; +atomic_unchecked_t cm_connecteds; +atomic_unchecked_t cm_connect_reqs; +atomic_unchecked_t cm_rejects; /** @@ -1045,7 +1045,7 @@ static int mini_cm_dec_refcnt_listen(str kfree(listener); listener = NULL; ret = 0; - atomic_inc(&cm_listens_destroyed); + atomic_inc_unchecked(&cm_listens_destroyed); } else { spin_unlock_irqrestore(&cm_core->listen_list_lock, flags); } @@ -1240,7 +1240,7 @@ static struct nes_cm_node *make_cm_node( cm_node->rem_mac); add_hte_node(cm_core, cm_node); - atomic_inc(&cm_nodes_created); + atomic_inc_unchecked(&cm_nodes_created); return cm_node; } @@ -1298,7 +1298,7 @@ static int rem_ref_cm_node(struct nes_cm } atomic_dec(&cm_core->node_cnt); - atomic_inc(&cm_nodes_destroyed); + atomic_inc_unchecked(&cm_nodes_destroyed); nesqp = cm_node->nesqp; if (nesqp) { nesqp->cm_node = NULL; @@ -1365,7 +1365,7 @@ static int process_options(struct nes_cm static void drop_packet(struct sk_buff *skb) { - atomic_inc(&cm_accel_dropped_pkts); + atomic_inc_unchecked(&cm_accel_dropped_pkts); dev_kfree_skb_any(skb); } @@ -1428,7 +1428,7 @@ static void handle_rst_pkt(struct nes_cm { int reset = 0; /* whether to send reset in case of err.. */ - atomic_inc(&cm_resets_recvd); + atomic_inc_unchecked(&cm_resets_recvd); nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u." " refcnt=%d\n", cm_node, cm_node->state, atomic_read(&cm_node->ref_count)); @@ -2057,7 +2057,7 @@ static struct nes_cm_node *mini_cm_conne rem_ref_cm_node(cm_node->cm_core, cm_node); return NULL; } - atomic_inc(&cm_loopbacks); + atomic_inc_unchecked(&cm_loopbacks); loopbackremotenode->loopbackpartner = cm_node; loopbackremotenode->tcp_cntxt.rcv_wscale = NES_CM_DEFAULT_RCV_WND_SCALE; @@ -2332,7 +2332,7 @@ static int mini_cm_recv_pkt(struct nes_c add_ref_cm_node(cm_node); } else if (cm_node->state == NES_CM_STATE_TSA) { rem_ref_cm_node(cm_core, cm_node); - atomic_inc(&cm_accel_dropped_pkts); + atomic_inc_unchecked(&cm_accel_dropped_pkts); dev_kfree_skb_any(skb); break; } @@ -2638,7 +2638,7 @@ static int nes_cm_disconn_true(struct ne if ((cm_id) && (cm_id->event_handler)) { if (issue_disconn) { - atomic_inc(&cm_disconnects); + atomic_inc_unchecked(&cm_disconnects); cm_event.event = IW_CM_EVENT_DISCONNECT; cm_event.status = disconn_status; cm_event.local_addr = cm_id->local_addr; @@ -2660,7 +2660,7 @@ static int nes_cm_disconn_true(struct ne } if (issue_close) { - atomic_inc(&cm_closes); + atomic_inc_unchecked(&cm_closes); nes_disconnect(nesqp, 1); cm_id->provider_data = nesqp; @@ -2791,7 +2791,7 @@ int nes_accept(struct iw_cm_id *cm_id, s nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n", nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener); - atomic_inc(&cm_accepts); + atomic_inc_unchecked(&cm_accepts); nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n", netdev_refcnt_read(nesvnic->netdev)); @@ -3001,7 +3001,7 @@ int nes_reject(struct iw_cm_id *cm_id, c struct nes_cm_core *cm_core; - atomic_inc(&cm_rejects); + atomic_inc_unchecked(&cm_rejects); cm_node = (struct nes_cm_node *) cm_id->provider_data; loopback = cm_node->loopbackpartner; cm_core = cm_node->cm_core; @@ -3067,7 +3067,7 @@ int nes_connect(struct iw_cm_id *cm_id, ntohl(cm_id->local_addr.sin_addr.s_addr), ntohs(cm_id->local_addr.sin_port)); - atomic_inc(&cm_connects); + atomic_inc_unchecked(&cm_connects); nesqp->active_conn = 1; /* cache the cm_id in the qp */ @@ -3173,7 +3173,7 @@ int nes_create_listen(struct iw_cm_id *c g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node); return err; } - atomic_inc(&cm_listens_created); + atomic_inc_unchecked(&cm_listens_created); } cm_id->add_ref(cm_id); @@ -3278,7 +3278,7 @@ static void cm_event_connected(struct ne if (nesqp->destroyed) { return; } - atomic_inc(&cm_connecteds); + atomic_inc_unchecked(&cm_connecteds); nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on" " local port 0x%04X. jiffies = %lu.\n", nesqp->hwqp.qp_id, @@ -3493,7 +3493,7 @@ static void cm_event_reset(struct nes_cm cm_id->add_ref(cm_id); ret = cm_id->event_handler(cm_id, &cm_event); - atomic_inc(&cm_closes); + atomic_inc_unchecked(&cm_closes); cm_event.event = IW_CM_EVENT_CLOSE; cm_event.status = IW_CM_EVENT_STATUS_OK; cm_event.provider_data = cm_id->provider_data; @@ -3529,7 +3529,7 @@ static void cm_event_mpa_req(struct nes_ return; cm_id = cm_node->cm_id; - atomic_inc(&cm_connect_reqs); + atomic_inc_unchecked(&cm_connect_reqs); nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n", cm_node, cm_id, jiffies); @@ -3567,7 +3567,7 @@ static void cm_event_mpa_reject(struct n return; cm_id = cm_node->cm_id; - atomic_inc(&cm_connect_reqs); + atomic_inc_unchecked(&cm_connect_reqs); nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n", cm_node, cm_id, jiffies); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.39-pax/drivers/infiniband/hw/nes/nes_nic.c --- linux-2.6.39/drivers/infiniband/hw/nes/nes_nic.c 2011-05-19 10:21:34.000000000 +0200 +++ linux-2.6.39-pax/drivers/infiniband/hw/nes/nes_nic.c 2011-05-19 13:45:30.000000000 +0200 @@ -1302,31 +1302,31 @@ static void nes_netdev_get_ethtool_stats target_stat_values[++index] = mh_detected; target_stat_values[++index] = mh_pauses_sent; target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits; - target_stat_values[++index] = atomic_read(&cm_connects); - target_stat_values[++index] = atomic_read(&cm_accepts); - target_stat_values[++index] = atomic_read(&cm_disconnects); - target_stat_values[++index] = atomic_read(&cm_connecteds); - target_stat_values[++index] = atomic_read(&cm_connect_reqs); - target_stat_values[++index] = atomic_read(&cm_rejects); - target_stat_values[++index] = atomic_read(&mod_qp_timouts); - target_stat_values[++index] = atomic_read(&qps_created); - target_stat_values[++index] = atomic_read(&sw_qps_destroyed); - target_stat_values[++index] = atomic_read(&qps_destroyed); - target_stat_values[++index] = atomic_read(&cm_closes); + target_stat_values[++index] = atomic_read_unchecked(&cm_connects); + target_stat_values[++index] = atomic_read_unchecked(&cm_accepts); + target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects); + target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds); + target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs); + target_stat_values[++index] = atomic_read_unchecked(&cm_rejects); + target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts); + target_stat_values[++index] = atomic_read_unchecked(&qps_created); + target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed); + target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed); + target_stat_values[++index] = atomic_read_unchecked(&cm_closes); target_stat_values[++index] = cm_packets_sent; target_stat_values[++index] = cm_packets_bounced; target_stat_values[++index] = cm_packets_created; target_stat_values[++index] = cm_packets_received; target_stat_values[++index] = cm_packets_dropped; target_stat_values[++index] = cm_packets_retrans; - target_stat_values[++index] = atomic_read(&cm_listens_created); - target_stat_values[++index] = atomic_read(&cm_listens_destroyed); + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created); + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed); target_stat_values[++index] = cm_backlog_drops; - target_stat_values[++index] = atomic_read(&cm_loopbacks); - target_stat_values[++index] = atomic_read(&cm_nodes_created); - target_stat_values[++index] = atomic_read(&cm_nodes_destroyed); - target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts); - target_stat_values[++index] = atomic_read(&cm_resets_recvd); + target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks); + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created); + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed); + target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts); + target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd); target_stat_values[++index] = nesadapter->free_4kpbl; target_stat_values[++index] = nesadapter->free_256pbl; target_stat_values[++index] = int_mod_timer_init; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.39-pax/drivers/infiniband/hw/nes/nes_verbs.c --- linux-2.6.39/drivers/infiniband/hw/nes/nes_verbs.c 2011-03-15 19:33:30.000000000 +0100 +++ linux-2.6.39-pax/drivers/infiniband/hw/nes/nes_verbs.c 2011-05-19 13:45:30.000000000 +0200 @@ -46,9 +46,9 @@ #include -atomic_t mod_qp_timouts; -atomic_t qps_created; -atomic_t sw_qps_destroyed; +atomic_unchecked_t mod_qp_timouts; +atomic_unchecked_t qps_created; +atomic_unchecked_t sw_qps_destroyed; static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev); @@ -1141,7 +1141,7 @@ static struct ib_qp *nes_create_qp(struc if (init_attr->create_flags) return ERR_PTR(-EINVAL); - atomic_inc(&qps_created); + atomic_inc_unchecked(&qps_created); switch (init_attr->qp_type) { case IB_QPT_RC: if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) { @@ -1470,7 +1470,7 @@ static int nes_destroy_qp(struct ib_qp * struct iw_cm_event cm_event; int ret; - atomic_inc(&sw_qps_destroyed); + atomic_inc_unchecked(&sw_qps_destroyed); nesqp->destroyed = 1; /* Blow away the connection if it exists. */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/qib/qib.h linux-2.6.39-pax/drivers/infiniband/hw/qib/qib.h --- linux-2.6.39/drivers/infiniband/hw/qib/qib.h 2011-05-19 10:21:34.000000000 +0200 +++ linux-2.6.39-pax/drivers/infiniband/hw/qib/qib.h 2011-05-19 14:23:27.000000000 +0200 @@ -51,6 +51,7 @@ #include #include #include +#include #include "qib_common.h" #include "qib_verbs.h" @@ -87,7 +88,7 @@ struct qlogic_ib_stats { }; extern struct qlogic_ib_stats qib_stats; -extern struct pci_error_handlers qib_pci_err_handler; +extern const struct pci_error_handlers qib_pci_err_handler; extern struct pci_driver qib_driver; #define QIB_CHIP_SWVERSION QIB_CHIP_VERS_MAJ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/qib/qib_mmap.c linux-2.6.39-pax/drivers/infiniband/hw/qib/qib_mmap.c --- linux-2.6.39/drivers/infiniband/hw/qib/qib_mmap.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/infiniband/hw/qib/qib_mmap.c 2011-05-19 14:23:29.000000000 +0200 @@ -75,7 +75,7 @@ static void qib_vma_close(struct vm_area kref_put(&ip->ref, qib_release_mmap_info); } -static struct vm_operations_struct qib_vm_ops = { +static const struct vm_operations_struct qib_vm_ops = { .open = qib_vma_open, .close = qib_vma_close, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/infiniband/hw/qib/qib_pcie.c linux-2.6.39-pax/drivers/infiniband/hw/qib/qib_pcie.c --- linux-2.6.39/drivers/infiniband/hw/qib/qib_pcie.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/infiniband/hw/qib/qib_pcie.c 2011-05-19 14:23:29.000000000 +0200 @@ -735,7 +735,7 @@ qib_pci_resume(struct pci_dev *pdev) qib_init(dd, 1); /* same as re-init after reset */ } -struct pci_error_handlers qib_pci_err_handler = { +const struct pci_error_handlers qib_pci_err_handler = { .error_detected = qib_pci_error_detected, .mmio_enabled = qib_pci_mmio_enabled, .link_reset = qib_pci_link_reset, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/input/gameport/gameport.c linux-2.6.39-pax/drivers/input/gameport/gameport.c --- linux-2.6.39/drivers/input/gameport/gameport.c 2011-03-15 19:33:31.000000000 +0100 +++ linux-2.6.39-pax/drivers/input/gameport/gameport.c 2011-05-19 13:45:30.000000000 +0200 @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys); */ static void gameport_init_port(struct gameport *gameport) { - static atomic_t gameport_no = ATOMIC_INIT(0); + static atomic_unchecked_t gameport_no = ATOMIC_INIT(0); __module_get(THIS_MODULE); mutex_init(&gameport->drv_mutex); device_initialize(&gameport->dev); dev_set_name(&gameport->dev, "gameport%lu", - (unsigned long)atomic_inc_return(&gameport_no) - 1); + (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1); gameport->dev.bus = &gameport_bus; gameport->dev.release = gameport_release_port; if (gameport->parent) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/input/input.c linux-2.6.39-pax/drivers/input/input.c --- linux-2.6.39/drivers/input/input.c 2011-05-19 10:21:35.000000000 +0200 +++ linux-2.6.39-pax/drivers/input/input.c 2011-05-19 13:45:30.000000000 +0200 @@ -1815,7 +1815,7 @@ static void input_cleanse_bitmasks(struc */ int input_register_device(struct input_dev *dev) { - static atomic_t input_no = ATOMIC_INIT(0); + static atomic_unchecked_t input_no = ATOMIC_INIT(0); struct input_handler *handler; const char *path; int error; @@ -1852,7 +1852,7 @@ int input_register_device(struct input_d dev->setkeycode = input_default_setkeycode; dev_set_name(&dev->dev, "input%ld", - (unsigned long) atomic_inc_return(&input_no) - 1); + (unsigned long) atomic_inc_return_unchecked(&input_no) - 1); error = device_add(&dev->dev); if (error) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/input/joystick/sidewinder.c linux-2.6.39-pax/drivers/input/joystick/sidewinder.c --- linux-2.6.39/drivers/input/joystick/sidewinder.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/input/joystick/sidewinder.c 2011-05-19 13:45:30.000000000 +0200 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -428,6 +429,8 @@ static int sw_read(struct sw *sw) unsigned char buf[SW_LENGTH]; int i; + pax_track_stack(); + i = sw_read_packet(sw->gameport, buf, sw->length, 0); if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) { /* Broken packet, try to fix */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/input/joystick/xpad.c linux-2.6.39-pax/drivers/input/joystick/xpad.c --- linux-2.6.39/drivers/input/joystick/xpad.c 2011-03-15 19:33:31.000000000 +0100 +++ linux-2.6.39-pax/drivers/input/joystick/xpad.c 2011-05-19 13:45:30.000000000 +0200 @@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas static int xpad_led_probe(struct usb_xpad *xpad) { - static atomic_t led_seq = ATOMIC_INIT(0); + static atomic_unchecked_t led_seq = ATOMIC_INIT(0); long led_no; struct xpad_led *led; struct led_classdev *led_cdev; @@ -702,7 +702,7 @@ static int xpad_led_probe(struct usb_xpa if (!led) return -ENOMEM; - led_no = (long)atomic_inc_return(&led_seq) - 1; + led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1; snprintf(led->name, sizeof(led->name), "xpad%ld", led_no); led->xpad = xpad; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/input/mousedev.c linux-2.6.39-pax/drivers/input/mousedev.c --- linux-2.6.39/drivers/input/mousedev.c 2011-03-15 19:33:32.000000000 +0100 +++ linux-2.6.39-pax/drivers/input/mousedev.c 2011-05-19 13:45:30.000000000 +0200 @@ -764,7 +764,7 @@ static ssize_t mousedev_read(struct file 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/input/serio/serio.c linux-2.6.39-pax/drivers/input/serio/serio.c --- linux-2.6.39/drivers/input/serio/serio.c 2011-03-15 19:33:32.000000000 +0100 +++ linux-2.6.39-pax/drivers/input/serio/serio.c 2011-05-19 13:45:30.000000000 +0200 @@ -497,7 +497,7 @@ static void serio_release_port(struct de */ static void serio_init_port(struct serio *serio) { - static atomic_t serio_no = ATOMIC_INIT(0); + static atomic_unchecked_t serio_no = ATOMIC_INIT(0); __module_get(THIS_MODULE); @@ -508,7 +508,7 @@ static void serio_init_port(struct serio mutex_init(&serio->drv_mutex); device_initialize(&serio->dev); dev_set_name(&serio->dev, "serio%ld", - (long)atomic_inc_return(&serio_no) - 1); + (long)atomic_inc_return_unchecked(&serio_no) - 1); serio->dev.bus = &serio_bus; serio->dev.release = serio_release_port; serio->dev.groups = serio_device_attr_groups; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/capi/capi.c linux-2.6.39-pax/drivers/isdn/capi/capi.c --- linux-2.6.39/drivers/isdn/capi/capi.c 2011-05-19 10:21:35.000000000 +0200 +++ linux-2.6.39-pax/drivers/isdn/capi/capi.c 2011-05-19 13:45:30.000000000 +0200 @@ -89,8 +89,8 @@ struct capiminor { struct capi20_appl *ap; u32 ncci; - atomic_t datahandle; - atomic_t msgid; + atomic_unchecked_t datahandle; + atomic_unchecked_t msgid; struct tty_port port; int ttyinstop; @@ -414,7 +414,7 @@ gen_data_b3_resp_for(struct capiminor *m capimsg_setu16(s, 2, mp->ap->applid); capimsg_setu8 (s, 4, CAPI_DATA_B3); capimsg_setu8 (s, 5, CAPI_RESP); - capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid)); + capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid)); capimsg_setu32(s, 8, mp->ncci); capimsg_setu16(s, 12, datahandle); } @@ -547,14 +547,14 @@ static void handle_minor_send(struct cap mp->outbytes -= len; spin_unlock_bh(&mp->outlock); - datahandle = atomic_inc_return(&mp->datahandle); + datahandle = atomic_inc_return_unchecked(&mp->datahandle); skb_push(skb, CAPI_DATA_B3_REQ_LEN); memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN); capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN); capimsg_setu16(skb->data, 2, mp->ap->applid); capimsg_setu8 (skb->data, 4, CAPI_DATA_B3); capimsg_setu8 (skb->data, 5, CAPI_REQ); - capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid)); + capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid)); capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */ capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */ capimsg_setu16(skb->data, 16, len); /* Data length */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/gigaset/common.c linux-2.6.39-pax/drivers/isdn/gigaset/common.c --- linux-2.6.39/drivers/isdn/gigaset/common.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/gigaset/common.c 2011-05-19 13:45:30.000000000 +0200 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/gigaset/gigaset.h linux-2.6.39-pax/drivers/isdn/gigaset/gigaset.h --- linux-2.6.39/drivers/isdn/gigaset/gigaset.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/gigaset/gigaset.h 2011-05-19 13:45:30.000000000 +0200 @@ -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 @@ struct cardstate { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/gigaset/interface.c linux-2.6.39-pax/drivers/isdn/gigaset/interface.c --- linux-2.6.39/drivers/isdn/gigaset/interface.c 2011-05-19 10:21:35.000000000 +0200 +++ linux-2.6.39-pax/drivers/isdn/gigaset/interface.c 2011-05-19 13:45:30.000000000 +0200 @@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt 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 @@ static void if_close(struct tty_struct * 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 @@ static int if_ioctl(struct tty_struct *t 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 @@ static int if_write(struct tty_struct *t 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 @@ static int if_write_room(struct tty_stru 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 @@ static int if_chars_in_buffer(struct tty 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 @@ static void if_throttle(struct tty_struc 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 @@ static void if_unthrottle(struct tty_str 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 @@ static void if_set_termios(struct tty_st 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/hardware/avm/b1.c linux-2.6.39-pax/drivers/isdn/hardware/avm/b1.c --- linux-2.6.39/drivers/isdn/hardware/avm/b1.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/hardware/avm/b1.c 2011-05-19 13:45:30.000000000 +0200 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo } 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 @@ int b1_load_config(avmcard *card, capilo } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.39-pax/drivers/isdn/hardware/eicon/capidtmf.c --- linux-2.6.39/drivers/isdn/hardware/eicon/capidtmf.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/hardware/eicon/capidtmf.c 2011-05-19 13:45:30.000000000 +0200 @@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT]; short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES]; + pax_track_stack(); if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.39-pax/drivers/isdn/hardware/eicon/capifunc.c --- linux-2.6.39/drivers/isdn/hardware/eicon/capifunc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/hardware/eicon/capifunc.c 2011-05-19 13:45:30.000000000 +0200 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void) IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; + pax_track_stack(); + DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.39-pax/drivers/isdn/hardware/eicon/diddfunc.c --- linux-2.6.39/drivers/isdn/hardware/eicon/diddfunc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/hardware/eicon/diddfunc.c 2011-05-19 13:45:30.000000000 +0200 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; + pax_track_stack(); + DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.39-pax/drivers/isdn/hardware/eicon/divasfunc.c --- linux-2.6.39/drivers/isdn/hardware/eicon/divasfunc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/hardware/eicon/divasfunc.c 2011-05-19 13:45:30.000000000 +0200 @@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; + pax_track_stack(); + DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.39-pax/drivers/isdn/hardware/eicon/idifunc.c --- linux-2.6.39/drivers/isdn/hardware/eicon/idifunc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/hardware/eicon/idifunc.c 2011-05-19 13:45:30.000000000 +0200 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; + pax_track_stack(); + DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/hardware/eicon/message.c linux-2.6.39-pax/drivers/isdn/hardware/eicon/message.c --- linux-2.6.39/drivers/isdn/hardware/eicon/message.c 2011-05-19 10:21:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/isdn/hardware/eicon/message.c 2011-05-19 13:45:30.000000000 +0200 @@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci) dword d; word w; + pax_track_stack(); + a = plci->adapter; Id = ((word)plci->Id<<8)|a->Id; PUT_WORD(&SS_Ind[4],0x0000); @@ -7484,6 +7486,8 @@ static word add_b1(PLCI *plci, API_PARSE word j, n, w; dword d; + pax_track_stack(); + for(i=0;i<8;i++) bp_parms[i].length = 0; for(i=0;i<2;i++) global_config[i].length = 0; @@ -7958,6 +7962,8 @@ static word add_b23(PLCI *plci, API_PARS const byte llc3[] = {4,3,2,2,6,6,0}; const byte header[] = {0,2,3,3,0,0,0}; + pax_track_stack(); + for(i=0;i<8;i++) bp_parms[i].length = 0; for(i=0;i<6;i++) b2_config_parms[i].length = 0; for(i=0;i<5;i++) b3_config_parms[i].length = 0; @@ -14760,6 +14766,8 @@ static void group_optimization(DIVA_CAPI word appl_number_group_type[MAX_APPL]; PLCI *auxplci; + pax_track_stack(); + set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */ if(!a->group_optimization_enabled) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.39-pax/drivers/isdn/hardware/eicon/mntfunc.c --- linux-2.6.39/drivers/isdn/hardware/eicon/mntfunc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/hardware/eicon/mntfunc.c 2011-05-19 13:45:30.000000000 +0200 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; + pax_track_stack(); + DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/i4l/isdn_common.c linux-2.6.39-pax/drivers/isdn/i4l/isdn_common.c --- linux-2.6.39/drivers/isdn/i4l/isdn_common.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/i4l/isdn_common.c 2011-05-19 13:45:30.000000000 +0200 @@ -1292,6 +1292,8 @@ isdn_ioctl(struct file *file, uint cmd, } iocpar; void __user *argp = (void __user *)arg; + pax_track_stack(); + #define name iocpar.name #define bname iocpar.bname #define iocts iocpar.iocts diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/i4l/isdn_net.c linux-2.6.39-pax/drivers/isdn/i4l/isdn_net.c --- linux-2.6.39/drivers/isdn/i4l/isdn_net.c 2011-05-19 10:21:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/isdn/i4l/isdn_net.c 2011-05-19 14:23:29.000000000 +0200 @@ -400,7 +400,7 @@ isdn_net_stat_callback(int idx, isdn_ctr isdn_net_local *lp = p->local; #ifdef CONFIG_ISDN_X25 struct concap_proto *cprot = lp->netdev->cprot; - struct concap_proto_ops *pops = cprot ? cprot->pops : NULL; + const struct concap_proto_ops *pops = cprot ? cprot->pops : NULL; #endif switch (cmd) { case ISDN_STAT_BSENT: @@ -831,7 +831,7 @@ isdn_net_hangup(struct net_device *d) isdn_ctrl cmd; #ifdef CONFIG_ISDN_X25 struct concap_proto *cprot = lp->netdev->cprot; - struct concap_proto_ops *pops = cprot ? cprot->pops : NULL; + const struct concap_proto_ops *pops = cprot ? cprot->pops : NULL; #endif if (lp->flags & ISDN_NET_CONNECTED) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.c linux-2.6.39-pax/drivers/isdn/i4l/isdn_x25iface.c --- linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/i4l/isdn_x25iface.c 2011-05-19 14:23:29.000000000 +0200 @@ -52,7 +52,7 @@ static int isdn_x25iface_connect_ind( st static int isdn_x25iface_disconn_ind( struct concap_proto * ); -static struct concap_proto_ops ix25_pops = { +static const struct concap_proto_ops ix25_pops = { &isdn_x25iface_proto_new, &isdn_x25iface_proto_del, &isdn_x25iface_proto_restart, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.h linux-2.6.39-pax/drivers/isdn/i4l/isdn_x25iface.h --- linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/i4l/isdn_x25iface.h 2011-05-19 14:23:29.000000000 +0200 @@ -23,7 +23,7 @@ #include #include -extern struct concap_proto_ops * isdn_x25iface_concap_proto_ops_pt; +extern const struct concap_proto_ops *isdn_x25iface_concap_proto_ops_pt; extern struct concap_proto * isdn_x25iface_proto_new(void); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/isdn/icn/icn.c linux-2.6.39-pax/drivers/isdn/icn/icn.c --- linux-2.6.39/drivers/isdn/icn/icn.c 2011-03-15 19:33:34.000000000 +0100 +++ linux-2.6.39-pax/drivers/isdn/icn/icn.c 2011-05-19 13:45:30.000000000 +0200 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/lguest/core.c linux-2.6.39-pax/drivers/lguest/core.c --- linux-2.6.39/drivers/lguest/core.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/lguest/core.c 2011-05-19 13:45:30.000000000 +0200 @@ -92,9 +92,17 @@ static __init int map_switcher(void) * 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 @@ static __init int map_switcher(void) * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/lguest/lguest_device.c linux-2.6.39-pax/drivers/lguest/lguest_device.c --- linux-2.6.39/drivers/lguest/lguest_device.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/lguest/lguest_device.c 2011-05-19 14:23:29.000000000 +0200 @@ -374,7 +374,7 @@ error: } /* The ops structure which hooks everything together. */ -static struct virtio_config_ops lguest_config_ops = { +static const struct virtio_config_ops lguest_config_ops = { .get_features = lg_get_features, .finalize_features = lg_finalize_features, .get = lg_get, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/lguest/x86/core.c linux-2.6.39-pax/drivers/lguest/x86/core.c --- linux-2.6.39/drivers/lguest/x86/core.c 2011-03-15 19:33:34.000000000 +0100 +++ linux-2.6.39-pax/drivers/lguest/x86/core.c 2011-05-19 13:45:30.000000000 +0200 @@ -59,7 +59,7 @@ static struct { /* 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 @@ static void copy_in_guest_info(struct lg * 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 @@ void __init lguest_arch_host_init(void) * 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 @@ void __init lguest_arch_host_init(void) * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/lguest/x86/switcher_32.S linux-2.6.39-pax/drivers/lguest/x86/switcher_32.S --- linux-2.6.39/drivers/lguest/x86/switcher_32.S 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/lguest/x86/switcher_32.S 2011-05-19 13:45:30.000000000 +0200 @@ -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 @@ ENTRY(switch_to_guest) // 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 @@ ENTRY(switch_to_guest) // 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 @@ deliver_to_host: // 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/md/dm-crypt.c linux-2.6.39-pax/drivers/md/dm-crypt.c --- linux-2.6.39/drivers/md/dm-crypt.c 2011-05-19 10:21:37.000000000 +0200 +++ linux-2.6.39-pax/drivers/md/dm-crypt.c 2011-05-19 14:23:29.000000000 +0200 @@ -138,7 +138,7 @@ struct crypt_config { char *cipher; char *cipher_string; - struct crypt_iv_operations *iv_gen_ops; + const struct crypt_iv_operations *iv_gen_ops; union { struct iv_essiv_private essiv; struct iv_benbi_private benbi; @@ -620,15 +620,15 @@ static int crypt_iv_lmk_post(struct cryp return r; } -static struct crypt_iv_operations crypt_iv_plain_ops = { +static const struct crypt_iv_operations crypt_iv_plain_ops = { .generator = crypt_iv_plain_gen }; -static struct crypt_iv_operations crypt_iv_plain64_ops = { +static const struct crypt_iv_operations crypt_iv_plain64_ops = { .generator = crypt_iv_plain64_gen }; -static struct crypt_iv_operations crypt_iv_essiv_ops = { +static const struct crypt_iv_operations crypt_iv_essiv_ops = { .ctr = crypt_iv_essiv_ctr, .dtr = crypt_iv_essiv_dtr, .init = crypt_iv_essiv_init, @@ -636,17 +636,17 @@ static struct crypt_iv_operations crypt_ .generator = crypt_iv_essiv_gen }; -static struct crypt_iv_operations crypt_iv_benbi_ops = { +static const struct crypt_iv_operations crypt_iv_benbi_ops = { .ctr = crypt_iv_benbi_ctr, .dtr = crypt_iv_benbi_dtr, .generator = crypt_iv_benbi_gen }; -static struct crypt_iv_operations crypt_iv_null_ops = { +static const struct crypt_iv_operations crypt_iv_null_ops = { .generator = crypt_iv_null_gen }; -static struct crypt_iv_operations crypt_iv_lmk_ops = { +static const struct crypt_iv_operations crypt_iv_lmk_ops = { .ctr = crypt_iv_lmk_ctr, .dtr = crypt_iv_lmk_dtr, .init = crypt_iv_lmk_init, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/md/dm-ioctl.c linux-2.6.39-pax/drivers/md/dm-ioctl.c --- linux-2.6.39/drivers/md/dm-ioctl.c 2011-05-19 10:21:37.000000000 +0200 +++ linux-2.6.39-pax/drivers/md/dm-ioctl.c 2011-05-19 13:45:30.000000000 +0200 @@ -1551,7 +1551,7 @@ static int validate_params(uint cmd, str 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; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/md/dm-raid1.c linux-2.6.39-pax/drivers/md/dm-raid1.c --- linux-2.6.39/drivers/md/dm-raid1.c 2011-05-19 10:21:37.000000000 +0200 +++ linux-2.6.39-pax/drivers/md/dm-raid1.c 2011-05-19 13:45:30.000000000 +0200 @@ -42,7 +42,7 @@ enum dm_raid1_error { struct mirror { struct mirror_set *ms; - atomic_t error_count; + atomic_unchecked_t error_count; unsigned long error_type; struct dm_dev *dev; sector_t offset; @@ -187,7 +187,7 @@ static struct mirror *get_valid_mirror(s struct mirror *m; for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++) - if (!atomic_read(&m->error_count)) + if (!atomic_read_unchecked(&m->error_count)) return m; return NULL; @@ -219,7 +219,7 @@ static void fail_mirror(struct mirror *m * simple way to tell if a device has encountered * errors. */ - atomic_inc(&m->error_count); + atomic_inc_unchecked(&m->error_count); if (test_and_set_bit(error_type, &m->error_type)) return; @@ -410,7 +410,7 @@ static struct mirror *choose_mirror(stru struct mirror *m = get_default_mirror(ms); do { - if (likely(!atomic_read(&m->error_count))) + if (likely(!atomic_read_unchecked(&m->error_count))) return m; if (m-- == ms->mirror) @@ -424,7 +424,7 @@ static int default_ok(struct mirror *m) { struct mirror *default_mirror = get_default_mirror(m->ms); - return !atomic_read(&default_mirror->error_count); + return !atomic_read_unchecked(&default_mirror->error_count); } static int mirror_available(struct mirror_set *ms, struct bio *bio) @@ -561,7 +561,7 @@ static void do_reads(struct mirror_set * */ if (likely(region_in_sync(ms, region, 1))) m = choose_mirror(ms, bio->bi_sector); - else if (m && atomic_read(&m->error_count)) + else if (m && atomic_read_unchecked(&m->error_count)) m = NULL; if (likely(m)) @@ -939,7 +939,7 @@ static int get_mirror(struct mirror_set } ms->mirror[mirror].ms = ms; - atomic_set(&(ms->mirror[mirror].error_count), 0); + atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0); ms->mirror[mirror].error_type = 0; ms->mirror[mirror].offset = offset; @@ -1347,7 +1347,7 @@ static void mirror_resume(struct dm_targ */ static char device_status_char(struct mirror *m) { - if (!atomic_read(&(m->error_count))) + if (!atomic_read_unchecked(&(m->error_count))) return 'A'; return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' : diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/md/dm-stripe.c linux-2.6.39-pax/drivers/md/dm-stripe.c --- linux-2.6.39/drivers/md/dm-stripe.c 2011-05-19 10:21:37.000000000 +0200 +++ linux-2.6.39-pax/drivers/md/dm-stripe.c 2011-05-19 13:45:30.000000000 +0200 @@ -20,7 +20,7 @@ struct stripe { struct dm_dev *dev; sector_t physical_start; - atomic_t error_count; + atomic_unchecked_t error_count; }; struct stripe_c { @@ -192,7 +192,7 @@ static int stripe_ctr(struct dm_target * kfree(sc); return r; } - atomic_set(&(sc->stripe[i].error_count), 0); + atomic_set_unchecked(&(sc->stripe[i].error_count), 0); } ti->private = sc; @@ -314,7 +314,7 @@ static int stripe_status(struct dm_targe DMEMIT("%d ", sc->stripes); for (i = 0; i < sc->stripes; i++) { DMEMIT("%s ", sc->stripe[i].dev->name); - buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ? + buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ? 'D' : 'A'; } buffer[i] = '\0'; @@ -361,8 +361,8 @@ static int stripe_end_io(struct dm_targe */ for (i = 0; i < sc->stripes; i++) if (!strcmp(sc->stripe[i].dev->name, major_minor)) { - atomic_inc(&(sc->stripe[i].error_count)); - if (atomic_read(&(sc->stripe[i].error_count)) < + atomic_inc_unchecked(&(sc->stripe[i].error_count)); + if (atomic_read_unchecked(&(sc->stripe[i].error_count)) < DM_IO_ERROR_THRESHOLD) schedule_work(&sc->trigger_event); } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/md/dm-table.c linux-2.6.39-pax/drivers/md/dm-table.c --- linux-2.6.39/drivers/md/dm-table.c 2011-05-19 10:21:37.000000000 +0200 +++ linux-2.6.39-pax/drivers/md/dm-table.c 2011-05-19 13:45:30.000000000 +0200 @@ -373,7 +373,7 @@ static int device_area_is_invalid(struct 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/md/dm.c linux-2.6.39-pax/drivers/md/dm.c --- linux-2.6.39/drivers/md/dm.c 2011-05-19 10:21:37.000000000 +0200 +++ linux-2.6.39-pax/drivers/md/dm.c 2011-05-19 13:45:30.000000000 +0200 @@ -162,9 +162,9 @@ struct mapped_device { /* * Event handling. */ - atomic_t event_nr; + atomic_unchecked_t event_nr; wait_queue_head_t eventq; - atomic_t uevent_seq; + atomic_unchecked_t uevent_seq; struct list_head uevent_list; spinlock_t uevent_lock; /* Protect access to uevent_list */ @@ -1836,8 +1836,8 @@ static struct mapped_device *alloc_dev(i rwlock_init(&md->map_lock); atomic_set(&md->holders, 1); atomic_set(&md->open_count, 0); - atomic_set(&md->event_nr, 0); - atomic_set(&md->uevent_seq, 0); + atomic_set_unchecked(&md->event_nr, 0); + atomic_set_unchecked(&md->uevent_seq, 0); INIT_LIST_HEAD(&md->uevent_list); spin_lock_init(&md->uevent_lock); @@ -1971,7 +1971,7 @@ static void event_callback(void *context dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj); - atomic_inc(&md->event_nr); + atomic_inc_unchecked(&md->event_nr); wake_up(&md->eventq); } @@ -2547,18 +2547,18 @@ int dm_kobject_uevent(struct mapped_devi uint32_t dm_next_uevent_seq(struct mapped_device *md) { - return atomic_add_return(1, &md->uevent_seq); + return atomic_add_return_unchecked(1, &md->uevent_seq); } uint32_t dm_get_event_nr(struct mapped_device *md) { - return atomic_read(&md->event_nr); + return atomic_read_unchecked(&md->event_nr); } int dm_wait_event(struct mapped_device *md, int event_nr) { return wait_event_interruptible(md->eventq, - (event_nr != atomic_read(&md->event_nr))); + (event_nr != atomic_read_unchecked(&md->event_nr))); } void dm_uevent_add(struct mapped_device *md, struct list_head *elist) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/md/md.c linux-2.6.39-pax/drivers/md/md.c --- linux-2.6.39/drivers/md/md.c 2011-05-19 10:21:37.000000000 +0200 +++ linux-2.6.39-pax/drivers/md/md.c 2011-05-19 13:45:30.000000000 +0200 @@ -226,10 +226,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev); * start build, activate spare */ static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters); -static atomic_t md_event_count; +static atomic_unchecked_t md_event_count; void md_new_event(mddev_t *mddev) { - atomic_inc(&md_event_count); + atomic_inc_unchecked(&md_event_count); wake_up(&md_event_waiters); } EXPORT_SYMBOL_GPL(md_new_event); @@ -239,7 +239,7 @@ EXPORT_SYMBOL_GPL(md_new_event); */ static void md_new_event_inintr(mddev_t *mddev) { - atomic_inc(&md_event_count); + atomic_inc_unchecked(&md_event_count); wake_up(&md_event_waiters); } @@ -1454,7 +1454,7 @@ static int super_1_load(mdk_rdev_t *rdev rdev->preferred_minor = 0xffff; rdev->data_offset = le64_to_cpu(sb->data_offset); - atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read)); + atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read)); rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256; bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1; @@ -1632,7 +1632,7 @@ static void super_1_sync(mddev_t *mddev, else sb->resync_offset = cpu_to_le64(0); - sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors)); + sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors)); sb->raid_disks = cpu_to_le32(mddev->raid_disks); sb->size = cpu_to_le64(mddev->dev_sectors); @@ -2414,7 +2414,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho static ssize_t errors_show(mdk_rdev_t *rdev, char *page) { - return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors)); + return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors)); } static ssize_t @@ -2423,7 +2423,7 @@ errors_store(mdk_rdev_t *rdev, const cha char *e; unsigned long n = simple_strtoul(buf, &e, 10); if (*buf && (*e == 0 || *e == '\n')) { - atomic_set(&rdev->corrected_errors, n); + atomic_set_unchecked(&rdev->corrected_errors, n); return len; } return -EINVAL; @@ -2779,8 +2779,8 @@ void md_rdev_init(mdk_rdev_t *rdev) rdev->last_read_error.tv_sec = 0; rdev->last_read_error.tv_nsec = 0; atomic_set(&rdev->nr_pending, 0); - atomic_set(&rdev->read_errors, 0); - atomic_set(&rdev->corrected_errors, 0); + atomic_set_unchecked(&rdev->read_errors, 0); + atomic_set_unchecked(&rdev->corrected_errors, 0); INIT_LIST_HEAD(&rdev->same_set); init_waitqueue_head(&rdev->blocked_wait); @@ -6383,7 +6383,7 @@ static int md_seq_show(struct seq_file * spin_unlock(&pers_lock); seq_printf(seq, "\n"); - mi->event = atomic_read(&md_event_count); + mi->event = atomic_read_unchecked(&md_event_count); return 0; } if (v == (void*)2) { @@ -6472,7 +6472,7 @@ static int md_seq_show(struct seq_file * 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"); @@ -6506,7 +6506,7 @@ static int md_seq_open(struct inode *ino else { struct seq_file *p = file->private_data; p->private = mi; - mi->event = atomic_read(&md_event_count); + mi->event = atomic_read_unchecked(&md_event_count); } return error; } @@ -6522,7 +6522,7 @@ static unsigned int mdstat_poll(struct f /* always allow read */ mask = POLLIN | POLLRDNORM; - if (mi->event != atomic_read(&md_event_count)) + if (mi->event != atomic_read_unchecked(&md_event_count)) mask |= POLLERR | POLLPRI; return mask; } @@ -6566,7 +6566,7 @@ static int is_mddev_idle(mddev_t *mddev, 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/md/md.h linux-2.6.39-pax/drivers/md/md.h --- linux-2.6.39/drivers/md/md.h 2011-05-19 10:21:37.000000000 +0200 +++ linux-2.6.39-pax/drivers/md/md.h 2011-05-19 13:45:30.000000000 +0200 @@ -97,13 +97,13 @@ struct mdk_rdev_s * only maintained for arrays that * support hot removal */ - atomic_t read_errors; /* number of consecutive read errors that + atomic_unchecked_t read_errors; /* number of consecutive read errors that * we have tried to ignore. */ struct timespec last_read_error; /* monotonic time since our * last read error */ - atomic_t corrected_errors; /* number of corrected read errors, + atomic_unchecked_t corrected_errors; /* number of corrected read errors, * for reporting to userspace and storing * in superblock. */ @@ -342,7 +342,7 @@ static inline void rdev_dec_pending(mdk_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/md/raid1.c linux-2.6.39-pax/drivers/md/raid1.c --- linux-2.6.39/drivers/md/raid1.c 2011-05-19 10:21:37.000000000 +0200 +++ linux-2.6.39-pax/drivers/md/raid1.c 2011-05-19 13:45:30.000000000 +0200 @@ -1342,7 +1342,7 @@ static void sync_request_write(mddev_t * if (r1_bio->bios[d]->bi_end_io != end_sync_read) continue; rdev = conf->mirrors[d].rdev; - atomic_add(s, &rdev->corrected_errors); + atomic_add_unchecked(s, &rdev->corrected_errors); if (sync_page_io(rdev, sect, s<<9, @@ -1488,7 +1488,7 @@ static void fix_read_error(conf_t *conf, /* Well, this device is dead */ md_error(mddev, rdev); else { - atomic_add(s, &rdev->corrected_errors); + atomic_add_unchecked(s, &rdev->corrected_errors); printk(KERN_INFO "md/raid1:%s: read error corrected " "(%d sectors at %llu on %s)\n", diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/md/raid10.c linux-2.6.39-pax/drivers/md/raid10.c --- linux-2.6.39/drivers/md/raid10.c 2011-05-19 10:21:37.000000000 +0200 +++ linux-2.6.39-pax/drivers/md/raid10.c 2011-05-19 13:45:30.000000000 +0200 @@ -1209,7 +1209,7 @@ static void end_sync_read(struct bio *bi if (test_bit(BIO_UPTODATE, &bio->bi_flags)) set_bit(R10BIO_Uptodate, &r10_bio->state); else { - atomic_add(r10_bio->sectors, + atomic_add_unchecked(r10_bio->sectors, &conf->mirrors[d].rdev->corrected_errors); if (!test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery)) md_error(r10_bio->mddev, @@ -1417,7 +1417,7 @@ static void check_decay_read_errors(mdde { struct timespec cur_time_mon; unsigned long hours_since_last; - unsigned int read_errors = atomic_read(&rdev->read_errors); + unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors); ktime_get_ts(&cur_time_mon); @@ -1439,9 +1439,9 @@ static void check_decay_read_errors(mdde * overflowing the shift of read_errors by hours_since_last. */ if (hours_since_last >= 8 * sizeof(read_errors)) - atomic_set(&rdev->read_errors, 0); + atomic_set_unchecked(&rdev->read_errors, 0); else - atomic_set(&rdev->read_errors, read_errors >> hours_since_last); + atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last); } /* @@ -1476,8 +1476,8 @@ static void fix_read_error(conf_t *conf, } check_decay_read_errors(mddev, rdev); - atomic_inc(&rdev->read_errors); - cur_read_error_count = atomic_read(&rdev->read_errors); + atomic_inc_unchecked(&rdev->read_errors); + cur_read_error_count = atomic_read_unchecked(&rdev->read_errors); if (cur_read_error_count > max_read_errors) { rcu_read_unlock(); printk(KERN_NOTICE @@ -1550,7 +1550,7 @@ static void fix_read_error(conf_t *conf, test_bit(In_sync, &rdev->flags)) { atomic_inc(&rdev->nr_pending); rcu_read_unlock(); - atomic_add(s, &rdev->corrected_errors); + atomic_add_unchecked(s, &rdev->corrected_errors); if (sync_page_io(rdev, r10_bio->devs[sl].addr + sect, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/md/raid5.c linux-2.6.39-pax/drivers/md/raid5.c --- linux-2.6.39/drivers/md/raid5.c 2011-05-19 10:21:37.000000000 +0200 +++ linux-2.6.39-pax/drivers/md/raid5.c 2011-05-19 13:45:30.000000000 +0200 @@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea bi->bi_next = NULL; if (rw == WRITE && test_bit(R5_ReWrite, &sh->dev[i].flags)) - atomic_add(STRIPE_SECTORS, + atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors); generic_make_request(bi); } else { @@ -1596,15 +1596,15 @@ static void raid5_end_read_request(struc clear_bit(R5_ReadError, &sh->dev[i].flags); clear_bit(R5_ReWrite, &sh->dev[i].flags); } - if (atomic_read(&conf->disks[i].rdev->read_errors)) - atomic_set(&conf->disks[i].rdev->read_errors, 0); + if (atomic_read_unchecked(&conf->disks[i].rdev->read_errors)) + atomic_set_unchecked(&conf->disks[i].rdev->read_errors, 0); } else { const char *bdn = bdevname(conf->disks[i].rdev->bdev, b); int retry = 0; rdev = conf->disks[i].rdev; clear_bit(R5_UPTODATE, &sh->dev[i].flags); - atomic_inc(&rdev->read_errors); + atomic_inc_unchecked(&rdev->read_errors); if (conf->mddev->degraded >= conf->max_degraded) printk_rl(KERN_WARNING "md/raid:%s: read error not correctable " @@ -1622,7 +1622,7 @@ static void raid5_end_read_request(struc (unsigned long long)(sh->sector + rdev->data_offset), bdn); - else if (atomic_read(&rdev->read_errors) + else if (atomic_read_unchecked(&rdev->read_errors) > conf->max_nr_stripes) printk(KERN_WARNING "md/raid:%s: Too many read errors, failing device %s.\n", @@ -1947,6 +1947,7 @@ static sector_t compute_blocknr(struct s sector_t r_sector; struct stripe_head sh2; + pax_track_stack(); chunk_offset = sector_div(new_sector, sectors_per_chunk); stripe = new_sector; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/common/saa7146_hlp.c linux-2.6.39-pax/drivers/media/common/saa7146_hlp.c --- linux-2.6.39/drivers/media/common/saa7146_hlp.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/common/saa7146_hlp.c 2011-05-19 13:45:30.000000000 +0200 @@ -353,6 +353,8 @@ static void calculate_clipping_registers int x[32], y[32], w[32], h[32]; + pax_track_stack(); + /* clear out memory */ memset(&line_list[0], 0x00, sizeof(u32)*32); memset(&pixel_list[0], 0x00, sizeof(u32)*32); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/common/saa7146_vbi.c linux-2.6.39-pax/drivers/media/common/saa7146_vbi.c --- linux-2.6.39/drivers/media/common/saa7146_vbi.c 2011-03-15 19:33:37.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/common/saa7146_vbi.c 2011-05-19 14:23:29.000000000 +0200 @@ -501,7 +501,7 @@ static ssize_t vbi_read(struct file *fil return ret; } -struct saa7146_use_ops saa7146_vbi_uops = { +const struct saa7146_use_ops saa7146_vbi_uops = { .init = vbi_init, .open = vbi_open, .release = vbi_close, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/common/saa7146_video.c linux-2.6.39-pax/drivers/media/common/saa7146_video.c --- linux-2.6.39/drivers/media/common/saa7146_video.c 2011-03-15 19:33:37.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/common/saa7146_video.c 2011-05-19 14:23:29.000000000 +0200 @@ -1420,7 +1420,7 @@ out: return ret; } -struct saa7146_use_ops saa7146_video_uops = { +const struct saa7146_use_ops saa7146_video_uops = { .init = video_init, .open = video_open, .release = video_close, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/dm1105/dm1105.c linux-2.6.39-pax/drivers/media/dvb/dm1105/dm1105.c --- linux-2.6.39/drivers/media/dvb/dm1105/dm1105.c 2011-03-15 19:33:37.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/dvb/dm1105/dm1105.c 2011-05-19 14:23:29.000000000 +0200 @@ -418,7 +418,7 @@ static u32 functionality(struct i2c_adap return I2C_FUNC_I2C; } -static struct i2c_algorithm dm1105_algo = { +static const struct i2c_algorithm dm1105_algo = { .master_xfer = dm1105_i2c_xfer, .functionality = functionality, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.39-pax/drivers/media/dvb/dvb-core/dvb_ca_en50221.c --- linux-2.6.39/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-05-19 13:45:30.000000000 +0200 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru u8 buf[HOST_LINK_BUF_SIZE]; int i; + pax_track_stack(); + dprintk("%s\n", __func__); /* check if we have space for a link buf in the rx_buffer */ @@ -1285,6 +1287,8 @@ static ssize_t dvb_ca_en50221_io_write(s unsigned long timeout; int written; + pax_track_stack(); + dprintk("%s\n", __func__); /* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.39-pax/drivers/media/dvb/dvb-core/dvbdev.c --- linux-2.6.39/drivers/media/dvb/dvb-core/dvbdev.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/dvb/dvb-core/dvbdev.c 2011-05-19 14:23:29.000000000 +0200 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.39-pax/drivers/media/dvb/dvb-usb/dib0700_core.c --- linux-2.6.39/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-05-19 10:21:38.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-05-19 13:45:30.000000000 +0200 @@ -391,6 +391,8 @@ int dib0700_download_firmware(struct usb u8 buf[260]; + pax_track_stack(); + while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) { deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n", hx.addr, hx.len, hx.chk); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/dvb-usb/lmedm04.c linux-2.6.39-pax/drivers/media/dvb/dvb-usb/lmedm04.c --- linux-2.6.39/drivers/media/dvb/dvb-usb/lmedm04.c 2011-05-19 10:21:38.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/dvb/dvb-usb/lmedm04.c 2011-05-19 13:45:30.000000000 +0200 @@ -663,6 +663,7 @@ static int lme2510_download_firmware(str packet_size = 0x31; len_in = 1; + pax_track_stack(); info("FRM Starting Firmware Download"); @@ -715,6 +716,8 @@ static void lme_coldreset(struct usb_dev int ret = 0, len_in; u8 data[512] = {0}; + pax_track_stack(); + data[0] = 0x0a; len_in = 1; info("FRM Firmware Cold Reset"); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/frontends/dib7000p.c linux-2.6.39-pax/drivers/media/dvb/frontends/dib7000p.c --- linux-2.6.39/drivers/media/dvb/frontends/dib7000p.c 2011-05-19 10:21:38.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/dvb/frontends/dib7000p.c 2011-05-19 14:23:29.000000000 +0200 @@ -1913,7 +1913,7 @@ static u32 dib7000p_i2c_func(struct i2c_ return I2C_FUNC_I2C; } -static struct i2c_algorithm dib7090_tuner_xfer_algo = { +static const struct i2c_algorithm dib7090_tuner_xfer_algo = { .master_xfer = dib7090_tuner_xfer, .functionality = dib7000p_i2c_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/frontends/dib9000.c linux-2.6.39-pax/drivers/media/dvb/frontends/dib9000.c --- linux-2.6.39/drivers/media/dvb/frontends/dib9000.c 2011-05-19 10:21:38.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/dvb/frontends/dib9000.c 2011-05-19 14:23:29.000000000 +0200 @@ -1649,12 +1649,12 @@ static u32 dib9000_i2c_func(struct i2c_a return I2C_FUNC_I2C; } -static struct i2c_algorithm dib9000_tuner_algo = { +static const struct i2c_algorithm dib9000_tuner_algo = { .master_xfer = dib9000_tuner_xfer, .functionality = dib9000_i2c_func, }; -static struct i2c_algorithm dib9000_component_bus_algo = { +static const struct i2c_algorithm dib9000_component_bus_algo = { .master_xfer = dib9000_fw_component_bus_xfer, .functionality = dib9000_i2c_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/frontends/dibx000_common.c linux-2.6.39-pax/drivers/media/dvb/frontends/dibx000_common.c --- linux-2.6.39/drivers/media/dvb/frontends/dibx000_common.c 2011-05-19 10:21:38.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/dvb/frontends/dibx000_common.c 2011-05-19 14:23:29.000000000 +0200 @@ -212,12 +212,12 @@ static int dibx000_i2c_master_xfer_gpio3 return num; } -static struct i2c_algorithm dibx000_i2c_master_gpio12_xfer_algo = { +static const struct i2c_algorithm dibx000_i2c_master_gpio12_xfer_algo = { .master_xfer = dibx000_i2c_master_xfer_gpio12, .functionality = dibx000_i2c_func, }; -static struct i2c_algorithm dibx000_i2c_master_gpio34_xfer_algo = { +static const struct i2c_algorithm dibx000_i2c_master_gpio34_xfer_algo = { .master_xfer = dibx000_i2c_master_xfer_gpio34, .functionality = dibx000_i2c_func, }; @@ -270,7 +270,7 @@ static int dibx000_i2c_gated_gpio67_xfer return i2c_transfer(mst->i2c_adap, m, 2 + num) == 2 + num ? num : -EIO; } -static struct i2c_algorithm dibx000_i2c_gated_gpio67_algo = { +static const struct i2c_algorithm dibx000_i2c_gated_gpio67_algo = { .master_xfer = dibx000_i2c_gated_gpio67_xfer, .functionality = dibx000_i2c_func, }; @@ -301,7 +301,7 @@ static int dibx000_i2c_gated_tuner_xfer( return i2c_transfer(mst->i2c_adap, m, 2 + num) == 2 + num ? num : -EIO; } -static struct i2c_algorithm dibx000_i2c_gated_tuner_algo = { +static const struct i2c_algorithm dibx000_i2c_gated_tuner_algo = { .master_xfer = dibx000_i2c_gated_tuner_xfer, .functionality = dibx000_i2c_func, }; @@ -354,7 +354,7 @@ void dibx000_reset_i2c_master(struct dib EXPORT_SYMBOL(dibx000_reset_i2c_master); static int i2c_adapter_init(struct i2c_adapter *i2c_adap, - struct i2c_algorithm *algo, const char *name, + const struct i2c_algorithm *algo, const char *name, struct dibx000_i2c_master *mst) { strncpy(i2c_adap->name, name, sizeof(i2c_adap->name)); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/frontends/mb86a16.c linux-2.6.39-pax/drivers/media/dvb/frontends/mb86a16.c --- linux-2.6.39/drivers/media/dvb/frontends/mb86a16.c 2011-05-19 10:21:38.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/dvb/frontends/mb86a16.c 2011-05-19 13:45:30.000000000 +0200 @@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16 int ret = -1; int sync; + pax_track_stack(); + dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate); fcp = 3000; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/frontends/or51211.c linux-2.6.39-pax/drivers/media/dvb/frontends/or51211.c --- linux-2.6.39/drivers/media/dvb/frontends/or51211.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/dvb/frontends/or51211.c 2011-05-19 13:45:30.000000000 +0200 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct u8 tudata[585]; int i; + pax_track_stack(); + dprintk("Firmware is %zd bytes\n",fw->size); /* Get eprom data */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/frontends/s5h1420.c linux-2.6.39-pax/drivers/media/dvb/frontends/s5h1420.c --- linux-2.6.39/drivers/media/dvb/frontends/s5h1420.c 2011-05-19 10:21:38.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/dvb/frontends/s5h1420.c 2011-05-19 14:23:29.000000000 +0200 @@ -870,7 +870,7 @@ static int s5h1420_tuner_i2c_tuner_xfer( return i2c_transfer(state->i2c, m, 1+num) == 1 + num ? num : -EIO; } -static struct i2c_algorithm s5h1420_tuner_i2c_algo = { +static const struct i2c_algorithm s5h1420_tuner_i2c_algo = { .master_xfer = s5h1420_tuner_i2c_tuner_xfer, .functionality = s5h1420_tuner_i2c_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/mantis/mantis_i2c.c linux-2.6.39-pax/drivers/media/dvb/mantis/mantis_i2c.c --- linux-2.6.39/drivers/media/dvb/mantis/mantis_i2c.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/dvb/mantis/mantis_i2c.c 2011-05-19 14:23:29.000000000 +0200 @@ -212,7 +212,7 @@ static u32 mantis_i2c_func(struct i2c_ad return I2C_FUNC_SMBUS_EMUL; } -static struct i2c_algorithm mantis_algo = { +static const struct i2c_algorithm mantis_algo = { .master_xfer = mantis_i2c_xfer, .functionality = mantis_i2c_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/dvb/ttusb-dec/ttusb_dec.c linux-2.6.39-pax/drivers/media/dvb/ttusb-dec/ttusb_dec.c --- linux-2.6.39/drivers/media/dvb/ttusb-dec/ttusb_dec.c 2011-05-19 10:21:39.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/dvb/ttusb-dec/ttusb_dec.c 2011-05-19 14:23:29.000000000 +0200 @@ -1614,7 +1614,7 @@ static int fe_send_command(struct dvb_fr return ttusb_dec_send_command(dec, command, param_length, params, result_length, cmd_result); } -static struct ttusbdecfe_config fe_config = { +static const struct ttusbdecfe_config fe_config = { .send_command = fe_send_command }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/radio/radio-cadet.c linux-2.6.39-pax/drivers/media/radio/radio-cadet.c --- linux-2.6.39/drivers/media/radio/radio-cadet.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/radio/radio-cadet.c 2011-05-19 13:45:30.000000000 +0200 @@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *f 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/radio/radio-si4713.c linux-2.6.39-pax/drivers/media/radio/radio-si4713.c --- linux-2.6.39/drivers/media/radio/radio-si4713.c 2011-05-19 10:21:39.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/radio/radio-si4713.c 2011-05-19 14:23:29.000000000 +0200 @@ -231,7 +231,7 @@ static long radio_si4713_default(struct ioctl, cmd, arg); } -static struct v4l2_ioctl_ops radio_si4713_ioctl_ops = { +static const struct v4l2_ioctl_ops radio_si4713_ioctl_ops = { .vidioc_enumaudout = radio_si4713_enumaudout, .vidioc_g_audout = radio_si4713_g_audout, .vidioc_s_audout = radio_si4713_s_audout, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/rc/ir-lirc-codec.c linux-2.6.39-pax/drivers/media/rc/ir-lirc-codec.c --- linux-2.6.39/drivers/media/rc/ir-lirc-codec.c 2011-03-15 19:33:40.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/rc/ir-lirc-codec.c 2011-05-19 14:23:29.000000000 +0200 @@ -277,7 +277,7 @@ static void ir_lirc_close(void *data) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/rc/lirc_dev.c linux-2.6.39-pax/drivers/media/rc/lirc_dev.c --- linux-2.6.39/drivers/media/rc/lirc_dev.c 2011-03-15 19:33:40.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/rc/lirc_dev.c 2011-05-19 14:23:29.000000000 +0200 @@ -151,7 +151,7 @@ static int lirc_thread(void *irctl) } -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/rc/rc-main.c linux-2.6.39-pax/drivers/media/rc/rc-main.c --- linux-2.6.39/drivers/media/rc/rc-main.c 2011-05-19 10:21:40.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/rc/rc-main.c 2011-05-19 13:45:31.000000000 +0200 @@ -996,7 +996,7 @@ EXPORT_SYMBOL_GPL(rc_free_device); int rc_register_device(struct rc_dev *dev) { - static atomic_t devno = ATOMIC_INIT(0); + static atomic_unchecked_t devno = ATOMIC_INIT(0); struct rc_map *rc_map; const char *path; int rc; @@ -1019,7 +1019,7 @@ int rc_register_device(struct rc_dev *de if (dev->close) dev->input_dev->close = ir_close; - dev->devno = (unsigned long)(atomic_inc_return(&devno) - 1); + dev->devno = (unsigned long)(atomic_inc_return_unchecked(&devno) - 1); dev_set_name(&dev->dev, "rc%ld", dev->devno); dev_set_drvdata(&dev->dev, dev); rc = device_add(&dev->dev); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/au0828/au0828.h linux-2.6.39-pax/drivers/media/video/au0828/au0828.h --- linux-2.6.39/drivers/media/video/au0828/au0828.h 2011-03-15 19:33:40.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/au0828/au0828.h 2011-05-19 14:23:29.000000000 +0200 @@ -191,7 +191,7 @@ struct au0828_dev { /* I2C */ struct i2c_adapter i2c_adap; - struct i2c_algorithm i2c_algo; + struct i2c_algorithm i2c_algo; struct i2c_client i2c_client; u32 i2c_rc; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/cafe_ccic.c linux-2.6.39-pax/drivers/media/video/cafe_ccic.c --- linux-2.6.39/drivers/media/video/cafe_ccic.c 2011-05-19 10:21:40.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/cafe_ccic.c 2011-05-19 14:23:29.000000000 +0200 @@ -520,7 +520,7 @@ static u32 cafe_smbus_func(struct i2c_ad I2C_FUNC_SMBUS_WRITE_BYTE_DATA; } -static struct i2c_algorithm cafe_smbus_algo = { +static const struct i2c_algorithm cafe_smbus_algo = { .smbus_xfer = cafe_smbus_xfer, .functionality = cafe_smbus_func }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/cx18/cx18-alsa-pcm.c linux-2.6.39-pax/drivers/media/video/cx18/cx18-alsa-pcm.c --- linux-2.6.39/drivers/media/video/cx18/cx18-alsa-pcm.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/cx18/cx18-alsa-pcm.c 2011-05-19 14:23:29.000000000 +0200 @@ -314,7 +314,7 @@ static struct page *snd_pcm_get_vmalloc_ return vmalloc_to_page(pageptr); } -static struct snd_pcm_ops snd_cx18_pcm_capture_ops = { +static const struct snd_pcm_ops snd_cx18_pcm_capture_ops = { .open = snd_cx18_pcm_capture_open, .close = snd_cx18_pcm_capture_close, .ioctl = snd_cx18_pcm_ioctl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/cx18/cx18-driver.c linux-2.6.39-pax/drivers/media/video/cx18/cx18-driver.c --- linux-2.6.39/drivers/media/video/cx18/cx18-driver.c 2011-05-19 10:21:40.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/cx18/cx18-driver.c 2011-05-19 13:45:31.000000000 +0200 @@ -61,7 +61,7 @@ static struct pci_device_id cx18_pci_tbl MODULE_DEVICE_TABLE(pci, cx18_pci_tbl); -static atomic_t cx18_instance = ATOMIC_INIT(0); +static atomic_unchecked_t cx18_instance = ATOMIC_INIT(0); /* Parameter declarations */ static int cardtype[CX18_MAX_CARDS]; @@ -327,6 +327,8 @@ void cx18_read_eeprom(struct cx18 *cx, s struct i2c_client c; u8 eedata[256]; + pax_track_stack(); + memset(&c, 0, sizeof(c)); strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name)); c.adapter = &cx->i2c_adap[0]; @@ -892,7 +894,7 @@ static int __devinit cx18_probe(struct p struct cx18 *cx; /* FIXME - module parameter arrays constrain max instances */ - i = atomic_inc_return(&cx18_instance) - 1; + i = atomic_inc_return_unchecked(&cx18_instance) - 1; if (i >= CX18_MAX_CARDS) { printk(KERN_ERR "cx18: cannot manage card %d, driver has a " "limit of 0 - %d\n", i, CX18_MAX_CARDS - 1); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/cx231xx/cx231xx-audio.c linux-2.6.39-pax/drivers/media/video/cx231xx/cx231xx-audio.c --- linux-2.6.39/drivers/media/video/cx231xx/cx231xx-audio.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/cx231xx/cx231xx-audio.c 2011-05-19 14:23:29.000000000 +0200 @@ -613,7 +613,7 @@ static struct page *snd_pcm_get_vmalloc_ return vmalloc_to_page(pageptr); } -static struct snd_pcm_ops snd_cx231xx_pcm_capture = { +static const struct snd_pcm_ops snd_cx231xx_pcm_capture = { .open = snd_cx231xx_capture_open, .close = snd_cx231xx_pcm_close, .ioctl = snd_pcm_lib_ioctl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/cx231xx/cx231xx-i2c.c linux-2.6.39-pax/drivers/media/video/cx231xx/cx231xx-i2c.c --- linux-2.6.39/drivers/media/video/cx231xx/cx231xx-i2c.c 2011-05-19 10:21:40.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/cx231xx/cx231xx-i2c.c 2011-05-19 14:23:29.000000000 +0200 @@ -435,7 +435,7 @@ static u32 functionality(struct i2c_adap return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C; } -static struct i2c_algorithm cx231xx_algo = { +static const struct i2c_algorithm cx231xx_algo = { .master_xfer = cx231xx_i2c_xfer, .functionality = functionality, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/cx23885/cx23885-input.c linux-2.6.39-pax/drivers/media/video/cx23885/cx23885-input.c --- linux-2.6.39/drivers/media/video/cx23885/cx23885-input.c 2011-05-19 10:21:40.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/cx23885/cx23885-input.c 2011-05-19 13:45:31.000000000 +0200 @@ -53,6 +53,8 @@ static void cx23885_input_process_measur bool handle = false; struct ir_raw_event ir_core_event[64]; + pax_track_stack(); + do { num = 0; v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/cx88/cx88-alsa.c linux-2.6.39-pax/drivers/media/video/cx88/cx88-alsa.c --- linux-2.6.39/drivers/media/video/cx88/cx88-alsa.c 2011-05-19 10:21:40.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/cx88/cx88-alsa.c 2011-05-19 14:23:29.000000000 +0200 @@ -519,7 +519,7 @@ static struct page *snd_cx88_page(struct /* * operators */ -static struct snd_pcm_ops snd_cx88_pcm_ops = { +static const struct snd_pcm_ops snd_cx88_pcm_ops = { .open = snd_cx88_pcm_open, .close = snd_cx88_close, .ioctl = snd_pcm_lib_ioctl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/davinci/ccdc_hw_device.h linux-2.6.39-pax/drivers/media/video/davinci/ccdc_hw_device.h --- linux-2.6.39/drivers/media/video/davinci/ccdc_hw_device.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/davinci/ccdc_hw_device.h 2011-05-19 14:23:29.000000000 +0200 @@ -99,7 +99,7 @@ struct ccdc_hw_device { /* module owner */ struct module *owner; /* hw ops */ - struct ccdc_hw_ops hw_ops; + const struct ccdc_hw_ops hw_ops; }; /* Used by CCDC module to register & unregister with vpfe capture driver */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/davinci/vpss.c linux-2.6.39-pax/drivers/media/video/davinci/vpss.c --- linux-2.6.39/drivers/media/video/davinci/vpss.c 2011-03-15 19:33:42.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/davinci/vpss.c 2011-05-19 14:23:29.000000000 +0200 @@ -103,7 +103,7 @@ struct vpss_oper_config { __iomem void *vpss_regs_base1; enum vpss_platform_type platform; spinlock_t vpss_lock; - struct vpss_hw_ops hw_ops; + const struct vpss_hw_ops hw_ops; }; static struct vpss_oper_config oper_cfg; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/em28xx/em28xx-audio.c linux-2.6.39-pax/drivers/media/video/em28xx/em28xx-audio.c --- linux-2.6.39/drivers/media/video/em28xx/em28xx-audio.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/em28xx/em28xx-audio.c 2011-05-19 14:23:30.000000000 +0200 @@ -432,7 +432,7 @@ static struct page *snd_pcm_get_vmalloc_ return vmalloc_to_page(pageptr); } -static struct snd_pcm_ops snd_em28xx_pcm_capture = { +static const struct snd_pcm_ops snd_em28xx_pcm_capture = { .open = snd_em28xx_capture_open, .close = snd_em28xx_pcm_close, .ioctl = snd_pcm_lib_ioctl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/em28xx/em28xx-i2c.c linux-2.6.39-pax/drivers/media/video/em28xx/em28xx-i2c.c --- linux-2.6.39/drivers/media/video/em28xx/em28xx-i2c.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/em28xx/em28xx-i2c.c 2011-05-19 14:23:30.000000000 +0200 @@ -451,7 +451,7 @@ static u32 functionality(struct i2c_adap return I2C_FUNC_SMBUS_EMUL; } -static struct i2c_algorithm em28xx_algo = { +static const struct i2c_algorithm em28xx_algo = { .master_xfer = em28xx_i2c_xfer, .functionality = functionality, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/hdpvr/hdpvr-i2c.c linux-2.6.39-pax/drivers/media/video/hdpvr/hdpvr-i2c.c --- linux-2.6.39/drivers/media/video/hdpvr/hdpvr-i2c.c 2011-05-19 10:21:41.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/hdpvr/hdpvr-i2c.c 2011-05-19 14:23:30.000000000 +0200 @@ -179,7 +179,7 @@ static u32 hdpvr_functionality(struct i2 return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } -static struct i2c_algorithm hdpvr_algo = { +static const struct i2c_algorithm hdpvr_algo = { .master_xfer = hdpvr_transfer, .functionality = hdpvr_functionality, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/imx074.c linux-2.6.39-pax/drivers/media/video/imx074.c --- linux-2.6.39/drivers/media/video/imx074.c 2011-05-19 10:21:41.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/imx074.c 2011-05-19 14:23:30.000000000 +0200 @@ -267,7 +267,7 @@ static int imx074_g_chip_ident(struct v4 return 0; } -static struct v4l2_subdev_video_ops imx074_subdev_video_ops = { +static const struct v4l2_subdev_video_ops imx074_subdev_video_ops = { .s_stream = imx074_s_stream, .s_mbus_fmt = imx074_s_fmt, .g_mbus_fmt = imx074_g_fmt, @@ -277,7 +277,7 @@ static struct v4l2_subdev_video_ops imx0 .cropcap = imx074_cropcap, }; -static struct v4l2_subdev_core_ops imx074_subdev_core_ops = { +static const struct v4l2_subdev_core_ops imx074_subdev_core_ops = { .g_chip_ident = imx074_g_chip_ident, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.39-pax/drivers/media/video/ivtv/ivtv-driver.c --- linux-2.6.39/drivers/media/video/ivtv/ivtv-driver.c 2011-03-15 19:33:44.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/ivtv/ivtv-driver.c 2011-05-19 13:45:31.000000000 +0200 @@ -80,7 +80,7 @@ static struct pci_device_id ivtv_pci_tbl MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl); /* ivtv instance counter */ -static atomic_t ivtv_instance = ATOMIC_INIT(0); +static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0); /* Parameter declarations */ static int cardtype[IVTV_MAX_CARDS]; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/mt9m001.c linux-2.6.39-pax/drivers/media/video/mt9m001.c --- linux-2.6.39/drivers/media/video/mt9m001.c 2011-05-19 10:21:41.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/mt9m001.c 2011-05-19 14:23:30.000000000 +0200 @@ -691,7 +691,7 @@ static int mt9m001_g_skip_top_lines(stru return 0; } -static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = { +static const struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = { .g_ctrl = mt9m001_g_ctrl, .s_ctrl = mt9m001_s_ctrl, .g_chip_ident = mt9m001_g_chip_ident, @@ -714,7 +714,7 @@ static int mt9m001_enum_fmt(struct v4l2_ return 0; } -static struct v4l2_subdev_video_ops mt9m001_subdev_video_ops = { +static const struct v4l2_subdev_video_ops mt9m001_subdev_video_ops = { .s_stream = mt9m001_s_stream, .s_mbus_fmt = mt9m001_s_fmt, .g_mbus_fmt = mt9m001_g_fmt, @@ -725,7 +725,7 @@ static struct v4l2_subdev_video_ops mt9m .enum_mbus_fmt = mt9m001_enum_fmt, }; -static struct v4l2_subdev_sensor_ops mt9m001_subdev_sensor_ops = { +static const struct v4l2_subdev_sensor_ops mt9m001_subdev_sensor_ops = { .g_skip_top_lines = mt9m001_g_skip_top_lines, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/mt9t031.c linux-2.6.39-pax/drivers/media/video/mt9t031.c --- linux-2.6.39/drivers/media/video/mt9t031.c 2011-03-15 19:33:45.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/mt9t031.c 2011-05-19 14:23:30.000000000 +0200 @@ -725,7 +725,7 @@ static int mt9t031_runtime_resume(struct return 0; } -static struct dev_pm_ops mt9t031_dev_pm_ops = { +static const struct dev_pm_ops mt9t031_dev_pm_ops = { .runtime_suspend = mt9t031_runtime_suspend, .runtime_resume = mt9t031_runtime_resume, }; @@ -788,7 +788,7 @@ static int mt9t031_g_skip_top_lines(stru return 0; } -static struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = { +static const struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = { .g_ctrl = mt9t031_g_ctrl, .s_ctrl = mt9t031_s_ctrl, .g_chip_ident = mt9t031_g_chip_ident, @@ -808,7 +808,7 @@ static int mt9t031_enum_fmt(struct v4l2_ return 0; } -static struct v4l2_subdev_video_ops mt9t031_subdev_video_ops = { +static const struct v4l2_subdev_video_ops mt9t031_subdev_video_ops = { .s_stream = mt9t031_s_stream, .s_mbus_fmt = mt9t031_s_fmt, .g_mbus_fmt = mt9t031_g_fmt, @@ -819,7 +819,7 @@ static struct v4l2_subdev_video_ops mt9t .enum_mbus_fmt = mt9t031_enum_fmt, }; -static struct v4l2_subdev_sensor_ops mt9t031_subdev_sensor_ops = { +static const struct v4l2_subdev_sensor_ops mt9t031_subdev_sensor_ops = { .g_skip_top_lines = mt9t031_g_skip_top_lines, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/mt9v022.c linux-2.6.39-pax/drivers/media/video/mt9v022.c --- linux-2.6.39/drivers/media/video/mt9v022.c 2011-05-19 10:21:41.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/mt9v022.c 2011-05-19 14:23:30.000000000 +0200 @@ -825,7 +825,7 @@ static int mt9v022_g_skip_top_lines(stru return 0; } -static struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = { +static const struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = { .g_ctrl = mt9v022_g_ctrl, .s_ctrl = mt9v022_s_ctrl, .g_chip_ident = mt9v022_g_chip_ident, @@ -848,7 +848,7 @@ static int mt9v022_enum_fmt(struct v4l2_ return 0; } -static struct v4l2_subdev_video_ops mt9v022_subdev_video_ops = { +static const struct v4l2_subdev_video_ops mt9v022_subdev_video_ops = { .s_stream = mt9v022_s_stream, .s_mbus_fmt = mt9v022_s_fmt, .g_mbus_fmt = mt9v022_g_fmt, @@ -859,7 +859,7 @@ static struct v4l2_subdev_video_ops mt9v .enum_mbus_fmt = mt9v022_enum_fmt, }; -static struct v4l2_subdev_sensor_ops mt9v022_subdev_sensor_ops = { +static const struct v4l2_subdev_sensor_ops mt9v022_subdev_sensor_ops = { .g_skip_top_lines = mt9v022_g_skip_top_lines, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/mx2_camera.c linux-2.6.39-pax/drivers/media/video/mx2_camera.c --- linux-2.6.39/drivers/media/video/mx2_camera.c 2011-03-15 19:33:45.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/mx2_camera.c 2011-05-19 14:23:30.000000000 +0200 @@ -668,7 +668,7 @@ static void mx2_videobuf_release(struct free_buffer(vq, buf); } -static struct videobuf_queue_ops mx2_videobuf_ops = { +static const struct videobuf_queue_ops mx2_videobuf_ops = { .buf_setup = mx2_videobuf_setup, .buf_prepare = mx2_videobuf_prepare, .buf_queue = mx2_videobuf_queue, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/omap24xxcam.c linux-2.6.39-pax/drivers/media/video/omap24xxcam.c --- linux-2.6.39/drivers/media/video/omap24xxcam.c 2011-05-19 10:21:41.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/omap24xxcam.c 2011-05-19 13:45:31.000000000 +0200 @@ -403,7 +403,7 @@ static void omap24xxcam_vbq_complete(str spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags); do_gettimeofday(&vb->ts); - vb->field_count = atomic_add_return(2, &fh->field_count); + vb->field_count = atomic_add_return_unchecked(2, &fh->field_count); if (csr & csr_error) { vb->state = VIDEOBUF_ERROR; if (!atomic_read(&fh->cam->in_reset)) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/omap24xxcam.h linux-2.6.39-pax/drivers/media/video/omap24xxcam.h --- linux-2.6.39/drivers/media/video/omap24xxcam.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/omap24xxcam.h 2011-05-19 13:45:31.000000000 +0200 @@ -533,7 +533,7 @@ struct omap24xxcam_fh { spinlock_t vbq_lock; /* spinlock for the videobuf queue */ struct videobuf_queue vbq; struct v4l2_pix_format pix; /* serialise pix by vbq->lock */ - atomic_t field_count; /* field counter for videobuf_buffer */ + atomic_unchecked_t field_count; /* field counter for videobuf_buffer */ /* accessing cam here doesn't need serialisation: it's constant */ struct omap24xxcam_device *cam; }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/omap3isp/isp.h linux-2.6.39-pax/drivers/media/video/omap3isp/isp.h --- linux-2.6.39/drivers/media/video/omap3isp/isp.h 2011-05-19 10:21:41.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/omap3isp/isp.h 2011-05-19 14:23:30.000000000 +0200 @@ -290,7 +290,7 @@ struct isp_device { struct iommu *iommu; - struct isp_platform_callback platform_cb; + const struct isp_platform_callback platform_cb; }; #define v4l2_dev_to_isp_device(dev) \ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/ov2640.c linux-2.6.39-pax/drivers/media/video/ov2640.c --- linux-2.6.39/drivers/media/video/ov2640.c 2011-03-15 19:33:45.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/ov2640.c 2011-05-19 14:23:30.000000000 +0200 @@ -1080,7 +1080,7 @@ static struct soc_camera_ops ov2640_ops .num_controls = ARRAY_SIZE(ov2640_controls), }; -static struct v4l2_subdev_core_ops ov2640_subdev_core_ops = { +static const struct v4l2_subdev_core_ops ov2640_subdev_core_ops = { .g_ctrl = ov2640_g_ctrl, .s_ctrl = ov2640_s_ctrl, .g_chip_ident = ov2640_g_chip_ident, @@ -1090,7 +1090,7 @@ static struct v4l2_subdev_core_ops ov264 #endif }; -static struct v4l2_subdev_video_ops ov2640_subdev_video_ops = { +static const struct v4l2_subdev_video_ops ov2640_subdev_video_ops = { .s_stream = ov2640_s_stream, .g_mbus_fmt = ov2640_g_fmt, .s_mbus_fmt = ov2640_s_fmt, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/ov772x.c linux-2.6.39-pax/drivers/media/video/ov772x.c --- linux-2.6.39/drivers/media/video/ov772x.c 2011-03-15 19:33:45.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/ov772x.c 2011-05-19 14:23:30.000000000 +0200 @@ -1079,7 +1079,7 @@ static struct soc_camera_ops ov772x_ops .num_controls = ARRAY_SIZE(ov772x_controls), }; -static struct v4l2_subdev_core_ops ov772x_subdev_core_ops = { +static const struct v4l2_subdev_core_ops ov772x_subdev_core_ops = { .g_ctrl = ov772x_g_ctrl, .s_ctrl = ov772x_s_ctrl, .g_chip_ident = ov772x_g_chip_ident, @@ -1099,7 +1099,7 @@ static int ov772x_enum_fmt(struct v4l2_s return 0; } -static struct v4l2_subdev_video_ops ov772x_subdev_video_ops = { +static const struct v4l2_subdev_video_ops ov772x_subdev_video_ops = { .s_stream = ov772x_s_stream, .g_mbus_fmt = ov772x_g_fmt, .s_mbus_fmt = ov772x_s_fmt, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6.39-pax/drivers/media/video/pvrusb2/pvrusb2-eeprom.c --- linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-05-19 10:21:41.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-05-19 13:45:31.000000000 +0200 @@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw u8 *eeprom; struct tveeprom tvdata; + pax_track_stack(); + memset(&tvdata,0,sizeof(tvdata)); eeprom = pvr2_eeprom_fetch(hdw); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c linux-2.6.39-pax/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c --- linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2011-05-19 10:21:41.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2011-05-19 14:23:30.000000000 +0200 @@ -527,7 +527,7 @@ static u32 pvr2_i2c_functionality(struct return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C; } -static struct i2c_algorithm pvr2_i2c_algo_template = { +static const struct i2c_algorithm pvr2_i2c_algo_template = { .master_xfer = pvr2_i2c_xfer, .functionality = pvr2_i2c_functionality, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/rj54n1cb0c.c linux-2.6.39-pax/drivers/media/video/rj54n1cb0c.c --- linux-2.6.39/drivers/media/video/rj54n1cb0c.c 2011-03-15 19:33:46.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/rj54n1cb0c.c 2011-05-19 14:23:30.000000000 +0200 @@ -1327,7 +1327,7 @@ static int rj54n1_s_ctrl(struct v4l2_sub return 0; } -static struct v4l2_subdev_core_ops rj54n1_subdev_core_ops = { +static const struct v4l2_subdev_core_ops rj54n1_subdev_core_ops = { .g_ctrl = rj54n1_g_ctrl, .s_ctrl = rj54n1_s_ctrl, .g_chip_ident = rj54n1_g_chip_ident, @@ -1337,7 +1337,7 @@ static struct v4l2_subdev_core_ops rj54n #endif }; -static struct v4l2_subdev_video_ops rj54n1_subdev_video_ops = { +static const struct v4l2_subdev_video_ops rj54n1_subdev_video_ops = { .s_stream = rj54n1_s_stream, .s_mbus_fmt = rj54n1_s_fmt, .g_mbus_fmt = rj54n1_g_fmt, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/s5p-fimc/fimc-capture.c linux-2.6.39-pax/drivers/media/video/s5p-fimc/fimc-capture.c --- linux-2.6.39/drivers/media/video/s5p-fimc/fimc-capture.c 2011-05-19 10:21:42.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/s5p-fimc/fimc-capture.c 2011-05-19 14:23:30.000000000 +0200 @@ -376,7 +376,7 @@ static void fimc_unlock(struct vb2_queue mutex_unlock(&ctx->fimc_dev->lock); } -static struct vb2_ops fimc_capture_qops = { +static const struct vb2_ops fimc_capture_qops = { .queue_setup = queue_setup, .buf_prepare = buffer_prepare, .buf_queue = buffer_queue, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/s5p-fimc/fimc-core.c linux-2.6.39-pax/drivers/media/video/s5p-fimc/fimc-core.c --- linux-2.6.39/drivers/media/video/s5p-fimc/fimc-core.c 2011-05-19 10:21:42.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/s5p-fimc/fimc-core.c 2011-05-19 14:23:30.000000000 +0200 @@ -768,7 +768,7 @@ static void fimc_unlock(struct vb2_queue mutex_unlock(&ctx->fimc_dev->lock); } -static struct vb2_ops fimc_qops = { +static const struct vb2_ops fimc_qops = { .queue_setup = fimc_queue_setup, .buf_prepare = fimc_buf_prepare, .buf_queue = fimc_buf_queue, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/saa7134/saa6752hs.c linux-2.6.39-pax/drivers/media/video/saa7134/saa6752hs.c --- linux-2.6.39/drivers/media/video/saa7134/saa6752hs.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/saa7134/saa6752hs.c 2011-05-19 13:45:31.000000000 +0200 @@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su unsigned char localPAT[256]; unsigned char localPMT[256]; + pax_track_stack(); + /* Set video format - must be done first as it resets other settings */ set_reg8(client, 0x41, h->video_format); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/saa7134/saa7134-alsa.c linux-2.6.39-pax/drivers/media/video/saa7134/saa7134-alsa.c --- linux-2.6.39/drivers/media/video/saa7134/saa7134-alsa.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/saa7134/saa7134-alsa.c 2011-05-19 14:23:30.000000000 +0200 @@ -808,7 +808,7 @@ static struct page *snd_card_saa7134_pag * ALSA capture callbacks definition */ -static struct snd_pcm_ops snd_card_saa7134_capture_ops = { +static const struct snd_pcm_ops snd_card_saa7134_capture_ops = { .open = snd_card_saa7134_capture_open, .close = snd_card_saa7134_capture_close, .ioctl = snd_pcm_lib_ioctl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.39-pax/drivers/media/video/saa7164/saa7164-cmd.c --- linux-2.6.39/drivers/media/video/saa7164/saa7164-cmd.c 2011-05-19 10:21:42.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/saa7164/saa7164-cmd.c 2011-05-19 13:45:31.000000000 +0200 @@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d u8 tmp[512]; dprintk(DBGLVL_CMD, "%s()\n", __func__); + pax_track_stack(); + /* While any outstand message on the bus exists... */ do { @@ -141,6 +143,8 @@ int saa7164_cmd_dequeue(struct saa7164_d u8 tmp[512]; dprintk(DBGLVL_CMD, "%s()\n", __func__); + pax_track_stack(); + while (loop) { struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/sh_mobile_csi2.c linux-2.6.39-pax/drivers/media/video/sh_mobile_csi2.c --- linux-2.6.39/drivers/media/video/sh_mobile_csi2.c 2011-05-19 10:21:43.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/sh_mobile_csi2.c 2011-05-19 14:23:30.000000000 +0200 @@ -127,12 +127,12 @@ static int sh_csi2_s_fmt(struct v4l2_sub return 0; } -static struct v4l2_subdev_video_ops sh_csi2_subdev_video_ops = { +static const struct v4l2_subdev_video_ops sh_csi2_subdev_video_ops = { .s_mbus_fmt = sh_csi2_s_fmt, .try_mbus_fmt = sh_csi2_try_fmt, }; -static struct v4l2_subdev_core_ops sh_csi2_subdev_core_ops; +static const struct v4l2_subdev_core_ops sh_csi2_subdev_core_ops; static struct v4l2_subdev_ops sh_csi2_subdev_ops = { .core = &sh_csi2_subdev_core_ops, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/soc_camera_platform.c linux-2.6.39-pax/drivers/media/video/soc_camera_platform.c --- linux-2.6.39/drivers/media/video/soc_camera_platform.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/soc_camera_platform.c 2011-05-19 14:23:30.000000000 +0200 @@ -70,7 +70,7 @@ static int soc_camera_platform_fill_fmt( return 0; } -static struct v4l2_subdev_core_ops platform_subdev_core_ops; +static const struct v4l2_subdev_core_ops platform_subdev_core_ops; static int soc_camera_platform_enum_fmt(struct v4l2_subdev *sd, unsigned int index, enum v4l2_mbus_pixelcode *code) @@ -115,7 +115,7 @@ static int soc_camera_platform_cropcap(s return 0; } -static struct v4l2_subdev_video_ops platform_subdev_video_ops = { +static const struct v4l2_subdev_video_ops platform_subdev_video_ops = { .s_stream = soc_camera_platform_s_stream, .enum_mbus_fmt = soc_camera_platform_enum_fmt, .cropcap = soc_camera_platform_cropcap, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/tlg2300/pd-alsa.c linux-2.6.39-pax/drivers/media/video/tlg2300/pd-alsa.c --- linux-2.6.39/drivers/media/video/tlg2300/pd-alsa.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/tlg2300/pd-alsa.c 2011-05-19 14:23:30.000000000 +0200 @@ -265,7 +265,7 @@ static struct page *snd_pcm_pd_get_page( return vmalloc_to_page(pageptr); } -static struct snd_pcm_ops pcm_capture_ops = { +static const struct snd_pcm_ops pcm_capture_ops = { .open = snd_pd_capture_open, .close = snd_pd_pcm_close, .ioctl = snd_pcm_lib_ioctl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/tw9910.c linux-2.6.39-pax/drivers/media/video/tw9910.c --- linux-2.6.39/drivers/media/video/tw9910.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/tw9910.c 2011-05-19 14:23:30.000000000 +0200 @@ -894,7 +894,7 @@ static struct soc_camera_ops tw9910_ops .enum_input = tw9910_enum_input, }; -static struct v4l2_subdev_core_ops tw9910_subdev_core_ops = { +static const struct v4l2_subdev_core_ops tw9910_subdev_core_ops = { .g_chip_ident = tw9910_g_chip_ident, .s_std = tw9910_s_std, #ifdef CONFIG_VIDEO_ADV_DEBUG @@ -913,7 +913,7 @@ static int tw9910_enum_fmt(struct v4l2_s return 0; } -static struct v4l2_subdev_video_ops tw9910_subdev_video_ops = { +static const struct v4l2_subdev_video_ops tw9910_subdev_video_ops = { .s_stream = tw9910_s_stream, .g_mbus_fmt = tw9910_g_fmt, .s_mbus_fmt = tw9910_s_fmt, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/usbvision/usbvision-core.c linux-2.6.39-pax/drivers/media/video/usbvision/usbvision-core.c --- linux-2.6.39/drivers/media/video/usbvision/usbvision-core.c 2011-03-15 19:33:48.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/usbvision/usbvision-core.c 2011-05-19 13:45:31.000000000 +0200 @@ -799,6 +799,8 @@ static enum parse_state usbvision_parse_ unsigned char rv, gv, bv; static unsigned char *Y, *U, *V; + pax_track_stack(); + frame = usbvision->cur_frame; image_size = frame->frmwidth * frame->frmheight; if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) || diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/usbvision/usbvision-i2c.c linux-2.6.39-pax/drivers/media/video/usbvision/usbvision-i2c.c --- linux-2.6.39/drivers/media/video/usbvision/usbvision-i2c.c 2011-03-15 19:33:48.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/usbvision/usbvision-i2c.c 2011-05-19 14:23:30.000000000 +0200 @@ -189,7 +189,7 @@ static u32 functionality(struct i2c_adap /* -----exported algorithm data: ------------------------------------- */ -static struct i2c_algorithm usbvision_algo = { +static const struct i2c_algorithm usbvision_algo = { .master_xfer = usbvision_i2c_xfer, .smbus_xfer = NULL, .functionality = functionality, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/v4l2-device.c linux-2.6.39-pax/drivers/media/video/v4l2-device.c --- linux-2.6.39/drivers/media/video/v4l2-device.c 2011-05-19 10:21:43.000000000 +0200 +++ linux-2.6.39-pax/drivers/media/video/v4l2-device.c 2011-05-19 13:45:31.000000000 +0200 @@ -71,9 +71,9 @@ int v4l2_device_put(struct v4l2_device * EXPORT_SYMBOL_GPL(v4l2_device_put); int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename, - atomic_t *instance) + atomic_unchecked_t *instance) { - int num = atomic_inc_return(instance) - 1; + int num = atomic_inc_return_unchecked(instance) - 1; int len = strlen(basename); if (basename[len - 1] >= '0' && basename[len - 1] <= '9') diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/media/video/videobuf-dma-sg.c linux-2.6.39-pax/drivers/media/video/videobuf-dma-sg.c --- linux-2.6.39/drivers/media/video/videobuf-dma-sg.c 2011-03-15 19:33:48.000000000 +0100 +++ linux-2.6.39-pax/drivers/media/video/videobuf-dma-sg.c 2011-05-19 13:45:31.000000000 +0200 @@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size) { struct videobuf_queue q; + pax_track_stack(); + /* Required to make generic handler to call __videobuf_alloc */ q.int_ops = &sg_ops; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/message/fusion/mptbase.c linux-2.6.39-pax/drivers/message/fusion/mptbase.c --- linux-2.6.39/drivers/message/fusion/mptbase.c 2011-05-19 10:21:43.000000000 +0200 +++ linux-2.6.39-pax/drivers/message/fusion/mptbase.c 2011-05-19 14:23:30.000000000 +0200 @@ -143,7 +143,7 @@ static int MptDriverClass[MPT_MAX_PRO static MPT_EVHANDLER MptEvHandlers[MPT_MAX_PROTOCOL_DRIVERS]; /* Reset handler lookup table */ static MPT_RESETHANDLER MptResetHandlers[MPT_MAX_PROTOCOL_DRIVERS]; -static struct mpt_pci_driver *MptDeviceDriverHandlers[MPT_MAX_PROTOCOL_DRIVERS]; +static const struct mpt_pci_driver *MptDeviceDriverHandlers[MPT_MAX_PROTOCOL_DRIVERS]; #ifdef CONFIG_PROC_FS static struct proc_dir_entry *mpt_proc_root_dir; @@ -772,7 +772,7 @@ mpt_reset_deregister(u8 cb_idx) * @cb_idx: MPT protocol driver index */ int -mpt_device_driver_register(struct mpt_pci_driver * dd_cbfunc, u8 cb_idx) +mpt_device_driver_register(const struct mpt_pci_driver * dd_cbfunc, u8 cb_idx) { MPT_ADAPTER *ioc; const struct pci_device_id *id; @@ -801,7 +801,7 @@ mpt_device_driver_register(struct mpt_pc void mpt_device_driver_deregister(u8 cb_idx) { - struct mpt_pci_driver *dd_cbfunc; + const struct mpt_pci_driver *dd_cbfunc; MPT_ADAPTER *ioc; if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/message/fusion/mptbase.h linux-2.6.39-pax/drivers/message/fusion/mptbase.h --- linux-2.6.39/drivers/message/fusion/mptbase.h 2011-03-15 19:33:49.000000000 +0100 +++ linux-2.6.39-pax/drivers/message/fusion/mptbase.h 2011-05-19 14:23:30.000000000 +0200 @@ -908,7 +908,7 @@ extern int mpt_event_register(u8 cb_idx extern void mpt_event_deregister(u8 cb_idx); extern int mpt_reset_register(u8 cb_idx, MPT_RESETHANDLER reset_func); extern void mpt_reset_deregister(u8 cb_idx); -extern int mpt_device_driver_register(struct mpt_pci_driver * dd_cbfunc, u8 cb_idx); +extern int mpt_device_driver_register(const struct mpt_pci_driver * dd_cbfunc, u8 cb_idx); extern void mpt_device_driver_deregister(u8 cb_idx); extern MPT_FRAME_HDR *mpt_get_msg_frame(u8 cb_idx, MPT_ADAPTER *ioc); extern void mpt_free_msg_frame(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/message/fusion/mptctl.c linux-2.6.39-pax/drivers/message/fusion/mptctl.c --- linux-2.6.39/drivers/message/fusion/mptctl.c 2011-05-19 10:21:43.000000000 +0200 +++ linux-2.6.39-pax/drivers/message/fusion/mptctl.c 2011-05-19 14:23:30.000000000 +0200 @@ -3000,7 +3000,7 @@ mptctl_remove(struct pci_dev *pdev) { } -static struct mpt_pci_driver mptctl_driver = { +static const struct mpt_pci_driver mptctl_driver = { .probe = mptctl_probe, .remove = mptctl_remove, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/message/fusion/mptsas.c linux-2.6.39-pax/drivers/message/fusion/mptsas.c --- linux-2.6.39/drivers/message/fusion/mptsas.c 2011-05-19 10:21:43.000000000 +0200 +++ linux-2.6.39-pax/drivers/message/fusion/mptsas.c 2011-05-19 13:45:31.000000000 +0200 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin 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 @@ mptsas_get_rphy(struct mptsas_phyinfo *p 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/message/fusion/mptscsih.c linux-2.6.39-pax/drivers/message/fusion/mptscsih.c --- linux-2.6.39/drivers/message/fusion/mptscsih.c 2011-03-15 19:33:49.000000000 +0100 +++ linux-2.6.39-pax/drivers/message/fusion/mptscsih.c 2011-05-19 13:45:31.000000000 +0200 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/message/i2o/i2o_config.c linux-2.6.39-pax/drivers/message/i2o/i2o_config.c --- linux-2.6.39/drivers/message/i2o/i2o_config.c 2011-05-19 10:21:43.000000000 +0200 +++ linux-2.6.39-pax/drivers/message/i2o/i2o_config.c 2011-05-19 13:45:31.000000000 +0200 @@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon struct i2o_message *msg; unsigned int iop; + pax_track_stack(); + if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg)) return -EFAULT; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/message/i2o/i2o_proc.c linux-2.6.39-pax/drivers/message/i2o/i2o_proc.c --- linux-2.6.39/drivers/message/i2o/i2o_proc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/message/i2o/i2o_proc.c 2011-05-19 13:45:31.000000000 +0200 @@ -255,13 +255,6 @@ static char *scsi_devices[] = { "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 @@ static int i2o_seq_show_ddm_table(struct 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 @@ static int i2o_seq_show_drivers_stored(s 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 @@ static int i2o_seq_show_dev_identity(str 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 @@ static int i2o_seq_show_ddm_identity(str } 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 @@ static int i2o_seq_show_uinfo(struct seq 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/message/i2o/iop.c linux-2.6.39-pax/drivers/message/i2o/iop.c --- linux-2.6.39/drivers/message/i2o/iop.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/message/i2o/iop.c 2011-05-19 13:45:31.000000000 +0200 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro spin_lock_irqsave(&c->context_list_lock, flags); - if (unlikely(atomic_inc_and_test(&c->context_list_counter))) - atomic_inc(&c->context_list_counter); + if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter))) + atomic_inc_unchecked(&c->context_list_counter); - entry->context = atomic_read(&c->context_list_counter); + entry->context = atomic_read_unchecked(&c->context_list_counter); list_add(&entry->list, &c->context_list); @@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(voi #if BITS_PER_LONG == 64 spin_lock_init(&c->context_list_lock); - atomic_set(&c->context_list_counter, 0); + atomic_set_unchecked(&c->context_list_counter, 0); INIT_LIST_HEAD(&c->context_list); #endif diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mfd/ab3100-core.c linux-2.6.39-pax/drivers/mfd/ab3100-core.c --- linux-2.6.39/drivers/mfd/ab3100-core.c 2011-05-19 10:21:43.000000000 +0200 +++ linux-2.6.39-pax/drivers/mfd/ab3100-core.c 2011-05-19 14:23:30.000000000 +0200 @@ -385,7 +385,7 @@ static int ab3100_event_registers_startu return 0; } -static struct abx500_ops ab3100_ops = { +static const struct abx500_ops ab3100_ops = { .get_chip_id = ab3100_get_chip_id, .set_register = set_register_interruptible, .get_register = get_register_interruptible, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mfd/ab3550-core.c linux-2.6.39-pax/drivers/mfd/ab3550-core.c --- linux-2.6.39/drivers/mfd/ab3550-core.c 2011-05-19 10:21:43.000000000 +0200 +++ linux-2.6.39-pax/drivers/mfd/ab3550-core.c 2011-05-19 14:23:30.000000000 +0200 @@ -676,7 +676,7 @@ static int ab3550_startup_irq_enabled(st return val; } -static struct abx500_ops ab3550_ops = { +static const struct abx500_ops ab3550_ops = { .get_chip_id = ab3550_get_chip_id, .get_register = ab3550_get_register_interruptible, .set_register = ab3550_set_register_interruptible, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mfd/ab8500-core.c linux-2.6.39-pax/drivers/mfd/ab8500-core.c --- linux-2.6.39/drivers/mfd/ab8500-core.c 2011-05-19 10:21:43.000000000 +0200 +++ linux-2.6.39-pax/drivers/mfd/ab8500-core.c 2011-05-19 14:23:30.000000000 +0200 @@ -223,7 +223,7 @@ static int ab8500_mask_and_set_register( } -static struct abx500_ops ab8500_ops = { +static const struct abx500_ops ab8500_ops = { .get_chip_id = ab8500_get_chip_id, .get_register = ab8500_get_register, .set_register = ab8500_set_register, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mfd/abx500-core.c linux-2.6.39-pax/drivers/mfd/abx500-core.c --- linux-2.6.39/drivers/mfd/abx500-core.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mfd/abx500-core.c 2011-05-19 14:23:30.000000000 +0200 @@ -18,7 +18,7 @@ struct abx500_device_entry { struct device *dev; }; -static void lookup_ops(struct device *dev, struct abx500_ops **ops) +static void lookup_ops(struct device *dev, const struct abx500_ops **ops) { struct abx500_device_entry *dev_entry; @@ -31,7 +31,7 @@ static void lookup_ops(struct device *de } } -int abx500_register_ops(struct device *dev, struct abx500_ops *ops) +int abx500_register_ops(struct device *dev, const struct abx500_ops *ops) { struct abx500_device_entry *dev_entry; @@ -65,7 +65,7 @@ EXPORT_SYMBOL(abx500_remove_ops); int abx500_set_register_interruptible(struct device *dev, u8 bank, u8 reg, u8 value) { - struct abx500_ops *ops; + const struct abx500_ops *ops; lookup_ops(dev->parent, &ops); if ((ops != NULL) && (ops->set_register != NULL)) @@ -78,7 +78,7 @@ EXPORT_SYMBOL(abx500_set_register_interr int abx500_get_register_interruptible(struct device *dev, u8 bank, u8 reg, u8 *value) { - struct abx500_ops *ops; + const struct abx500_ops *ops; lookup_ops(dev->parent, &ops); if ((ops != NULL) && (ops->get_register != NULL)) @@ -91,7 +91,7 @@ EXPORT_SYMBOL(abx500_get_register_interr int abx500_get_register_page_interruptible(struct device *dev, u8 bank, u8 first_reg, u8 *regvals, u8 numregs) { - struct abx500_ops *ops; + const struct abx500_ops *ops; lookup_ops(dev->parent, &ops); if ((ops != NULL) && (ops->get_register_page != NULL)) @@ -105,7 +105,7 @@ EXPORT_SYMBOL(abx500_get_register_page_i int abx500_mask_and_set_register_interruptible(struct device *dev, u8 bank, u8 reg, u8 bitmask, u8 bitvalues) { - struct abx500_ops *ops; + const struct abx500_ops *ops; lookup_ops(dev->parent, &ops); if ((ops != NULL) && (ops->mask_and_set_register != NULL)) @@ -118,7 +118,7 @@ EXPORT_SYMBOL(abx500_mask_and_set_regist int abx500_get_chip_id(struct device *dev) { - struct abx500_ops *ops; + const struct abx500_ops *ops; lookup_ops(dev->parent, &ops); if ((ops != NULL) && (ops->get_chip_id != NULL)) @@ -130,7 +130,7 @@ EXPORT_SYMBOL(abx500_get_chip_id); int abx500_event_registers_startup_state_get(struct device *dev, u8 *event) { - struct abx500_ops *ops; + const struct abx500_ops *ops; lookup_ops(dev->parent, &ops); if ((ops != NULL) && (ops->event_registers_startup_state_get != NULL)) @@ -142,7 +142,7 @@ EXPORT_SYMBOL(abx500_event_registers_sta int abx500_startup_irq_enabled(struct device *dev, unsigned int irq) { - struct abx500_ops *ops; + const struct abx500_ops *ops; lookup_ops(dev->parent, &ops); if ((ops != NULL) && (ops->startup_irq_enabled != NULL)) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mfd/janz-cmodio.c linux-2.6.39-pax/drivers/mfd/janz-cmodio.c --- linux-2.6.39/drivers/mfd/janz-cmodio.c 2011-05-19 10:21:43.000000000 +0200 +++ linux-2.6.39-pax/drivers/mfd/janz-cmodio.c 2011-05-19 13:45:31.000000000 +0200 @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mfd/mcp-sa11x0.c linux-2.6.39-pax/drivers/mfd/mcp-sa11x0.c --- linux-2.6.39/drivers/mfd/mcp-sa11x0.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mfd/mcp-sa11x0.c 2011-05-19 14:23:30.000000000 +0200 @@ -128,7 +128,7 @@ static void mcp_sa11x0_disable(struct mc /* * Our methods. */ -static struct mcp_ops mcp_sa11x0 = { +static const struct mcp_ops mcp_sa11x0 = { .set_telecom_divisor = mcp_sa11x0_set_telecom_divisor, .set_audio_divisor = mcp_sa11x0_set_audio_divisor, .reg_write = mcp_sa11x0_write, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mfd/wm8350-i2c.c linux-2.6.39-pax/drivers/mfd/wm8350-i2c.c --- linux-2.6.39/drivers/mfd/wm8350-i2c.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mfd/wm8350-i2c.c 2011-05-19 13:45:31.000000000 +0200 @@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc u8 msg[(WM8350_MAX_REGISTER << 1) + 1]; int ret; + pax_track_stack(); + if (bytes > ((WM8350_MAX_REGISTER << 1) + 1)) return -EINVAL; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/misc/enclosure.c linux-2.6.39-pax/drivers/misc/enclosure.c --- linux-2.6.39/drivers/misc/enclosure.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/misc/enclosure.c 2011-05-19 14:23:30.000000000 +0200 @@ -161,7 +161,7 @@ enclosure_register(struct device *dev, c } EXPORT_SYMBOL_GPL(enclosure_register); -static struct enclosure_component_callbacks enclosure_null_callbacks; +static const struct enclosure_component_callbacks enclosure_null_callbacks; /** * enclosure_unregister - remove an enclosure diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/misc/kgdbts.c linux-2.6.39-pax/drivers/misc/kgdbts.c --- linux-2.6.39/drivers/misc/kgdbts.c 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/misc/kgdbts.c 2011-05-19 14:23:30.000000000 +0200 @@ -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 @@ static void kgdbts_post_exp_handler(void 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.c linux-2.6.39-pax/drivers/misc/lis3lv02d/lis3lv02d.c --- linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.c 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/misc/lis3lv02d/lis3lv02d.c 2011-05-19 13:45:31.000000000 +0200 @@ -435,7 +435,7 @@ static irqreturn_t lis302dl_interrupt(in * the lid is closed. This leads to interrupts as soon as a little move * is done. */ - atomic_inc(&lis3_dev.count); + atomic_inc_unchecked(&lis3_dev.count); wake_up_interruptible(&lis3_dev.misc_wait); kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN); @@ -518,7 +518,7 @@ static int lis3lv02d_misc_open(struct in if (lis3_dev.pm_dev) pm_runtime_get_sync(lis3_dev.pm_dev); - atomic_set(&lis3_dev.count, 0); + atomic_set_unchecked(&lis3_dev.count, 0); return 0; } @@ -545,7 +545,7 @@ static ssize_t lis3lv02d_misc_read(struc add_wait_queue(&lis3_dev.misc_wait, &wait); while (true) { set_current_state(TASK_INTERRUPTIBLE); - data = atomic_xchg(&lis3_dev.count, 0); + data = atomic_xchg_unchecked(&lis3_dev.count, 0); if (data) break; @@ -583,7 +583,7 @@ out: static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait) { poll_wait(file, &lis3_dev.misc_wait, wait); - if (atomic_read(&lis3_dev.count)) + if (atomic_read_unchecked(&lis3_dev.count)) return POLLIN | POLLRDNORM; return 0; } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.h linux-2.6.39-pax/drivers/misc/lis3lv02d/lis3lv02d.h --- linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.h 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/misc/lis3lv02d/lis3lv02d.h 2011-05-19 13:45:31.000000000 +0200 @@ -265,7 +265,7 @@ struct lis3lv02d { struct input_polled_dev *idev; /* input device */ struct platform_device *pdev; /* platform device */ struct regulator_bulk_data regulators[2]; - atomic_t count; /* interrupt count after last read */ + atomic_unchecked_t count; /* interrupt count after last read */ union axis_conversion ac; /* hw -> logical axis */ int mapped_btns[3]; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/misc/sgi-gru/gruhandles.c linux-2.6.39-pax/drivers/misc/sgi-gru/gruhandles.c --- linux-2.6.39/drivers/misc/sgi-gru/gruhandles.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/misc/sgi-gru/gruhandles.c 2011-05-19 13:45:31.000000000 +0200 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.39-pax/drivers/misc/sgi-gru/gruprocfs.c --- linux-2.6.39/drivers/misc/sgi-gru/gruprocfs.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/misc/sgi-gru/gruprocfs.c 2011-05-19 13:45:31.000000000 +0200 @@ -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 @@ static int mcs_statistics_show(struct se 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/misc/sgi-gru/grutables.h linux-2.6.39-pax/drivers/misc/sgi-gru/grutables.h --- linux-2.6.39/drivers/misc/sgi-gru/grutables.h 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/misc/sgi-gru/grutables.h 2011-05-19 13:45:31.000000000 +0200 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids; * 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 @@ enum mcs_op {cchop_allocate, cchop_start 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 @@ extern struct mcs_op_statistic mcs_op_st #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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.39-pax/drivers/misc/sgi-xp/xpc_sn2.c --- linux-2.6.39/drivers/misc/sgi-xp/xpc_sn2.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/misc/sgi-xp/xpc_sn2.c 2011-05-19 14:23:30.000000000 +0200 @@ -2351,7 +2351,7 @@ xpc_received_payload_sn2(struct xpc_chan xpc_acknowledge_msgs_sn2(ch, get, msg->flags); } -static struct xpc_arch_operations xpc_arch_ops_sn2 = { +static const struct xpc_arch_operations xpc_arch_ops_sn2 = { .setup_partitions = xpc_setup_partitions_sn2, .teardown_partitions = xpc_teardown_partitions_sn2, .process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_sn2, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.39-pax/drivers/misc/sgi-xp/xpc_uv.c --- linux-2.6.39/drivers/misc/sgi-xp/xpc_uv.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/misc/sgi-xp/xpc_uv.c 2011-05-19 14:23:30.000000000 +0200 @@ -1674,7 +1674,7 @@ xpc_received_payload_uv(struct xpc_chann XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret); } -static struct xpc_arch_operations xpc_arch_ops_uv = { +static const struct xpc_arch_operations xpc_arch_ops_uv = { .setup_partitions = xpc_setup_partitions_uv, .teardown_partitions = xpc_teardown_partitions_uv, .process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_uv, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/misc/spear13xx_pcie_gadget.c linux-2.6.39-pax/drivers/misc/spear13xx_pcie_gadget.c --- linux-2.6.39/drivers/misc/spear13xx_pcie_gadget.c 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/misc/spear13xx_pcie_gadget.c 2011-05-19 14:23:30.000000000 +0200 @@ -644,7 +644,7 @@ static ssize_t pcie_gadget_target_attr_s return ret; } -static struct configfs_item_operations pcie_gadget_target_item_ops = { +static const struct configfs_item_operations pcie_gadget_target_item_ops = { .show_attribute = pcie_gadget_target_attr_show, .store_attribute = pcie_gadget_target_attr_store, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/davinci_mmc.c linux-2.6.39-pax/drivers/mmc/host/davinci_mmc.c --- linux-2.6.39/drivers/mmc/host/davinci_mmc.c 2011-03-15 19:33:50.000000000 +0100 +++ linux-2.6.39-pax/drivers/mmc/host/davinci_mmc.c 2011-05-19 14:23:30.000000000 +0200 @@ -1133,7 +1133,7 @@ static void mmc_davinci_enable_sdio_irq( } } -static struct mmc_host_ops mmc_davinci_ops = { +static const struct mmc_host_ops mmc_davinci_ops = { .request = mmc_davinci_request, .set_ios = mmc_davinci_set_ios, .get_cd = mmc_davinci_get_cd, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/dw_mmc.c linux-2.6.39-pax/drivers/mmc/host/dw_mmc.c --- linux-2.6.39/drivers/mmc/host/dw_mmc.c 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/mmc/host/dw_mmc.c 2011-05-19 14:23:30.000000000 +0200 @@ -417,7 +417,7 @@ static int dw_mci_idmac_init(struct dw_m return 0; } -static struct dw_mci_dma_ops dw_mci_idmac_ops = { +static const struct dw_mci_dma_ops dw_mci_idmac_ops = { .init = dw_mci_idmac_init, .start = dw_mci_idmac_start_dma, .stop = dw_mci_idmac_stop_dma, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/s3cmci.c linux-2.6.39-pax/drivers/mmc/host/s3cmci.c --- linux-2.6.39/drivers/mmc/host/s3cmci.c 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/mmc/host/s3cmci.c 2011-05-19 14:23:30.000000000 +0200 @@ -1349,7 +1349,7 @@ static void s3cmci_enable_sdio_irq(struc s3cmci_check_sdio_irq(host); } -static struct mmc_host_ops s3cmci_ops = { +static const struct mmc_host_ops s3cmci_ops = { .request = s3cmci_request, .set_ios = s3cmci_set_ios, .get_ro = s3cmci_get_ro, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/sdhci-cns3xxx.c linux-2.6.39-pax/drivers/mmc/host/sdhci-cns3xxx.c --- linux-2.6.39/drivers/mmc/host/sdhci-cns3xxx.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mmc/host/sdhci-cns3xxx.c 2011-05-19 14:23:30.000000000 +0200 @@ -81,7 +81,7 @@ out: host->clock = clock; } -static struct sdhci_ops sdhci_cns3xxx_ops = { +static const struct sdhci_ops sdhci_cns3xxx_ops = { .get_max_clock = sdhci_cns3xxx_get_max_clk, .set_clock = sdhci_cns3xxx_set_clock, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/sdhci-dove.c linux-2.6.39-pax/drivers/mmc/host/sdhci-dove.c --- linux-2.6.39/drivers/mmc/host/sdhci-dove.c 2011-03-15 19:33:51.000000000 +0100 +++ linux-2.6.39-pax/drivers/mmc/host/sdhci-dove.c 2011-05-19 14:23:30.000000000 +0200 @@ -56,7 +56,7 @@ static u32 sdhci_dove_readl(struct sdhci return ret; } -static struct sdhci_ops sdhci_dove_ops = { +static const struct sdhci_ops sdhci_dove_ops = { .read_w = sdhci_dove_readw, .read_l = sdhci_dove_readl, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/sdhci-esdhc-imx.c linux-2.6.39-pax/drivers/mmc/host/sdhci-esdhc-imx.c --- linux-2.6.39/drivers/mmc/host/sdhci-esdhc-imx.c 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/mmc/host/sdhci-esdhc-imx.c 2011-05-19 14:23:30.000000000 +0200 @@ -201,7 +201,7 @@ static unsigned int esdhc_pltfm_get_ro(s return -ENOSYS; } -static struct sdhci_ops sdhci_esdhc_ops = { +static const struct sdhci_ops sdhci_esdhc_ops = { .read_l = esdhc_readl_le, .read_w = esdhc_readw_le, .write_l = esdhc_writel_le, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/sdhci-of.h linux-2.6.39-pax/drivers/mmc/host/sdhci-of.h --- linux-2.6.39/drivers/mmc/host/sdhci-of.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mmc/host/sdhci-of.h 2011-05-19 14:23:30.000000000 +0200 @@ -21,7 +21,7 @@ struct sdhci_of_data { unsigned int quirks; - struct sdhci_ops ops; + const struct sdhci_ops ops; }; struct sdhci_of_host { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/sdhci-pci.c linux-2.6.39-pax/drivers/mmc/host/sdhci-pci.c --- linux-2.6.39/drivers/mmc/host/sdhci-pci.c 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/mmc/host/sdhci-pci.c 2011-05-19 14:23:30.000000000 +0200 @@ -786,7 +786,7 @@ static int sdhci_pci_enable_dma(struct s return 0; } -static struct sdhci_ops sdhci_pci_ops = { +static const struct sdhci_ops sdhci_pci_ops = { .enable_dma = sdhci_pci_enable_dma, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/sdhci-pltfm.c linux-2.6.39-pax/drivers/mmc/host/sdhci-pltfm.c --- linux-2.6.39/drivers/mmc/host/sdhci-pltfm.c 2011-03-15 19:33:51.000000000 +0100 +++ linux-2.6.39-pax/drivers/mmc/host/sdhci-pltfm.c 2011-05-19 14:23:30.000000000 +0200 @@ -41,7 +41,7 @@ * * \*****************************************************************************/ -static struct sdhci_ops sdhci_pltfm_ops = { +static const struct sdhci_ops sdhci_pltfm_ops = { }; /*****************************************************************************\ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/sdhci-pxa.c linux-2.6.39-pax/drivers/mmc/host/sdhci-pxa.c --- linux-2.6.39/drivers/mmc/host/sdhci-pxa.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mmc/host/sdhci-pxa.c 2011-05-19 14:23:30.000000000 +0200 @@ -69,7 +69,7 @@ static void set_clock(struct sdhci_host } } -static struct sdhci_ops sdhci_pxa_ops = { +static const struct sdhci_ops sdhci_pxa_ops = { .set_clock = set_clock, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/sdhci-s3c.c linux-2.6.39-pax/drivers/mmc/host/sdhci-s3c.c --- linux-2.6.39/drivers/mmc/host/sdhci-s3c.c 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/mmc/host/sdhci-s3c.c 2011-05-19 14:23:30.000000000 +0200 @@ -309,7 +309,7 @@ static int sdhci_s3c_platform_8bit_width return 0; } -static struct sdhci_ops sdhci_s3c_ops = { +static const struct sdhci_ops sdhci_s3c_ops = { .get_max_clock = sdhci_s3c_get_max_clk, .set_clock = sdhci_s3c_set_clock, .get_min_clock = sdhci_s3c_get_min_clock, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/sdhci-spear.c linux-2.6.39-pax/drivers/mmc/host/sdhci-spear.c --- linux-2.6.39/drivers/mmc/host/sdhci-spear.c 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/mmc/host/sdhci-spear.c 2011-05-19 14:23:30.000000000 +0200 @@ -32,7 +32,7 @@ struct spear_sdhci { }; /* sdhci ops */ -static struct sdhci_ops sdhci_pltfm_ops = { +static const struct sdhci_ops sdhci_pltfm_ops = { /* Nothing to do for now. */ }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/sdhci-tegra.c linux-2.6.39-pax/drivers/mmc/host/sdhci-tegra.c --- linux-2.6.39/drivers/mmc/host/sdhci-tegra.c 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/mmc/host/sdhci-tegra.c 2011-05-19 14:23:30.000000000 +0200 @@ -242,7 +242,7 @@ static void tegra_sdhci_pltfm_exit(struc clk_put(pltfm_host->clk); } -static struct sdhci_ops tegra_sdhci_ops = { +static const struct sdhci_ops tegra_sdhci_ops = { .get_ro = tegra_sdhci_get_ro, .read_l = tegra_sdhci_readl, .read_w = tegra_sdhci_readw, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/sdricoh_cs.c linux-2.6.39-pax/drivers/mmc/host/sdricoh_cs.c --- linux-2.6.39/drivers/mmc/host/sdricoh_cs.c 2011-03-15 19:33:51.000000000 +0100 +++ linux-2.6.39-pax/drivers/mmc/host/sdricoh_cs.c 2011-05-19 14:23:30.000000000 +0200 @@ -387,7 +387,7 @@ static int sdricoh_get_ro(struct mmc_hos return (status & STATUS_CARD_LOCKED); } -static struct mmc_host_ops sdricoh_ops = { +static const struct mmc_host_ops sdricoh_ops = { .request = sdricoh_request, .set_ios = sdricoh_set_ios, .get_ro = sdricoh_get_ro, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mmc/host/sh_mmcif.c linux-2.6.39-pax/drivers/mmc/host/sh_mmcif.c --- linux-2.6.39/drivers/mmc/host/sh_mmcif.c 2011-05-19 10:21:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/mmc/host/sh_mmcif.c 2011-05-19 14:23:30.000000000 +0200 @@ -872,7 +872,7 @@ static int sh_mmcif_get_cd(struct mmc_ho return p->get_cd(host->pd); } -static struct mmc_host_ops sh_mmcif_ops = { +static const struct mmc_host_ops sh_mmcif_ops = { .request = sh_mmcif_request, .set_ios = sh_mmcif_set_ios, .get_cd = sh_mmcif_get_cd, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.39-pax/drivers/mtd/chips/cfi_cmdset_0001.c --- linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0001.c 2011-05-19 10:21:45.000000000 +0200 +++ linux-2.6.39-pax/drivers/mtd/chips/cfi_cmdset_0001.c 2011-05-19 13:45:31.000000000 +0200 @@ -757,6 +757,8 @@ static int chip_ready (struct map_info * struct cfi_pri_intelext *cfip = cfi->cmdset_priv; unsigned long timeo = jiffies + HZ; + pax_track_stack(); + /* Prevent setting state FL_SYNCING for chip in suspended state. */ if (mode == FL_SYNCING && chip->oldstate != FL_READY) goto sleep; @@ -1657,6 +1659,8 @@ static int __xipram do_write_buffer(stru unsigned long initial_adr; int initial_len = len; + pax_track_stack(); + wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize; adr += chip->start; initial_adr = adr; @@ -1875,6 +1879,8 @@ static int __xipram do_erase_oneblock(st int retries = 3; int ret; + pax_track_stack(); + adr += chip->start; retry: diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.39-pax/drivers/mtd/chips/cfi_cmdset_0020.c --- linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0020.c 2011-05-19 10:21:45.000000000 +0200 +++ linux-2.6.39-pax/drivers/mtd/chips/cfi_cmdset_0020.c 2011-05-19 13:45:31.000000000 +0200 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct unsigned long cmd_addr; struct cfi_private *cfi = map->fldrv_priv; + pax_track_stack(); + adr += chip->start; /* Ensure cmd read/writes are aligned. */ @@ -428,6 +430,8 @@ static inline int do_write_buffer(struct DECLARE_WAITQUEUE(wait, current); int wbufsize, z; + pax_track_stack(); + /* M58LW064A requires bus alignment for buffer wriets -- saw */ if (adr & (map_bankwidth(map)-1)) return -EINVAL; @@ -742,6 +746,8 @@ static inline int do_erase_oneblock(stru DECLARE_WAITQUEUE(wait, current); int ret = 0; + pax_track_stack(); + adr += chip->start; /* Let's determine this according to the interleave only once */ @@ -1047,6 +1053,8 @@ static inline int do_lock_oneblock(struc unsigned long timeo = jiffies + HZ; DECLARE_WAITQUEUE(wait, current); + pax_track_stack(); + adr += chip->start; /* Let's determine this according to the interleave only once */ @@ -1196,6 +1204,8 @@ static inline int do_unlock_oneblock(str unsigned long timeo = jiffies + HZ; DECLARE_WAITQUEUE(wait, current); + pax_track_stack(); + adr += chip->start; /* Let's determine this according to the interleave only once */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/devices/doc2000.c linux-2.6.39-pax/drivers/mtd/devices/doc2000.c --- linux-2.6.39/drivers/mtd/devices/doc2000.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mtd/devices/doc2000.c 2011-05-19 13:45:31.000000000 +0200 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/devices/doc2001.c linux-2.6.39-pax/drivers/mtd/devices/doc2001.c --- linux-2.6.39/drivers/mtd/devices/doc2001.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mtd/devices/doc2001.c 2011-05-19 13:45:31.000000000 +0200 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/ftl.c linux-2.6.39-pax/drivers/mtd/ftl.c --- linux-2.6.39/drivers/mtd/ftl.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mtd/ftl.c 2011-05-19 13:45:31.000000000 +0200 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t * loff_t offset; uint16_t srcunitswap = cpu_to_le16(srcunit); + pax_track_stack(); + eun = &part->EUNInfo[srcunit]; xfer = &part->XferInfo[xferunit]; DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n", diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/inftlcore.c linux-2.6.39-pax/drivers/mtd/inftlcore.c --- linux-2.6.39/drivers/mtd/inftlcore.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mtd/inftlcore.c 2011-05-19 13:45:31.000000000 +0200 @@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr struct inftl_oob oob; size_t retlen; + pax_track_stack(); + DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d," "pending=%d)\n", inftl, thisVUC, pendingblock); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/inftlmount.c linux-2.6.39-pax/drivers/mtd/inftlmount.c --- linux-2.6.39/drivers/mtd/inftlmount.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mtd/inftlmount.c 2011-05-19 13:45:31.000000000 +0200 @@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL struct INFTLPartition *ip; size_t retlen; + pax_track_stack(); + DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl); /* diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.39-pax/drivers/mtd/lpddr/qinfo_probe.c --- linux-2.6.39/drivers/mtd/lpddr/qinfo_probe.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mtd/lpddr/qinfo_probe.c 2011-05-19 13:45:31.000000000 +0200 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map { map_word pfow_val[4]; + pax_track_stack(); + /* Check identification string */ pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P); pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/mtdchar.c linux-2.6.39-pax/drivers/mtd/mtdchar.c --- linux-2.6.39/drivers/mtd/mtdchar.c 2011-05-19 10:21:45.000000000 +0200 +++ linux-2.6.39-pax/drivers/mtd/mtdchar.c 2011-05-19 13:45:31.000000000 +0200 @@ -560,6 +560,8 @@ static int mtd_ioctl(struct file *file, u_long size; struct mtd_info_user info; + pax_track_stack(); + DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n"); size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/nand/denali.c linux-2.6.39-pax/drivers/mtd/nand/denali.c --- linux-2.6.39/drivers/mtd/nand/denali.c 2011-05-19 10:21:45.000000000 +0200 +++ linux-2.6.39-pax/drivers/mtd/nand/denali.c 2011-05-19 13:45:31.000000000 +0200 @@ -25,6 +25,7 @@ #include #include #include +#include #include "denali.h" diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/nftlcore.c linux-2.6.39-pax/drivers/mtd/nftlcore.c --- linux-2.6.39/drivers/mtd/nftlcore.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mtd/nftlcore.c 2011-05-19 13:45:31.000000000 +0200 @@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre int inplace = 1; size_t retlen; + pax_track_stack(); + memset(BlockMap, 0xff, sizeof(BlockMap)); memset(BlockFreeFound, 0, sizeof(BlockFreeFound)); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/nftlmount.c linux-2.6.39-pax/drivers/mtd/nftlmount.c --- linux-2.6.39/drivers/mtd/nftlmount.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/mtd/nftlmount.c 2011-05-19 13:45:31.000000000 +0200 @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -45,6 +46,8 @@ static int find_boot_record(struct NFTLr struct mtd_info *mtd = nftl->mbd.mtd; unsigned int i; + pax_track_stack(); + /* Assume logical EraseSize == physical erasesize for starting the scan. We'll sort it out later if we find a MediaHeader which says otherwise */ /* Actually, we won't. The new DiskOnChip driver has already scanned diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/mtd/ubi/build.c linux-2.6.39-pax/drivers/mtd/ubi/build.c --- linux-2.6.39/drivers/mtd/ubi/build.c 2011-05-19 10:21:45.000000000 +0200 +++ linux-2.6.39-pax/drivers/mtd/ubi/build.c 2011-05-19 13:45:31.000000000 +0200 @@ -1287,7 +1287,7 @@ module_exit(ubi_exit); 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) { @@ -1298,11 +1298,11 @@ static int __init bytes_str_to_int(const 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': @@ -1313,7 +1313,13 @@ static int __init bytes_str_to_int(const 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/bcm63xx_enet.c linux-2.6.39-pax/drivers/net/bcm63xx_enet.c --- linux-2.6.39/drivers/net/bcm63xx_enet.c 2011-05-19 10:21:45.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/bcm63xx_enet.c 2011-05-19 14:23:30.000000000 +0200 @@ -1469,7 +1469,7 @@ static int bcm_enet_set_pauseparam(struc return 0; } -static struct ethtool_ops bcm_enet_ethtool_ops = { +static const struct ethtool_ops bcm_enet_ethtool_ops = { .get_strings = bcm_enet_get_strings, .get_sset_count = bcm_enet_get_sset_count, .get_ethtool_stats = bcm_enet_get_ethtool_stats, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/bna/bnad_ethtool.c linux-2.6.39-pax/drivers/net/bna/bnad_ethtool.c --- linux-2.6.39/drivers/net/bna/bnad_ethtool.c 2011-03-15 19:33:54.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/bna/bnad_ethtool.c 2011-05-19 14:23:30.000000000 +0200 @@ -1242,7 +1242,7 @@ bnad_get_sset_count(struct net_device *n } } -static struct ethtool_ops bnad_ethtool_ops = { +static const struct ethtool_ops bnad_ethtool_ops = { .get_settings = bnad_get_settings, .set_settings = bnad_set_settings, .get_drvinfo = bnad_get_drvinfo, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/bnx2.c linux-2.6.39-pax/drivers/net/bnx2.c --- linux-2.6.39/drivers/net/bnx2.c 2011-05-19 10:21:46.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/bnx2.c 2011-05-19 13:45:31.000000000 +0200 @@ -5828,6 +5828,8 @@ bnx2_test_nvram(struct bnx2 *bp) int rc = 0; u32 magic, csum; + pax_track_stack(); + if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0) goto test_nvram_done; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/bnx2x/bnx2x_ethtool.c linux-2.6.39-pax/drivers/net/bnx2x/bnx2x_ethtool.c --- linux-2.6.39/drivers/net/bnx2x/bnx2x_ethtool.c 2011-05-19 10:21:46.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/bnx2x/bnx2x_ethtool.c 2011-05-19 13:45:31.000000000 +0200 @@ -1788,6 +1788,8 @@ static int bnx2x_test_nvram(struct bnx2x int i, rc; u32 magic, crc; + pax_track_stack(); + if (BP_NOMCP(bp)) return 0; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/chelsio/pm3393.c linux-2.6.39-pax/drivers/net/chelsio/pm3393.c --- linux-2.6.39/drivers/net/chelsio/pm3393.c 2011-05-19 10:21:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/chelsio/pm3393.c 2011-05-19 14:23:30.000000000 +0200 @@ -571,7 +571,7 @@ static void pm3393_destroy(struct cmac * kfree(cmac); } -static struct cmac_ops pm3393_ops = { +static const struct cmac_ops pm3393_ops = { .destroy = pm3393_destroy, .reset = pm3393_reset, .interrupt_enable = pm3393_interrupt_enable, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/chelsio/vsc7326.c linux-2.6.39-pax/drivers/net/chelsio/vsc7326.c --- linux-2.6.39/drivers/net/chelsio/vsc7326.c 2011-05-19 10:21:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/chelsio/vsc7326.c 2011-05-19 14:23:30.000000000 +0200 @@ -666,7 +666,7 @@ static void mac_destroy(struct cmac *mac kfree(mac); } -static struct cmac_ops vsc7326_ops = { +static const struct cmac_ops vsc7326_ops = { .destroy = mac_destroy, .reset = mac_reset, .interrupt_handler = mac_intr_handler, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/cxgb4/cxgb4_main.c linux-2.6.39-pax/drivers/net/cxgb4/cxgb4_main.c --- linux-2.6.39/drivers/net/cxgb4/cxgb4_main.c 2011-05-19 10:21:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/cxgb4/cxgb4_main.c 2011-05-19 13:45:31.000000000 +0200 @@ -3428,6 +3428,8 @@ static int __devinit enable_msix(struct unsigned int nchan = adap->params.nports; struct msix_entry entries[MAX_INGQ + 1]; + pax_track_stack(); + for (i = 0; i < ARRAY_SIZE(entries); ++i) entries[i].entry = i; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/cxgb4/t4_hw.c linux-2.6.39-pax/drivers/net/cxgb4/t4_hw.c --- linux-2.6.39/drivers/net/cxgb4/t4_hw.c 2011-05-19 10:21:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/cxgb4/t4_hw.c 2011-05-19 13:45:31.000000000 +0200 @@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter u8 vpd[VPD_LEN], csum; unsigned int vpdr_len, kw_offset, id_len; + pax_track_stack(); + ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd); if (ret < 0) return ret; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/cxgb4vf/cxgb4vf_main.c linux-2.6.39-pax/drivers/net/cxgb4vf/cxgb4vf_main.c --- linux-2.6.39/drivers/net/cxgb4vf/cxgb4vf_main.c 2011-05-19 10:21:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/cxgb4vf/cxgb4vf_main.c 2011-05-19 14:23:30.000000000 +0200 @@ -1572,7 +1572,7 @@ static int cxgb4vf_set_tso(struct net_de return 0; } -static struct ethtool_ops cxgb4vf_ethtool_ops = { +static const struct ethtool_ops cxgb4vf_ethtool_ops = { .get_settings = cxgb4vf_get_settings, .get_drvinfo = cxgb4vf_get_drvinfo, .get_msglevel = cxgb4vf_get_msglevel, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/e1000e/82571.c linux-2.6.39-pax/drivers/net/e1000e/82571.c --- linux-2.6.39/drivers/net/e1000e/82571.c 2011-03-15 19:33:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/e1000e/82571.c 2011-05-19 14:23:30.000000000 +0200 @@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s { 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 @@ static void e1000_clear_hw_cntrs_82571(s 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 @@ static struct e1000_mac_operations e8257 .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 @@ static struct e1000_phy_operations e82_p .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 @@ static struct e1000_phy_operations e82_p .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 @@ static struct e1000_phy_operations e82_p .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/e1000e/e1000.h linux-2.6.39-pax/drivers/net/e1000e/e1000.h --- linux-2.6.39/drivers/net/e1000e/e1000.h 2011-05-19 10:21:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/e1000e/e1000.h 2011-05-19 14:23:30.000000000 +0200 @@ -409,9 +409,9 @@ struct e1000_info { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/e1000e/es2lan.c linux-2.6.39-pax/drivers/net/e1000e/es2lan.c --- linux-2.6.39/drivers/net/e1000e/es2lan.c 2011-03-15 19:33:58.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/e1000e/es2lan.c 2011-05-19 14:23:30.000000000 +0200 @@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es { 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 @@ static void e1000_clear_hw_cntrs_80003es 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 @@ static struct e1000_mac_operations es2_m .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 @@ static struct e1000_phy_operations es2_p .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/e1000e/hw.h linux-2.6.39-pax/drivers/net/e1000e/hw.h --- linux-2.6.39/drivers/net/e1000e/hw.h 2011-05-19 10:21:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/e1000e/hw.h 2011-05-19 14:23:30.000000000 +0200 @@ -811,6 +811,7 @@ struct e1000_nvm_operations { }; struct e1000_mac_info { + /* cannot be const see e1000_init_mac_params_ich8lan */ struct e1000_mac_operations ops; u8 addr[ETH_ALEN]; u8 perm_addr[ETH_ALEN]; @@ -852,6 +853,7 @@ struct e1000_mac_info { }; struct e1000_phy_info { + /* Cannot be const see e1000_init_phy_params_82571() */ struct e1000_phy_operations ops; enum e1000_phy_type type; @@ -886,6 +888,7 @@ struct e1000_phy_info { }; struct e1000_nvm_info { + /* cannot be const */ struct e1000_nvm_operations ops; enum e1000_nvm_type type; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/e1000e/ich8lan.c linux-2.6.39-pax/drivers/net/e1000e/ich8lan.c --- linux-2.6.39/drivers/net/e1000e/ich8lan.c 2011-05-19 10:21:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/e1000e/ich8lan.c 2011-05-19 14:23:30.000000000 +0200 @@ -3866,7 +3866,7 @@ static void e1000_clear_hw_cntrs_ich8lan } } -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, @@ -3885,7 +3885,7 @@ static struct e1000_mac_operations ich8_ /* 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, @@ -3899,7 +3899,7 @@ static struct e1000_phy_operations ich8_ .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/greth.c linux-2.6.39-pax/drivers/net/greth.c --- linux-2.6.39/drivers/net/greth.c 2011-05-19 10:21:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/greth.c 2011-05-19 14:23:30.000000000 +0200 @@ -1192,7 +1192,7 @@ static const struct ethtool_ops greth_et .get_link = ethtool_op_get_link, }; -static struct net_device_ops greth_netdev_ops = { +static const struct net_device_ops greth_netdev_ops = { .ndo_open = greth_open, .ndo_stop = greth_close, .ndo_start_xmit = greth_start_xmit, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/hamradio/6pack.c linux-2.6.39-pax/drivers/net/hamradio/6pack.c --- linux-2.6.39/drivers/net/hamradio/6pack.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/hamradio/6pack.c 2011-05-19 13:45:31.000000000 +0200 @@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t unsigned char buf[512]; int count1; + pax_track_stack(); + if (!count) return; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ibm_newemac/phy.c linux-2.6.39-pax/drivers/net/ibm_newemac/phy.c --- linux-2.6.39/drivers/net/ibm_newemac/phy.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/ibm_newemac/phy.c 2011-05-19 14:23:30.000000000 +0200 @@ -273,7 +273,7 @@ static int genmii_read_link(struct mii_p } /* Generic implementation for most 10/100/1000 PHYs */ -static struct mii_phy_ops generic_phy_ops = { +static const struct mii_phy_ops generic_phy_ops = { .setup_aneg = genmii_setup_aneg, .setup_forced = genmii_setup_forced, .poll_link = genmii_poll_link, @@ -337,7 +337,7 @@ static int cis8201_init(struct mii_phy * return 0; } -static struct mii_phy_ops cis8201_phy_ops = { +static const struct mii_phy_ops cis8201_phy_ops = { .init = cis8201_init, .setup_aneg = genmii_setup_aneg, .setup_forced = genmii_setup_forced, @@ -417,7 +417,7 @@ static int et1011c_init(struct mii_phy * return 0; } -static struct mii_phy_ops et1011c_phy_ops = { +static const struct mii_phy_ops et1011c_phy_ops = { .init = et1011c_init, .setup_aneg = genmii_setup_aneg, .setup_forced = genmii_setup_forced, @@ -436,7 +436,7 @@ static struct mii_phy_def et1011c_phy_de -static struct mii_phy_ops m88e1111_phy_ops = { +static const struct mii_phy_ops m88e1111_phy_ops = { .init = m88e1111_init, .setup_aneg = genmii_setup_aneg, .setup_forced = genmii_setup_forced, @@ -452,7 +452,7 @@ static struct mii_phy_def m88e1111_phy_d .ops = &m88e1111_phy_ops, }; -static struct mii_phy_ops m88e1112_phy_ops = { +static const struct mii_phy_ops m88e1112_phy_ops = { .init = m88e1112_init, .setup_aneg = genmii_setup_aneg, .setup_forced = genmii_setup_forced, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ibmveth.c linux-2.6.39-pax/drivers/net/ibmveth.c --- linux-2.6.39/drivers/net/ibmveth.c 2011-03-15 19:34:02.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/ibmveth.c 2011-05-19 14:23:30.000000000 +0200 @@ -1625,7 +1625,7 @@ static struct vio_device_id ibmveth_devi }; MODULE_DEVICE_TABLE(vio, ibmveth_device_table); -static struct dev_pm_ops ibmveth_pm_ops = { +static const struct dev_pm_ops ibmveth_pm_ops = { .resume = ibmveth_resume }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/igb/e1000_82575.c linux-2.6.39-pax/drivers/net/igb/e1000_82575.c --- linux-2.6.39/drivers/net/igb/e1000_82575.c 2011-05-19 10:21:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/igb/e1000_82575.c 2011-05-19 14:23:30.000000000 +0200 @@ -2029,7 +2029,7 @@ out: 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, @@ -2037,13 +2037,13 @@ static struct e1000_mac_operations e1000 .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/igb/e1000_hw.h linux-2.6.39-pax/drivers/net/igb/e1000_hw.h --- linux-2.6.39/drivers/net/igb/e1000_hw.h 2011-05-19 10:21:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/igb/e1000_hw.h 2011-05-19 14:23:30.000000000 +0200 @@ -342,14 +342,15 @@ struct e1000_nvm_operations { 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]; @@ -388,6 +389,7 @@ struct e1000_mac_info { }; struct e1000_phy_info { + /* cannot be const see igb_get_invariants_82575() */ struct e1000_phy_operations ops; enum e1000_phy_type type; @@ -423,6 +425,7 @@ struct e1000_phy_info { }; struct e1000_nvm_info { + /* cannot be const */ struct e1000_nvm_operations ops; enum e1000_nvm_type type; enum e1000_nvm_override override; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/igbvf/vf.h linux-2.6.39-pax/drivers/net/igbvf/vf.h --- linux-2.6.39/drivers/net/igbvf/vf.h 2011-03-15 19:34:02.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/igbvf/vf.h 2011-05-19 14:23:30.000000000 +0200 @@ -191,6 +191,7 @@ struct e1000_mac_operations { }; 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/irda/sh_irda.c linux-2.6.39-pax/drivers/net/irda/sh_irda.c --- linux-2.6.39/drivers/net/irda/sh_irda.c 2011-03-15 19:34:02.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/irda/sh_irda.c 2011-05-19 14:23:30.000000000 +0200 @@ -307,7 +307,7 @@ static int xir_fte(struct sh_irda_self * return 0; } -static struct sh_irda_xir_func xir_func = { +static const struct sh_irda_xir_func xir_func = { .xir_fre = xir_fre, .xir_trov = xir_trov, .xir_9 = xir_9, @@ -321,7 +321,7 @@ static struct sh_irda_xir_func xir_func * * MIR/FIR are not supported now *=====================================*/ -static struct sh_irda_xir_func mfir_func = { +static const struct sh_irda_xir_func mfir_func = { .xir_fre = xir_fre, .xir_trov = xir_trov, .xir_9 = xir_9, @@ -400,7 +400,7 @@ static int sir_fte(struct sh_irda_self * return 0; } -static struct sh_irda_xir_func sir_func = { +static const struct sh_irda_xir_func sir_func = { .xir_fre = sir_fre, .xir_trov = sir_trov, .xir_9 = sir_tot, @@ -411,7 +411,7 @@ static struct sh_irda_xir_func sir_func static void sh_irda_set_mode(struct sh_irda_self *self, enum sh_irda_mode mode) { struct device *dev = &self->ndev->dev; - struct sh_irda_xir_func *func; + const struct sh_irda_xir_func *func; const char *name; u16 data; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ixgb/ixgb_main.c linux-2.6.39-pax/drivers/net/ixgb/ixgb_main.c --- linux-2.6.39/drivers/net/ixgb/ixgb_main.c 2011-05-19 10:21:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/ixgb/ixgb_main.c 2011-05-19 13:45:31.000000000 +0200 @@ -1069,6 +1069,8 @@ ixgb_set_multi(struct net_device *netdev u32 rctl; int i; + pax_track_stack(); + /* Check for Promiscuous and All Multicast modes */ rctl = IXGB_READ_REG(hw, RCTL); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ixgb/ixgb_param.c linux-2.6.39-pax/drivers/net/ixgb/ixgb_param.c --- linux-2.6.39/drivers/net/ixgb/ixgb_param.c 2011-03-15 19:34:03.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/ixgb/ixgb_param.c 2011-05-19 13:45:31.000000000 +0200 @@ -261,6 +261,9 @@ void __devinit ixgb_check_options(struct ixgb_adapter *adapter) { int bd = adapter->bd_number; + + pax_track_stack(); + if (bd >= IXGB_MAX_NIC) { pr_notice("Warning: no configuration for board #%i\n", bd); pr_notice("Using defaults for all values\n"); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ixgbe/ixgbe.h linux-2.6.39-pax/drivers/net/ixgbe/ixgbe.h --- linux-2.6.39/drivers/net/ixgbe/ixgbe.h 2011-05-19 10:21:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/ixgbe/ixgbe.h 2011-05-19 14:23:30.000000000 +0200 @@ -493,8 +493,8 @@ enum ixgbe_boards { }; extern struct ixgbe_info ixgbe_82598_info; -extern struct ixgbe_info ixgbe_82599_info; -extern struct ixgbe_info ixgbe_X540_info; +extern const struct ixgbe_info ixgbe_82599_info; +extern const struct ixgbe_info ixgbe_X540_info; #ifdef CONFIG_IXGBE_DCB extern const struct dcbnl_rtnl_ops dcbnl_ops; extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ixgbe/ixgbe_82599.c linux-2.6.39-pax/drivers/net/ixgbe/ixgbe_82599.c --- linux-2.6.39/drivers/net/ixgbe/ixgbe_82599.c 2011-05-19 10:21:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/ixgbe/ixgbe_82599.c 2011-05-19 14:23:30.000000000 +0200 @@ -2099,7 +2099,7 @@ static struct ixgbe_phy_operations phy_o .check_overtemp = &ixgbe_tn_check_overtemp, }; -struct ixgbe_info ixgbe_82599_info = { +const struct ixgbe_info ixgbe_82599_info = { .mac = ixgbe_mac_82599EB, .get_invariants = &ixgbe_get_invariants_82599, .mac_ops = &mac_ops_82599, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ixgbe/ixgbe_type.h linux-2.6.39-pax/drivers/net/ixgbe/ixgbe_type.h --- linux-2.6.39/drivers/net/ixgbe/ixgbe_type.h 2011-05-19 10:21:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/ixgbe/ixgbe_type.h 2011-05-19 14:23:30.000000000 +0200 @@ -2572,7 +2572,7 @@ struct ixgbe_phy_operations { }; struct ixgbe_eeprom_info { - struct ixgbe_eeprom_operations ops; + struct ixgbe_eeprom_operations ops; enum ixgbe_eeprom_type type; u32 semaphore_delay; u16 word_size; @@ -2581,7 +2581,7 @@ struct ixgbe_eeprom_info { #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED 0x01 struct ixgbe_mac_info { - struct ixgbe_mac_operations ops; + struct ixgbe_mac_operations ops; enum ixgbe_mac_type type; u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS]; u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS]; @@ -2608,7 +2608,7 @@ struct ixgbe_mac_info { }; struct ixgbe_phy_info { - struct ixgbe_phy_operations ops; + struct ixgbe_phy_operations ops; struct mdio_if_info mdio; enum ixgbe_phy_type type; u32 id; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ixgbe/ixgbe_x540.c linux-2.6.39-pax/drivers/net/ixgbe/ixgbe_x540.c --- linux-2.6.39/drivers/net/ixgbe/ixgbe_x540.c 2011-05-19 10:21:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/ixgbe/ixgbe_x540.c 2011-05-19 14:23:30.000000000 +0200 @@ -727,7 +727,7 @@ static struct ixgbe_phy_operations phy_o .check_overtemp = &ixgbe_tn_check_overtemp, }; -struct ixgbe_info ixgbe_X540_info = { +const struct ixgbe_info ixgbe_X540_info = { .mac = ixgbe_mac_X540, .get_invariants = &ixgbe_get_invariants_X540, .mac_ops = &mac_ops_X540, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ixgbevf/ethtool.c linux-2.6.39-pax/drivers/net/ixgbevf/ethtool.c --- linux-2.6.39/drivers/net/ixgbevf/ethtool.c 2011-05-19 10:21:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/ixgbevf/ethtool.c 2011-05-19 14:23:30.000000000 +0200 @@ -709,7 +709,7 @@ static int ixgbevf_nway_reset(struct net return 0; } -static struct ethtool_ops ixgbevf_ethtool_ops = { +static const struct ethtool_ops ixgbevf_ethtool_ops = { .get_settings = ixgbevf_get_settings, .get_drvinfo = ixgbevf_get_drvinfo, .get_regs_len = ixgbevf_get_regs_len, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ixgbevf/ixgbevf.h linux-2.6.39-pax/drivers/net/ixgbevf/ixgbevf.h --- linux-2.6.39/drivers/net/ixgbevf/ixgbevf.h 2011-05-19 10:21:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/ixgbevf/ixgbevf.h 2011-05-19 14:23:30.000000000 +0200 @@ -279,7 +279,7 @@ enum ixgbevf_boards { extern struct ixgbevf_info ixgbevf_82599_vf_info; extern struct ixgbevf_info ixgbevf_X540_vf_info; -extern struct ixgbe_mac_operations ixgbevf_mbx_ops; +extern const struct ixgbe_mac_operations ixgbevf_mbx_ops; /* needed by ethtool.c */ extern char ixgbevf_driver_name[]; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ixgbevf/vf.c linux-2.6.39-pax/drivers/net/ixgbevf/vf.c --- linux-2.6.39/drivers/net/ixgbevf/vf.c 2011-03-15 19:34:03.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/ixgbevf/vf.c 2011-05-19 14:23:30.000000000 +0200 @@ -368,7 +368,7 @@ static s32 ixgbevf_check_mac_link_vf(str return 0; } -static struct ixgbe_mac_operations ixgbevf_mac_ops = { +static const struct ixgbe_mac_operations ixgbevf_mac_ops = { .init_hw = ixgbevf_init_hw_vf, .reset_hw = ixgbevf_reset_hw_vf, .start_hw = ixgbevf_start_hw_vf, @@ -381,12 +381,12 @@ static struct ixgbe_mac_operations ixgbe .set_vfta = ixgbevf_set_vfta_vf, }; -struct ixgbevf_info ixgbevf_82599_vf_info = { +const struct ixgbevf_info ixgbevf_82599_vf_info = { .mac = ixgbe_mac_82599_vf, .mac_ops = &ixgbevf_mac_ops, }; -struct ixgbevf_info ixgbevf_X540_vf_info = { +const struct ixgbevf_info ixgbevf_X540_vf_info = { .mac = ixgbe_mac_X540_vf, .mac_ops = &ixgbevf_mac_ops, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ixgbevf/vf.h linux-2.6.39-pax/drivers/net/ixgbevf/vf.h --- linux-2.6.39/drivers/net/ixgbevf/vf.h 2011-03-15 19:34:03.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/ixgbevf/vf.h 2011-05-19 14:23:30.000000000 +0200 @@ -166,7 +166,7 @@ struct ixgbevf_hw_stats { struct ixgbevf_info { enum ixgbe_mac_type mac; - struct ixgbe_mac_operations *mac_ops; + const struct ixgbe_mac_operations *mac_ops; }; #endif /* __IXGBE_VF_H__ */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ksz884x.c linux-2.6.39-pax/drivers/net/ksz884x.c --- linux-2.6.39/drivers/net/ksz884x.c 2011-05-19 10:21:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/ksz884x.c 2011-05-19 14:23:27.000000000 +0200 @@ -6536,6 +6536,8 @@ static void netdev_get_ethtool_stats(str int rc; u64 counter[TOTAL_PORT_COUNTER_NUM]; + pax_track_stack(); + mutex_lock(&hw_priv->lock); n = SWITCH_PORT_NUM; for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) { @@ -6637,7 +6639,7 @@ static int netdev_set_rx_csum(struct net return 0; } -static struct ethtool_ops netdev_ethtool_ops = { +static const struct ethtool_ops netdev_ethtool_ops = { .get_settings = netdev_get_settings, .set_settings = netdev_set_settings, .nway_reset = netdev_nway_reset, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/mlx4/main.c linux-2.6.39-pax/drivers/net/mlx4/main.c --- linux-2.6.39/drivers/net/mlx4/main.c 2011-05-19 10:21:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/mlx4/main.c 2011-05-19 13:45:31.000000000 +0200 @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -764,6 +765,8 @@ static int mlx4_init_hca(struct mlx4_dev u64 icm_size; int err; + pax_track_stack(); + err = mlx4_QUERY_FW(dev); if (err) { if (err == -EACCES) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/netconsole.c linux-2.6.39-pax/drivers/net/netconsole.c --- linux-2.6.39/drivers/net/netconsole.c 2011-05-19 10:21:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/netconsole.c 2011-05-19 14:23:30.000000000 +0200 @@ -634,7 +634,7 @@ static void drop_netconsole_target(struc config_item_put(&nt->item); } -static struct configfs_group_operations netconsole_subsys_group_ops = { +static const struct configfs_group_operations netconsole_subsys_group_ops = { .make_item = make_netconsole_target, .drop_item = drop_netconsole_target, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/niu.c linux-2.6.39-pax/drivers/net/niu.c --- linux-2.6.39/drivers/net/niu.c 2011-05-19 10:21:52.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/niu.c 2011-05-19 13:45:31.000000000 +0200 @@ -9067,6 +9067,8 @@ static void __devinit niu_try_msix(struc int i, num_irqs, err; u8 first_ldg; + pax_track_stack(); + first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port; for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++) ldg_num_map[i] = first_ldg + i; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/pcnet32.c linux-2.6.39-pax/drivers/net/pcnet32.c --- linux-2.6.39/drivers/net/pcnet32.c 2011-05-19 10:21:52.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/pcnet32.c 2011-05-19 14:23:27.000000000 +0200 @@ -82,7 +82,7 @@ static int cards_found; /* * 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; @@ -379,7 +379,7 @@ static int pcnet32_wio_check(unsigned lo return inw(addr + PCNET32_WIO_RAP) == 88; } -static struct pcnet32_access pcnet32_wio = { +static const struct pcnet32_access pcnet32_wio = { .read_csr = pcnet32_wio_read_csr, .write_csr = pcnet32_wio_write_csr, .read_bcr = pcnet32_wio_read_bcr, @@ -434,7 +434,7 @@ static int pcnet32_dwio_check(unsigned l return (inl(addr + PCNET32_DWIO_RAP) & 0xffff) == 88; } -static struct pcnet32_access pcnet32_dwio = { +static const struct pcnet32_access pcnet32_dwio = { .read_csr = pcnet32_dwio_read_csr, .write_csr = pcnet32_dwio_write_csr, .read_bcr = pcnet32_dwio_read_bcr, @@ -1546,7 +1546,7 @@ pcnet32_probe1(unsigned long ioaddr, int int chip_version; char *chipname; struct net_device *dev; - struct pcnet32_access *a = NULL; + const struct pcnet32_access *a = NULL; u8 promaddr[6]; int ret = -ENODEV; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/ppp_generic.c linux-2.6.39-pax/drivers/net/ppp_generic.c --- linux-2.6.39/drivers/net/ppp_generic.c 2011-05-19 10:21:52.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/ppp_generic.c 2011-05-19 13:45:31.000000000 +0200 @@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st 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: @@ -1009,8 +1008,7 @@ ppp_net_ioctl(struct net_device *dev, st 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/qlcnic/qlcnic.h linux-2.6.39-pax/drivers/net/qlcnic/qlcnic.h --- linux-2.6.39/drivers/net/qlcnic/qlcnic.h 2011-05-19 10:21:54.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/qlcnic/qlcnic.h 2011-05-19 14:23:30.000000000 +0200 @@ -1037,7 +1037,7 @@ struct qlcnic_adapter { struct vlan_group *vlgrp; struct qlcnic_npar_info *npars; struct qlcnic_eswitch *eswitch; - struct qlcnic_nic_template *nic_ops; + const struct qlcnic_nic_template *nic_ops; struct qlcnic_adapter_stats stats; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/qlcnic/qlcnic_main.c linux-2.6.39-pax/drivers/net/qlcnic/qlcnic_main.c --- linux-2.6.39/drivers/net/qlcnic/qlcnic_main.c 2011-05-19 10:21:54.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/qlcnic/qlcnic_main.c 2011-05-19 14:23:30.000000000 +0200 @@ -340,13 +340,13 @@ static const struct net_device_ops qlcni #endif }; -static struct qlcnic_nic_template qlcnic_ops = { +static const struct qlcnic_nic_template qlcnic_ops = { .config_bridged_mode = qlcnic_config_bridged_mode, .config_led = qlcnic_config_led, .start_firmware = qlcnic_start_firmware }; -static struct qlcnic_nic_template qlcnic_vf_ops = { +static const struct qlcnic_nic_template qlcnic_vf_ops = { .config_bridged_mode = qlcnicvf_config_bridged_mode, .config_led = qlcnicvf_config_led, .start_firmware = qlcnicvf_start_firmware diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/qlge/qlge.h linux-2.6.39-pax/drivers/net/qlge/qlge.h --- linux-2.6.39/drivers/net/qlge/qlge.h 2011-03-15 19:34:05.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/qlge/qlge.h 2011-05-19 14:23:30.000000000 +0200 @@ -2134,7 +2134,7 @@ struct ql_adapter { struct delayed_work mpi_idc_work; struct delayed_work mpi_core_to_log; struct completion ide_completion; - struct nic_operations *nic_ops; + const struct nic_operations *nic_ops; u16 device_id; struct timer_list timer; atomic_t lb_count; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/qlge/qlge_main.c linux-2.6.39-pax/drivers/net/qlge/qlge_main.c --- linux-2.6.39/drivers/net/qlge/qlge_main.c 2011-05-19 10:21:54.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/qlge/qlge_main.c 2011-05-19 14:23:30.000000000 +0200 @@ -4412,12 +4412,12 @@ error: rtnl_unlock(); } -static struct nic_operations qla8012_nic_ops = { +static const struct nic_operations qla8012_nic_ops = { .get_flash = ql_get_8012_flash_params, .port_initialize = ql_8012_port_initialize, }; -static struct nic_operations qla8000_nic_ops = { +static const struct nic_operations qla8000_nic_ops = { .get_flash = ql_get_8000_flash_params, .port_initialize = ql_8000_port_initialize, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/sfc/falcon.c linux-2.6.39-pax/drivers/net/sfc/falcon.c --- linux-2.6.39/drivers/net/sfc/falcon.c 2011-05-19 10:21:54.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/sfc/falcon.c 2011-05-19 14:23:30.000000000 +0200 @@ -1703,7 +1703,7 @@ static int falcon_set_wol(struct efx_nic ************************************************************************** */ -struct efx_nic_type falcon_a1_nic_type = { +const struct efx_nic_type falcon_a1_nic_type = { .probe = falcon_probe_nic, .remove = falcon_remove_nic, .init = falcon_init_nic, @@ -1744,7 +1744,7 @@ struct efx_nic_type falcon_a1_nic_type = .reset_world_flags = ETH_RESET_IRQ, }; -struct efx_nic_type falcon_b0_nic_type = { +const struct efx_nic_type falcon_b0_nic_type = { .probe = falcon_probe_nic, .remove = falcon_remove_nic, .init = falcon_init_nic, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/sfc/mtd.c linux-2.6.39-pax/drivers/net/sfc/mtd.c --- linux-2.6.39/drivers/net/sfc/mtd.c 2011-05-19 10:21:54.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/sfc/mtd.c 2011-05-19 14:23:30.000000000 +0200 @@ -382,7 +382,7 @@ static int falcon_mtd_sync(struct mtd_in return rc; } -static struct efx_mtd_ops falcon_mtd_ops = { +static const struct efx_mtd_ops falcon_mtd_ops = { .read = falcon_mtd_read, .erase = falcon_mtd_erase, .write = falcon_mtd_write, @@ -560,7 +560,7 @@ static int siena_mtd_sync(struct mtd_inf return rc; } -static struct efx_mtd_ops siena_mtd_ops = { +static const struct efx_mtd_ops siena_mtd_ops = { .read = siena_mtd_read, .erase = siena_mtd_erase, .write = siena_mtd_write, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/sfc/nic.h linux-2.6.39-pax/drivers/net/sfc/nic.h --- linux-2.6.39/drivers/net/sfc/nic.h 2011-05-19 10:21:54.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/sfc/nic.h 2011-05-19 14:23:30.000000000 +0200 @@ -152,9 +152,9 @@ struct siena_nic_data { int wol_filter_id; }; -extern struct efx_nic_type falcon_a1_nic_type; -extern struct efx_nic_type falcon_b0_nic_type; -extern struct efx_nic_type siena_a0_nic_type; +extern const struct efx_nic_type falcon_a1_nic_type; +extern const struct efx_nic_type falcon_b0_nic_type; +extern const struct efx_nic_type siena_a0_nic_type; /************************************************************************** * diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/sfc/siena.c linux-2.6.39-pax/drivers/net/sfc/siena.c --- linux-2.6.39/drivers/net/sfc/siena.c 2011-05-19 10:21:54.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/sfc/siena.c 2011-05-19 14:23:30.000000000 +0200 @@ -599,7 +599,7 @@ static void siena_init_wol(struct efx_ni ************************************************************************** */ -struct efx_nic_type siena_a0_nic_type = { +const struct efx_nic_type siena_a0_nic_type = { .probe = siena_probe_nic, .remove = siena_remove_nic, .init = siena_init_nic, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/sh_eth.c linux-2.6.39-pax/drivers/net/sh_eth.c --- linux-2.6.39/drivers/net/sh_eth.c 2011-05-19 10:21:54.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/sh_eth.c 2011-05-19 14:23:30.000000000 +0200 @@ -1360,7 +1360,7 @@ static void sh_eth_get_strings(struct ne } } -static struct ethtool_ops sh_eth_ethtool_ops = { +static const struct ethtool_ops sh_eth_ethtool_ops = { .get_settings = sh_eth_get_settings, .set_settings = sh_eth_set_settings, .nway_reset = sh_eth_nway_reset, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/stmmac/stmmac_ethtool.c linux-2.6.39-pax/drivers/net/stmmac/stmmac_ethtool.c --- linux-2.6.39/drivers/net/stmmac/stmmac_ethtool.c 2011-03-15 19:34:06.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/stmmac/stmmac_ethtool.c 2011-05-19 14:23:30.000000000 +0200 @@ -348,7 +348,7 @@ static int stmmac_set_wol(struct net_dev return 0; } -static struct ethtool_ops stmmac_ethtool_ops = { +static const struct ethtool_ops stmmac_ethtool_ops = { .begin = stmmac_check_if_running, .get_drvinfo = stmmac_ethtool_getdrvinfo, .get_settings = stmmac_ethtool_getsettings, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/sungem_phy.c linux-2.6.39-pax/drivers/net/sungem_phy.c --- linux-2.6.39/drivers/net/sungem_phy.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/sungem_phy.c 2011-05-19 14:23:30.000000000 +0200 @@ -886,7 +886,7 @@ static int marvell_read_link(struct mii_ SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full) /* Broadcom BCM 5201 */ -static struct mii_phy_ops bcm5201_phy_ops = { +static const struct mii_phy_ops bcm5201_phy_ops = { .init = bcm5201_init, .suspend = bcm5201_suspend, .setup_aneg = genmii_setup_aneg, @@ -905,7 +905,7 @@ static struct mii_phy_def bcm5201_phy_de }; /* Broadcom BCM 5221 */ -static struct mii_phy_ops bcm5221_phy_ops = { +static const struct mii_phy_ops bcm5221_phy_ops = { .suspend = bcm5221_suspend, .init = bcm5221_init, .setup_aneg = genmii_setup_aneg, @@ -924,7 +924,7 @@ static struct mii_phy_def bcm5221_phy_de }; /* Broadcom BCM 5241 */ -static struct mii_phy_ops bcm5241_phy_ops = { +static const struct mii_phy_ops bcm5241_phy_ops = { .suspend = bcm5241_suspend, .init = bcm5241_init, .setup_aneg = genmii_setup_aneg, @@ -942,7 +942,7 @@ static struct mii_phy_def bcm5241_phy_de }; /* Broadcom BCM 5400 */ -static struct mii_phy_ops bcm5400_phy_ops = { +static const struct mii_phy_ops bcm5400_phy_ops = { .init = bcm5400_init, .suspend = bcm5400_suspend, .setup_aneg = bcm54xx_setup_aneg, @@ -961,7 +961,7 @@ static struct mii_phy_def bcm5400_phy_de }; /* Broadcom BCM 5401 */ -static struct mii_phy_ops bcm5401_phy_ops = { +static const struct mii_phy_ops bcm5401_phy_ops = { .init = bcm5401_init, .suspend = bcm5401_suspend, .setup_aneg = bcm54xx_setup_aneg, @@ -980,7 +980,7 @@ static struct mii_phy_def bcm5401_phy_de }; /* Broadcom BCM 5411 */ -static struct mii_phy_ops bcm5411_phy_ops = { +static const struct mii_phy_ops bcm5411_phy_ops = { .init = bcm5411_init, .suspend = generic_suspend, .setup_aneg = bcm54xx_setup_aneg, @@ -999,7 +999,7 @@ static struct mii_phy_def bcm5411_phy_de }; /* Broadcom BCM 5421 */ -static struct mii_phy_ops bcm5421_phy_ops = { +static const struct mii_phy_ops bcm5421_phy_ops = { .init = bcm5421_init, .suspend = generic_suspend, .setup_aneg = bcm54xx_setup_aneg, @@ -1019,7 +1019,7 @@ static struct mii_phy_def bcm5421_phy_de }; /* Broadcom BCM 5421 built-in K2 */ -static struct mii_phy_ops bcm5421k2_phy_ops = { +static const struct mii_phy_ops bcm5421k2_phy_ops = { .init = bcm5421_init, .suspend = generic_suspend, .setup_aneg = bcm54xx_setup_aneg, @@ -1037,7 +1037,7 @@ static struct mii_phy_def bcm5421k2_phy_ .ops = &bcm5421k2_phy_ops }; -static struct mii_phy_ops bcm5461_phy_ops = { +static const struct mii_phy_ops bcm5461_phy_ops = { .init = bcm5421_init, .suspend = generic_suspend, .setup_aneg = bcm54xx_setup_aneg, @@ -1057,7 +1057,7 @@ static struct mii_phy_def bcm5461_phy_de }; /* Broadcom BCM 5462 built-in Vesta */ -static struct mii_phy_ops bcm5462V_phy_ops = { +static const struct mii_phy_ops bcm5462V_phy_ops = { .init = bcm5421_init, .suspend = generic_suspend, .setup_aneg = bcm54xx_setup_aneg, @@ -1076,7 +1076,7 @@ static struct mii_phy_def bcm5462V_phy_d }; /* Marvell 88E1101 amd 88E1111 */ -static struct mii_phy_ops marvell88e1101_phy_ops = { +static const struct mii_phy_ops marvell88e1101_phy_ops = { .suspend = generic_suspend, .setup_aneg = marvell_setup_aneg, .setup_forced = marvell_setup_forced, @@ -1084,7 +1084,7 @@ static struct mii_phy_ops marvell88e1101 .read_link = marvell_read_link }; -static struct mii_phy_ops marvell88e1111_phy_ops = { +static const struct mii_phy_ops marvell88e1111_phy_ops = { .init = marvell88e1111_init, .suspend = generic_suspend, .setup_aneg = marvell_setup_aneg, @@ -1122,7 +1122,7 @@ static struct mii_phy_def marvell88e1111 }; /* Generic implementation for most 10/100 PHYs */ -static struct mii_phy_ops generic_phy_ops = { +static const struct mii_phy_ops generic_phy_ops = { .setup_aneg = genmii_setup_aneg, .setup_forced = genmii_setup_forced, .poll_link = genmii_poll_link, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/tg3.h linux-2.6.39-pax/drivers/net/tg3.h --- linux-2.6.39/drivers/net/tg3.h 2011-05-19 10:21:55.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/tg3.h 2011-05-19 13:45:31.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/tile/tilepro.c linux-2.6.39-pax/drivers/net/tile/tilepro.c --- linux-2.6.39/drivers/net/tile/tilepro.c 2011-05-19 10:21:55.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/tile/tilepro.c 2011-05-19 14:23:30.000000000 +0200 @@ -2263,7 +2263,7 @@ static int tile_net_get_mac(struct net_d } -static struct net_device_ops tile_net_ops = { +static const struct net_device_ops tile_net_ops = { .ndo_open = tile_net_open, .ndo_stop = tile_net_stop, .ndo_start_xmit = tile_net_tx, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/tulip/de2104x.c linux-2.6.39-pax/drivers/net/tulip/de2104x.c --- linux-2.6.39/drivers/net/tulip/de2104x.c 2011-03-15 19:34:07.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/tulip/de2104x.c 2011-05-19 13:45:31.000000000 +0200 @@ -1817,6 +1817,8 @@ static void __devinit de21041_get_srom_i struct de_srom_info_leaf *il; void *bufp; + pax_track_stack(); + /* download entire eeprom */ for (i = 0; i < DE_EEPROM_WORDS; i++) ((__le16 *)ee_data)[i] = diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/tulip/de4x5.c linux-2.6.39-pax/drivers/net/tulip/de4x5.c --- linux-2.6.39/drivers/net/tulip/de4x5.c 2011-05-19 10:21:56.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/tulip/de4x5.c 2011-05-19 13:45:31.000000000 +0200 @@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru 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 @@ de4x5_ioctl(struct net_device *dev, stru 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/usb/asix.c linux-2.6.39-pax/drivers/net/usb/asix.c --- linux-2.6.39/drivers/net/usb/asix.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/usb/asix.c 2011-05-19 14:23:30.000000000 +0200 @@ -1098,7 +1098,7 @@ out: return ret; } -static struct ethtool_ops ax88178_ethtool_ops = { +static const struct ethtool_ops ax88178_ethtool_ops = { .get_drvinfo = asix_get_drvinfo, .get_link = asix_get_link, .get_msglevel = usbnet_get_msglevel, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/usb/cdc_ncm.c linux-2.6.39-pax/drivers/net/usb/cdc_ncm.c --- linux-2.6.39/drivers/net/usb/cdc_ncm.c 2011-05-19 10:21:56.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/usb/cdc_ncm.c 2011-05-19 14:23:30.000000000 +0200 @@ -141,7 +141,7 @@ struct cdc_ncm_ctx { static void cdc_ncm_tx_timeout(unsigned long arg); static const struct driver_info cdc_ncm_info; static struct usb_driver cdc_ncm_driver; -static struct ethtool_ops cdc_ncm_ethtool_ops; +static const struct ethtool_ops cdc_ncm_ethtool_ops; static const struct usb_device_id cdc_devs[] = { { USB_INTERFACE_INFO(USB_CLASS_COMM, @@ -1257,7 +1257,7 @@ static struct usb_driver cdc_ncm_driver .supports_autosuspend = 1, }; -static struct ethtool_ops cdc_ncm_ethtool_ops = { +static const struct ethtool_ops cdc_ncm_ethtool_ops = { .get_drvinfo = cdc_ncm_get_drvinfo, .get_link = usbnet_get_link, .get_msglevel = usbnet_get_msglevel, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/usb/hso.c linux-2.6.39-pax/drivers/net/usb/hso.c --- linux-2.6.39/drivers/net/usb/hso.c 2011-05-19 10:21:56.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/usb/hso.c 2011-05-19 13:45:31.000000000 +0200 @@ -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 @@ struct hso_serial { /* 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 @@ static void put_rxbuf_data_and_resubmit_ 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 @@ static void hso_std_serial_read_bulk_cal 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 @@ static int hso_serial_open(struct tty_st 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 @@ static int hso_serial_open(struct tty_st 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 @@ static void hso_serial_close(struct tty_ /* 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 @@ static void hso_serial_set_termios(struc /* 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 @@ static void intr_callback(struct urb *ur 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 @@ static int hso_resume(struct usb_interfa /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/usb/ipheth.c linux-2.6.39-pax/drivers/net/usb/ipheth.c --- linux-2.6.39/drivers/net/usb/ipheth.c 2011-05-19 10:21:56.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/usb/ipheth.c 2011-05-19 14:23:30.000000000 +0200 @@ -421,7 +421,7 @@ static u32 ipheth_ethtool_op_get_link(st return netif_carrier_ok(dev->net); } -static struct ethtool_ops ops = { +static const struct ethtool_ops ops = { .get_link = ipheth_ethtool_op_get_link }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/usb/sierra_net.c linux-2.6.39-pax/drivers/net/usb/sierra_net.c --- linux-2.6.39/drivers/net/usb/sierra_net.c 2011-03-15 19:34:07.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/usb/sierra_net.c 2011-05-19 14:23:30.000000000 +0200 @@ -618,7 +618,7 @@ static u32 sierra_net_get_link(struct ne return sierra_net_get_private(dev)->link_up && netif_running(net); } -static struct ethtool_ops sierra_net_ethtool_ops = { +static const struct ethtool_ops sierra_net_ethtool_ops = { .get_drvinfo = sierra_net_get_drvinfo, .get_link = sierra_net_get_link, .get_msglevel = usbnet_get_msglevel, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.39-pax/drivers/net/vmxnet3/vmxnet3_ethtool.c --- linux-2.6.39/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-05-19 10:21:59.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-05-19 13:45:31.000000000 +0200 @@ -631,8 +631,7 @@ vmxnet3_set_rss_indir(struct net_device * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/vxge/vxge-config.h linux-2.6.39-pax/drivers/net/vxge/vxge-config.h --- linux-2.6.39/drivers/net/vxge/vxge-config.h 2011-05-19 10:21:59.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/vxge/vxge-config.h 2011-05-19 14:23:30.000000000 +0200 @@ -834,7 +834,7 @@ struct vxge_hw_device_hw_info { struct vxge_hw_device_attr { void __iomem *bar0; struct pci_dev *pdev; - struct vxge_hw_uld_cbs uld_callbacks; + struct vxge_hw_uld_cbs uld_callbacks; }; #define VXGE_HW_DEVICE_LINK_STATE_SET(hldev, ls) (hldev->link_state = ls) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/vxge/vxge-main.c linux-2.6.39-pax/drivers/net/vxge/vxge-main.c --- linux-2.6.39/drivers/net/vxge/vxge-main.c 2011-05-19 10:21:59.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/vxge/vxge-main.c 2011-05-19 13:45:31.000000000 +0200 @@ -97,6 +97,8 @@ static inline void VXGE_COMPLETE_VPATH_T struct sk_buff *completed[NR_SKB_COMPLETED]; int more; + pax_track_stack(); + do { more = 0; skb_ptr = completed; @@ -1927,6 +1929,8 @@ static enum vxge_hw_status vxge_rth_conf u8 mtable[256] = {0}; /* CPU to vpath mapping */ int index; + pax_track_stack(); + /* * Filling * - itable with bucket numbers diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wan/cycx_x25.c linux-2.6.39-pax/drivers/net/wan/cycx_x25.c --- linux-2.6.39/drivers/net/wan/cycx_x25.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/wan/cycx_x25.c 2011-05-19 13:45:31.000000000 +0200 @@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned unsigned char hex[1024], * phex = hex; + pax_track_stack(); + if (len >= (sizeof(hex) / 2)) len = (sizeof(hex) / 2) - 1; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wan/lapbether.c linux-2.6.39-pax/drivers/net/wan/lapbether.c --- linux-2.6.39/drivers/net/wan/lapbether.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/wan/lapbether.c 2011-05-19 14:23:30.000000000 +0200 @@ -259,7 +259,7 @@ static int lapbeth_set_mac_address(struc } -static struct lapb_register_struct lapbeth_callbacks = { +static const struct lapb_register_struct lapbeth_callbacks = { .connect_confirmation = lapbeth_connected, .connect_indication = lapbeth_connected, .disconnect_confirmation = lapbeth_disconnected, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wan/x25_asy.c linux-2.6.39-pax/drivers/net/wan/x25_asy.c --- linux-2.6.39/drivers/net/wan/x25_asy.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/wan/x25_asy.c 2011-05-19 14:23:30.000000000 +0200 @@ -434,7 +434,7 @@ static void x25_asy_disconnected(struct netif_rx(skb); } -static struct lapb_register_struct x25_asy_callbacks = { +static const struct lapb_register_struct x25_asy_callbacks = { .connect_confirmation = x25_asy_connected, .connect_indication = x25_asy_connected, .disconnect_confirmation = x25_asy_disconnected, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.39-pax/drivers/net/wimax/i2400m/usb-fw.c --- linux-2.6.39/drivers/net/wimax/i2400m/usb-fw.c 2011-05-19 10:22:01.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wimax/i2400m/usb-fw.c 2011-05-19 13:45:31.000000000 +0200 @@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru int do_autopm = 1; DECLARE_COMPLETION_ONSTACK(notif_completion); + pax_track_stack(); + d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n", i2400m, ack, ack_size); BUG_ON(_ack == i2400m->bm_ack_buf); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/airo.c linux-2.6.39-pax/drivers/net/wireless/airo.c --- linux-2.6.39/drivers/net/wireless/airo.c 2011-05-19 10:22:01.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/airo.c 2011-05-19 13:45:31.000000000 +0200 @@ -3001,6 +3001,8 @@ static void airo_process_scan_results (s BSSListElement * loop_net; BSSListElement * tmp_net; + pax_track_stack(); + /* Blow away current list of scan results */ list_for_each_entry_safe (loop_net, tmp_net, &ai->network_list, list) { list_move_tail (&loop_net->list, &ai->network_free_list); @@ -3792,6 +3794,8 @@ static u16 setup_card(struct airo_info * WepKeyRid wkr; int rc; + pax_track_stack(); + memset( &mySsid, 0, sizeof( mySsid ) ); kfree (ai->flash); ai->flash = NULL; @@ -4760,6 +4764,8 @@ static int proc_stats_rid_open( struct i __le32 *vals = stats.vals; int len; + pax_track_stack(); + if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL) return -ENOMEM; data = file->private_data; @@ -5483,6 +5489,8 @@ static int proc_BSSList_open( struct ino /* If doLoseSync is not 1, we won't do a Lose Sync */ int doLoseSync = -1; + pax_track_stack(); + if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL) return -ENOMEM; data = file->private_data; @@ -7190,6 +7198,8 @@ static int airo_get_aplist(struct net_de int i; int loseSync = capable(CAP_NET_ADMIN) ? 1: -1; + pax_track_stack(); + qual = kmalloc(IW_MAX_AP * sizeof(*qual), GFP_KERNEL); if (!qual) return -ENOMEM; @@ -7750,6 +7760,8 @@ static void airo_read_wireless_stats(str CapabilityRid cap_rid; __le32 *vals = stats_rid.vals; + pax_track_stack(); + /* Get stats out of the card */ clear_bit(JOB_WSTATS, &local->jobs); if (local->power.event) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.39-pax/drivers/net/wireless/ath/ath5k/debug.c --- linux-2.6.39/drivers/net/wireless/ath/ath5k/debug.c 2011-05-19 10:22:02.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/ath/ath5k/debug.c 2011-05-19 13:45:31.000000000 +0200 @@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f unsigned int v; u64 tsf; + pax_track_stack(); + v = ath5k_hw_reg_read(sc->ah, AR5K_BEACON); len += snprintf(buf+len, sizeof(buf)-len, "%-24s0x%08x\tintval: %d\tTIM: 0x%x\n", @@ -323,6 +325,8 @@ static ssize_t read_file_debug(struct fi unsigned int len = 0; unsigned int i; + pax_track_stack(); + len += snprintf(buf+len, sizeof(buf)-len, "DEBUG LEVEL: 0x%08x\n\n", sc->debug.level); @@ -384,6 +388,8 @@ static ssize_t read_file_antenna(struct unsigned int i; unsigned int v; + pax_track_stack(); + len += snprintf(buf+len, sizeof(buf)-len, "antenna mode\t%d\n", sc->ah->ah_ant_mode); len += snprintf(buf+len, sizeof(buf)-len, "default antenna\t%d\n", @@ -494,6 +500,8 @@ static ssize_t read_file_misc(struct fil unsigned int len = 0; u32 filt = ath5k_hw_get_rx_filter(sc->ah); + pax_track_stack(); + len += snprintf(buf+len, sizeof(buf)-len, "bssid-mask: %pM\n", sc->bssidmask); len += snprintf(buf+len, sizeof(buf)-len, "filter-flags: 0x%x ", @@ -550,6 +558,8 @@ static ssize_t read_file_frameerrors(str unsigned int len = 0; int i; + pax_track_stack(); + len += snprintf(buf+len, sizeof(buf)-len, "RX\n---------------------\n"); len += snprintf(buf+len, sizeof(buf)-len, "CRC\t%u\t(%u%%)\n", @@ -667,6 +677,8 @@ static ssize_t read_file_ani(struct file char buf[700]; unsigned int len = 0; + pax_track_stack(); + len += snprintf(buf+len, sizeof(buf)-len, "HW has PHY error counters:\t%s\n", sc->ah->ah_capabilities.cap_has_phyerr_counters ? @@ -827,6 +839,8 @@ static ssize_t read_file_queue(struct fi struct ath5k_buf *bf, *bf0; int i, n; + pax_track_stack(); + len += snprintf(buf+len, sizeof(buf)-len, "available txbuffers: %d\n", sc->txbuf_len); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-2.6.39-pax/drivers/net/wireless/ath/ath9k/ar9003_calib.c --- linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-03-15 19:34:10.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-05-19 13:45:31.000000000 +0200 @@ -734,6 +734,8 @@ static void ar9003_hw_tx_iq_cal(struct a s32 i, j, ip, im, nmeasurement; u8 nchains = get_streams(common->tx_chainmask); + pax_track_stack(); + for (ip = 0; ip < MPASS; ip++) { REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1, AR_PHY_TX_IQCAQL_CONTROL_1_IQCORR_I_Q_COFF_DELPT, @@ -856,6 +858,8 @@ static void ar9003_hw_tx_iq_cal_post_pro int i, ip, im, j; int nmeasurement; + pax_track_stack(); + for (i = 0; i < AR9300_MAX_CHAINS; i++) { if (ah->txchainmask & (1 << i)) num_chains++; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-2.6.39-pax/drivers/net/wireless/ath/ath9k/ar9003_paprd.c --- linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-03-15 19:34:10.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-05-19 13:45:31.000000000 +0200 @@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L, int theta_low_bin = 0; int i; + pax_track_stack(); + /* disregard any bin that contains <= 16 samples */ thresh_accum_cnt = 16; scale_factor = 5; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.39-pax/drivers/net/wireless/ath/ath9k/debug.c --- linux-2.6.39/drivers/net/wireless/ath/ath9k/debug.c 2011-05-19 10:22:03.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/ath/ath9k/debug.c 2011-05-19 13:45:31.000000000 +0200 @@ -335,6 +335,8 @@ static ssize_t read_file_interrupt(struc char buf[512]; unsigned int len = 0; + pax_track_stack(); + if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) { len += snprintf(buf + len, sizeof(buf) - len, "%8s: %10u\n", "RXLP", sc->debug.stats.istats.rxlp); @@ -422,6 +424,8 @@ static ssize_t read_file_wiphy(struct fi u8 addr[ETH_ALEN]; u32 tmp; + pax_track_stack(); + len += snprintf(buf + len, sizeof(buf) - len, "%s (chan=%d center-freq: %d MHz channel-type: %d (%s))\n", wiphy_name(sc->hw->wiphy), diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/ath/ath9k/htc.h linux-2.6.39-pax/drivers/net/wireless/ath/ath9k/htc.h --- linux-2.6.39/drivers/net/wireless/ath/ath9k/htc.h 2011-05-19 10:22:03.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/ath/ath9k/htc.h 2011-05-19 14:23:30.000000000 +0200 @@ -42,7 +42,7 @@ #define TSF_TO_TU(_h, _l) \ ((((u32)(_h)) << 22) | (((u32)(_l)) >> 10)) -extern struct ieee80211_ops ath9k_htc_ops; +extern const struct ieee80211_ops ath9k_htc_ops; extern int htc_modparam_nohwcrypt; enum htc_phymode { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/ath/ath9k/htc_drv_main.c linux-2.6.39-pax/drivers/net/wireless/ath/ath9k/htc_drv_main.c --- linux-2.6.39/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2011-05-19 10:22:03.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2011-05-19 14:23:27.000000000 +0200 @@ -737,6 +737,8 @@ static ssize_t read_file_tgt_stats(struc unsigned int len = 0; int ret = 0; + pax_track_stack(); + memset(&cmd_rsp, 0, sizeof(cmd_rsp)); WMI_CMD(WMI_TGT_STATS_CMDID); @@ -782,6 +784,8 @@ static ssize_t read_file_xmit(struct fil char buf[512]; unsigned int len = 0; + pax_track_stack(); + len += snprintf(buf + len, sizeof(buf) - len, "%20s : %10u\n", "Buffers queued", priv->debug.tx_stats.buf_queued); @@ -831,6 +835,8 @@ static ssize_t read_file_recv(struct fil char buf[512]; unsigned int len = 0; + pax_track_stack(); + len += snprintf(buf + len, sizeof(buf) - len, "%20s : %10u\n", "SKBs allocated", priv->debug.rx_stats.skb_allocated); @@ -1816,7 +1822,7 @@ static void ath9k_htc_set_coverage_class mutex_unlock(&priv->mutex); } -struct ieee80211_ops ath9k_htc_ops = { +const struct ieee80211_ops ath9k_htc_ops = { .tx = ath9k_htc_tx, .start = ath9k_htc_start, .stop = ath9k_htc_stop, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/ath/ath9k/hw.h linux-2.6.39-pax/drivers/net/wireless/ath/ath9k/hw.h --- linux-2.6.39/drivers/net/wireless/ath/ath9k/hw.h 2011-05-19 10:22:03.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/ath/ath9k/hw.h 2011-05-19 14:23:30.000000000 +0200 @@ -753,9 +753,7 @@ struct ath_hw { } enable_32kHz_clock; /* Private to hardware code */ - struct ath_hw_private_ops private_ops; - /* Accessed by the lower level driver */ - struct ath_hw_ops ops; + struct ath_hw_private_ops private_ops;struct ath_hw_ops ops; /* Used to program the radio on non single-chip devices */ u32 *analogBank0Data; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/b43/debugfs.c linux-2.6.39-pax/drivers/net/wireless/b43/debugfs.c --- linux-2.6.39/drivers/net/wireless/b43/debugfs.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/wireless/b43/debugfs.c 2011-05-19 14:23:30.000000000 +0200 @@ -43,7 +43,7 @@ static struct dentry *rootdir; 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.39-pax/drivers/net/wireless/b43legacy/debugfs.c --- linux-2.6.39/drivers/net/wireless/b43legacy/debugfs.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/wireless/b43legacy/debugfs.c 2011-05-19 14:23:30.000000000 +0200 @@ -44,7 +44,7 @@ static struct dentry *rootdir; 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.39-pax/drivers/net/wireless/ipw2x00/ipw2100.c --- linux-2.6.39/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-19 10:22:04.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-19 13:45:31.000000000 +0200 @@ -2100,6 +2100,8 @@ static int ipw2100_set_essid(struct ipw2 int err; DECLARE_SSID_BUF(ssid); + pax_track_stack(); + IPW_DEBUG_HC("SSID: '%s'\n", print_ssid(ssid, essid, ssid_len)); if (ssid_len) @@ -5449,6 +5451,8 @@ static int ipw2100_set_key(struct ipw210 struct ipw2100_wep_key *wep_key = (void *)cmd.host_command_parameters; int err; + pax_track_stack(); + IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n", idx, keylen, len); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.39-pax/drivers/net/wireless/ipw2x00/libipw_rx.c --- linux-2.6.39/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-05-19 10:22:04.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-05-19 13:45:32.000000000 +0200 @@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons unsigned long flags; DECLARE_SSID_BUF(ssid); + pax_track_stack(); + LIBIPW_DEBUG_SCAN("'%s' (%pM" "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n", print_ssid(ssid, info_element->data, info_element->len), diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-3945.c linux-2.6.39-pax/drivers/net/wireless/iwlegacy/iwl-3945.c --- linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-3945.c 2011-05-19 10:22:04.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/iwlegacy/iwl-3945.c 2011-05-19 14:23:30.000000000 +0200 @@ -2630,7 +2630,7 @@ static int iwl3945_load_bsm(struct iwl_p return 0; } -static struct iwl_hcmd_ops iwl3945_hcmd = { +static const struct iwl_hcmd_ops iwl3945_hcmd = { .rxon_assoc = iwl3945_send_rxon_assoc, .commit_rxon = iwl3945_commit_rxon, }; @@ -2675,7 +2675,7 @@ static const struct iwl_legacy_ops iwl39 .manage_ibss_station = iwl3945_manage_ibss_station, }; -static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = { +static const struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = { .get_hcmd_size = iwl3945_get_hcmd_size, .build_addsta_hcmd = iwl3945_build_addsta_hcmd, .request_scan = iwl3945_request_scan, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.c linux-2.6.39-pax/drivers/net/wireless/iwlegacy/iwl-4965.c --- linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.c 2011-05-19 10:22:04.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/iwlegacy/iwl-4965.c 2011-05-19 14:23:30.000000000 +0200 @@ -1904,7 +1904,7 @@ static void iwl4965_rx_handler_setup(str priv->rx_handlers[BEACON_NOTIFICATION] = iwl4965_rx_beacon_notif; } -static struct iwl_hcmd_ops iwl4965_hcmd = { +static const struct iwl_hcmd_ops iwl4965_hcmd = { .rxon_assoc = iwl4965_send_rxon_assoc, .commit_rxon = iwl4965_commit_rxon, .set_rxon_chain = iwl4965_set_rxon_chain, @@ -2056,7 +2056,7 @@ static void iwl4965_config_ap(struct iwl iwl4965_send_beacon_cmd(priv); } -static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = { +static const struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = { .get_hcmd_size = iwl4965_get_hcmd_size, .build_addsta_hcmd = iwl4965_build_addsta_hcmd, .request_scan = iwl4965_request_scan, @@ -2114,7 +2114,7 @@ static const struct iwl_legacy_ops iwl49 .update_bcast_stations = iwl4965_update_bcast_stations, }; -struct ieee80211_ops iwl4965_hw_ops = { +const struct ieee80211_ops iwl4965_hw_ops = { .tx = iwl4965_mac_tx, .start = iwl4965_mac_start, .stop = iwl4965_mac_stop, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.h linux-2.6.39-pax/drivers/net/wireless/iwlegacy/iwl-4965.h --- linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.h 2011-05-19 10:22:04.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/iwlegacy/iwl-4965.h 2011-05-19 14:23:30.000000000 +0200 @@ -70,7 +70,7 @@ extern struct iwl_cfg iwl4965_cfg; extern struct iwl_mod_params iwl4965_mod_params; -extern struct ieee80211_ops iwl4965_hw_ops; +extern const struct ieee80211_ops iwl4965_hw_ops; /* tx queue */ void iwl4965_free_tfds_in_queue(struct iwl_priv *priv, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-core.h linux-2.6.39-pax/drivers/net/wireless/iwlegacy/iwl-core.h --- linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-core.h 2011-05-19 10:22:04.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/iwlegacy/iwl-core.h 2011-05-19 14:23:30.000000000 +0200 @@ -150,7 +150,7 @@ struct iwl_lib_ops { int (*set_channel_switch)(struct iwl_priv *priv, struct ieee80211_channel_switch *ch_switch); /* power management */ - struct iwl_apm_ops apm_ops; + const struct iwl_apm_ops apm_ops; /* power */ int (*send_tx_power) (struct iwl_priv *priv); @@ -160,12 +160,12 @@ struct iwl_lib_ops { struct iwl_eeprom_ops eeprom_ops; /* temperature */ - struct iwl_temp_ops temp_ops; + const struct iwl_temp_ops temp_ops; /* check for plcp health */ bool (*check_plcp_health)(struct iwl_priv *priv, struct iwl_rx_packet *pkt); - struct iwl_debugfs_ops debugfs_ops; + const struct iwl_debugfs_ops debugfs_ops; }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-6000.c --- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-05-19 10:22:04.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-05-19 14:23:30.000000000 +0200 @@ -422,11 +422,11 @@ static struct iwl_lib_ops iwl6030_lib = } }; -static struct iwl_nic_ops iwl6050_nic_ops = { +static const struct iwl_nic_ops iwl6050_nic_ops = { .additional_nic_config = &iwl6050_additional_nic_config, }; -static struct iwl_nic_ops iwl6150_nic_ops = { +static const struct iwl_nic_ops iwl6150_nic_ops = { .additional_nic_config = &iwl6150_additional_nic_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c --- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c 2011-05-19 10:22:04.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c 2011-05-19 14:23:30.000000000 +0200 @@ -363,7 +363,7 @@ static int iwlagn_set_pan_params(struct return ret; } -struct iwl_hcmd_ops iwlagn_hcmd = { +const struct iwl_hcmd_ops iwlagn_hcmd = { .rxon_assoc = iwlagn_send_rxon_assoc, .commit_rxon = iwlagn_commit_rxon, .set_rxon_chain = iwlagn_set_rxon_chain, @@ -372,7 +372,7 @@ struct iwl_hcmd_ops iwlagn_hcmd = { .set_pan_params = iwlagn_set_pan_params, }; -struct iwl_hcmd_ops iwlagn_bt_hcmd = { +const struct iwl_hcmd_ops iwlagn_bt_hcmd = { .rxon_assoc = iwlagn_send_rxon_assoc, .commit_rxon = iwlagn_commit_rxon, .set_rxon_chain = iwlagn_set_rxon_chain, @@ -381,7 +381,7 @@ struct iwl_hcmd_ops iwlagn_bt_hcmd = { .set_pan_params = iwlagn_set_pan_params, }; -struct iwl_hcmd_utils_ops iwlagn_hcmd_utils = { +const struct iwl_hcmd_utils_ops iwlagn_hcmd_utils = { .get_hcmd_size = iwlagn_get_hcmd_size, .build_addsta_hcmd = iwlagn_build_addsta_hcmd, .gain_computation = iwlagn_gain_computation, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-agn-rs.c --- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-05-19 10:22:04.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-05-19 13:45:32.000000000 +0200 @@ -883,6 +883,8 @@ static void rs_tx_status(void *priv_r, s struct iwl_station_priv *sta_priv = (void *)sta->drv_priv; struct iwl_rxon_context *ctx = sta_priv->common.ctx; + pax_track_stack(); + IWL_DEBUG_RATE_LIMIT(priv, "get frame ack response, update rate scale window\n"); /* Treat uninitialized rate scaling data same as non-existing. */ @@ -2894,6 +2896,8 @@ static void rs_fill_link_cmd(struct iwl_ container_of(lq_sta, struct iwl_station_priv, lq_sta); struct iwl_link_quality_cmd *lq_cmd = &lq_sta->lq; + pax_track_stack(); + /* Override starting rate (index 0) if needed for debug purposes */ rs_dbgfs_set_mcs(lq_sta, &new_rate, index); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn.h linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-agn.h --- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn.h 2011-05-19 10:22:04.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-agn.h 2011-05-19 14:23:30.000000000 +0200 @@ -109,9 +109,9 @@ extern struct iwl_cfg iwl230_bg_cfg; extern struct iwl_cfg iwl230_bgn_cfg; extern struct iwl_mod_params iwlagn_mod_params; -extern struct iwl_hcmd_ops iwlagn_hcmd; -extern struct iwl_hcmd_ops iwlagn_bt_hcmd; -extern struct iwl_hcmd_utils_ops iwlagn_hcmd_utils; +extern const struct iwl_hcmd_ops iwlagn_hcmd; +extern const struct iwl_hcmd_ops iwlagn_bt_hcmd; +extern const struct iwl_hcmd_utils_ops iwlagn_hcmd_utils; extern struct ieee80211_ops iwlagn_hw_ops; extern struct ieee80211_ops iwl4965_hw_ops; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-core.h linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-core.h --- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-core.h 2011-05-19 10:22:04.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-core.h 2011-05-19 14:23:30.000000000 +0200 @@ -198,28 +198,25 @@ struct iwl_lib_ops { int (*set_channel_switch)(struct iwl_priv *priv, struct ieee80211_channel_switch *ch_switch); /* power management */ - struct iwl_apm_ops apm_ops; + const struct iwl_apm_ops apm_ops; /* power */ int (*send_tx_power) (struct iwl_priv *priv); void (*update_chain_flags)(struct iwl_priv *priv); /* isr */ - struct iwl_isr_ops isr_ops; + const struct iwl_isr_ops isr_ops; /* eeprom operations (as defined in iwl-eeprom.h) */ struct iwl_eeprom_ops eeprom_ops; /* temperature */ - struct iwl_temp_ops temp_ops; + const struct iwl_temp_ops temp_ops; int (*txfifo_flush)(struct iwl_priv *priv, u16 flush_control); void (*dev_txfifo_flush)(struct iwl_priv *priv, u16 flush_control); - struct iwl_debugfs_ops debugfs_ops; - - /* thermal throttling */ - struct iwl_tt_ops tt_ops; + const struct iwl_debugfs_ops debugfs_ops;const struct iwl_tt_ops tt_ops; }; struct iwl_led_ops { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-debug.h --- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-15 19:34:13.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-05-19 13:45:32.000000000 +0200 @@ -68,8 +68,8 @@ do { } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-debugfs.c --- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-05-19 10:22:04.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-05-19 13:45:32.000000000 +0200 @@ -549,6 +549,8 @@ static ssize_t iwl_dbgfs_status_read(str int pos = 0; const size_t bufsz = sizeof(buf); + pax_track_stack(); + pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n", test_bit(STATUS_HCMD_ACTIVE, &priv->status)); pos += scnprintf(buf + pos, bufsz - pos, "STATUS_INT_ENABLED:\t %d\n", @@ -681,6 +683,8 @@ static ssize_t iwl_dbgfs_qos_read(struct char buf[256 * NUM_IWL_RXON_CTX]; const size_t bufsz = sizeof(buf); + pax_track_stack(); + for_each_context(priv, ctx) { pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n", ctx->ctxid); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwmc3200wifi/cfg80211.c linux-2.6.39-pax/drivers/net/wireless/iwmc3200wifi/cfg80211.c --- linux-2.6.39/drivers/net/wireless/iwmc3200wifi/cfg80211.c 2011-05-19 10:22:05.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/iwmc3200wifi/cfg80211.c 2011-05-19 14:23:30.000000000 +0200 @@ -763,7 +763,7 @@ static int iwm_cfg80211_flush_pmksa(stru } -static struct cfg80211_ops iwm_cfg80211_ops = { +static const struct cfg80211_ops iwm_cfg80211_ops = { .change_virtual_intf = iwm_cfg80211_change_iface, .add_key = iwm_cfg80211_add_key, .get_key = iwm_cfg80211_get_key, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.39-pax/drivers/net/wireless/iwmc3200wifi/debugfs.c --- linux-2.6.39/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-05-19 13:45:32.000000000 +0200 @@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s int buf_len = 512; size_t len = 0; + pax_track_stack(); + if (*ppos != 0) return 0; if (count < sizeof(buf)) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/libertas/cfg.c linux-2.6.39-pax/drivers/net/wireless/libertas/cfg.c --- linux-2.6.39/drivers/net/wireless/libertas/cfg.c 2011-05-19 10:22:05.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/libertas/cfg.c 2011-05-19 14:23:30.000000000 +0200 @@ -2003,7 +2003,7 @@ static int lbs_leave_ibss(struct wiphy * * Initialization */ -static struct cfg80211_ops lbs_cfg80211_ops = { +static const struct cfg80211_ops lbs_cfg80211_ops = { .set_channel = lbs_cfg_set_channel, .scan = lbs_cfg_scan, .connect = lbs_cfg_connect, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/libertas/debugfs.c linux-2.6.39-pax/drivers/net/wireless/libertas/debugfs.c --- linux-2.6.39/drivers/net/wireless/libertas/debugfs.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/wireless/libertas/debugfs.c 2011-05-19 14:23:30.000000000 +0200 @@ -702,7 +702,7 @@ out_unlock: 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/rndis_wlan.c linux-2.6.39-pax/drivers/net/wireless/rndis_wlan.c --- linux-2.6.39/drivers/net/wireless/rndis_wlan.c 2011-03-15 19:34:14.000000000 +0100 +++ linux-2.6.39-pax/drivers/net/wireless/rndis_wlan.c 2011-05-19 13:45:32.000000000 +0200 @@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/rtlwifi/pci.c linux-2.6.39-pax/drivers/net/wireless/rtlwifi/pci.c --- linux-2.6.39/drivers/net/wireless/rtlwifi/pci.c 2011-05-19 10:22:05.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/rtlwifi/pci.c 2011-05-19 14:23:30.000000000 +0200 @@ -1869,7 +1869,7 @@ int rtl_pci_resume(struct pci_dev *pdev) } EXPORT_SYMBOL(rtl_pci_resume); -struct rtl_intf_ops rtl_pci_ops = { +const struct rtl_intf_ops rtl_pci_ops = { .adapter_start = rtl_pci_start, .adapter_stop = rtl_pci_stop, .adapter_tx = rtl_pci_tx, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/rtlwifi/pci.h linux-2.6.39-pax/drivers/net/wireless/rtlwifi/pci.h --- linux-2.6.39/drivers/net/wireless/rtlwifi/pci.h 2011-05-19 10:22:05.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/rtlwifi/pci.h 2011-05-19 14:23:30.000000000 +0200 @@ -234,7 +234,7 @@ struct rtl_pci_priv { int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw); -extern struct rtl_intf_ops rtl_pci_ops; +extern const struct rtl_intf_ops rtl_pci_ops; int __devinit rtl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-2.6.39-pax/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c --- linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-05-19 10:22:05.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-05-19 13:45:32.000000000 +0200 @@ -827,6 +827,8 @@ static bool _rtl92c_phy_sw_chnl_step_by_ u8 rfpath; u8 num_total_rfpath = rtlphy->num_total_rfpath; + pax_track_stack(); + precommoncmdcnt = 0; _rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++, MAX_PRECMD_CNT, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c linux-2.6.39-pax/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c --- linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c 2011-05-19 10:22:06.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c 2011-05-19 14:23:30.000000000 +0200 @@ -96,7 +96,7 @@ void rtl92c_deinit_sw_vars(struct ieee80 } } -static struct rtl_hal_ops rtl8192ce_hal_ops = { +static const struct rtl_hal_ops rtl8192ce_hal_ops = { .init_sw_vars = rtl92c_init_sw_vars, .deinit_sw_vars = rtl92c_deinit_sw_vars, .read_eeprom_info = rtl92ce_read_eeprom_info, @@ -151,7 +151,7 @@ static struct rtl_mod_params rtl92ce_mod .sw_crypto = 0, }; -static struct rtl_hal_cfg rtl92ce_hal_cfg = { +static const struct rtl_hal_cfg rtl92ce_hal_cfg = { .name = "rtl92c_pci", .fw_name = "rtlwifi/rtl8192cfw.bin", .ops = &rtl8192ce_hal_ops, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c linux-2.6.39-pax/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c --- linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c 2011-05-19 10:22:06.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c 2011-05-19 14:23:30.000000000 +0200 @@ -77,7 +77,7 @@ static void rtl92cu_deinit_sw_vars(struc } } -static struct rtl_hal_ops rtl8192cu_hal_ops = { +static const struct rtl_hal_ops rtl8192cu_hal_ops = { .init_sw_vars = rtl92cu_init_sw_vars, .deinit_sw_vars = rtl92cu_deinit_sw_vars, .read_chip_version = rtl92c_read_chip_version, @@ -147,7 +147,7 @@ static struct rtl_hal_usbint_cfg rtl92cu .usb_mq_to_hwq = rtl8192cu_mq_to_hwq, }; -static struct rtl_hal_cfg rtl92cu_hal_cfg = { +static const struct rtl_hal_cfg rtl92cu_hal_cfg = { .name = "rtl92c_usb", .fw_name = "rtlwifi/rtl8192cufw.bin", .ops = &rtl8192cu_hal_ops, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/rtlwifi/usb.c linux-2.6.39-pax/drivers/net/wireless/rtlwifi/usb.c --- linux-2.6.39/drivers/net/wireless/rtlwifi/usb.c 2011-05-19 10:22:06.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/rtlwifi/usb.c 2011-05-19 14:23:30.000000000 +0200 @@ -913,7 +913,7 @@ static bool rtl_usb_tx_chk_waitq_insert( return false; } -static struct rtl_intf_ops rtl_usb_ops = { +static const struct rtl_intf_ops rtl_usb_ops = { .adapter_start = rtl_usb_start, .adapter_stop = rtl_usb_stop, .adapter_tx = rtl_usb_tx, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/rtlwifi/wifi.h linux-2.6.39-pax/drivers/net/wireless/rtlwifi/wifi.h --- linux-2.6.39/drivers/net/wireless/rtlwifi/wifi.h 2011-05-19 10:22:06.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/rtlwifi/wifi.h 2011-05-19 14:23:30.000000000 +0200 @@ -1447,7 +1447,7 @@ struct rtl_hal_cfg { u8 bar_id; char *name; char *fw_name; - struct rtl_hal_ops *ops; + const struct rtl_hal_ops *ops; struct rtl_mod_params *mod_params; struct rtl_hal_usbint_cfg *usb_interface_cfg; @@ -1533,7 +1533,7 @@ struct rtl_priv { *intf_ops : for diff interrface usb/pcie */ struct rtl_hal_cfg *cfg; - struct rtl_intf_ops *intf_ops; + const struct rtl_intf_ops *intf_ops; /*this var will be set by set_bit, and was used to indicate status of diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/wireless/wl12xx/spi.c linux-2.6.39-pax/drivers/net/wireless/wl12xx/spi.c --- linux-2.6.39/drivers/net/wireless/wl12xx/spi.c 2011-05-19 10:22:06.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/wireless/wl12xx/spi.c 2011-05-19 13:45:32.000000000 +0200 @@ -280,6 +280,8 @@ static void wl1271_spi_raw_write(struct u32 chunk_len; int i; + pax_track_stack(); + WARN_ON(len > WL1271_AGGR_BUFFER_SIZE); spi_message_init(&m); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/xen-netback/interface.c linux-2.6.39-pax/drivers/net/xen-netback/interface.c --- linux-2.6.39/drivers/net/xen-netback/interface.c 2011-05-19 10:22:06.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/xen-netback/interface.c 2011-05-19 14:23:30.000000000 +0200 @@ -273,7 +273,7 @@ static void xenvif_get_strings(struct ne } } -static struct ethtool_ops xenvif_ethtool_ops = { +static const struct ethtool_ops xenvif_ethtool_ops = { .get_tx_csum = ethtool_op_get_tx_csum, .set_tx_csum = xenvif_set_tx_csum, .get_sg = ethtool_op_get_sg, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/net/xilinx_emaclite.c linux-2.6.39-pax/drivers/net/xilinx_emaclite.c --- linux-2.6.39/drivers/net/xilinx_emaclite.c 2011-05-19 10:22:06.000000000 +0200 +++ linux-2.6.39-pax/drivers/net/xilinx_emaclite.c 2011-05-19 14:23:30.000000000 +0200 @@ -1085,7 +1085,7 @@ static bool get_bool(struct platform_dev } } -static struct net_device_ops xemaclite_netdev_ops; +static const struct net_device_ops xemaclite_netdev_ops; /** * xemaclite_of_probe - Probe method for the Emaclite device. @@ -1264,7 +1264,7 @@ xemaclite_poll_controller(struct net_dev } #endif -static struct net_device_ops xemaclite_netdev_ops = { +static const struct net_device_ops xemaclite_netdev_ops = { .ndo_open = xemaclite_open, .ndo_stop = xemaclite_close, .ndo_start_xmit = xemaclite_send, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/nfc/pn544.c linux-2.6.39-pax/drivers/nfc/pn544.c --- linux-2.6.39/drivers/nfc/pn544.c 2011-03-15 19:34:18.000000000 +0100 +++ linux-2.6.39-pax/drivers/nfc/pn544.c 2011-05-19 14:23:30.000000000 +0200 @@ -89,7 +89,7 @@ static ssize_t pn544_test(struct device static int pn544_enable(struct pn544_info *info, int mode) { - struct pn544_nfc_platform_data *pdata; + const struct pn544_nfc_platform_data *pdata; struct i2c_client *client = info->i2c_dev; int r; @@ -118,7 +118,7 @@ static int pn544_enable(struct pn544_inf static void pn544_disable(struct pn544_info *info) { - struct pn544_nfc_platform_data *pdata; + const struct pn544_nfc_platform_data *pdata; struct i2c_client *client = info->i2c_dev; pdata = client->dev.platform_data; @@ -509,7 +509,7 @@ static long pn544_ioctl(struct file *fil struct pn544_info *info = container_of(file->private_data, struct pn544_info, miscdev); struct i2c_client *client = info->i2c_dev; - struct pn544_nfc_platform_data *pdata; + const struct pn544_nfc_platform_data *pdata; unsigned int val; int r = 0; @@ -715,7 +715,7 @@ static int __devinit pn544_probe(struct const struct i2c_device_id *id) { struct pn544_info *info; - struct pn544_nfc_platform_data *pdata; + const struct pn544_nfc_platform_data *pdata; int r = 0; dev_dbg(&client->dev, "%s\n", __func__); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/of/pdt.c linux-2.6.39-pax/drivers/of/pdt.c --- linux-2.6.39/drivers/of/pdt.c 2011-03-15 19:34:18.000000000 +0100 +++ linux-2.6.39-pax/drivers/of/pdt.c 2011-05-19 14:23:30.000000000 +0200 @@ -24,7 +24,7 @@ #include #include -static struct of_pdt_ops *of_pdt_prom_ops __initdata; +static const struct of_pdt_ops *of_pdt_prom_ops; void __initdata (*of_pdt_build_more)(struct device_node *dp, struct device_node ***nextp); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/oprofile/buffer_sync.c linux-2.6.39-pax/drivers/oprofile/buffer_sync.c --- linux-2.6.39/drivers/oprofile/buffer_sync.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/oprofile/buffer_sync.c 2011-05-19 13:45:32.000000000 +0200 @@ -342,7 +342,7 @@ static void add_data(struct op_entry *en 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_sample(struct mm_struct *mm, struct /* 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 @@ void sync_buffer(int cpu) /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/oprofile/event_buffer.c linux-2.6.39-pax/drivers/oprofile/event_buffer.c --- linux-2.6.39/drivers/oprofile/event_buffer.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/oprofile/event_buffer.c 2011-05-19 13:45:32.000000000 +0200 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } if (buffer_pos == buffer_size) { - atomic_inc(&oprofile_stats.event_lost_overflow); + atomic_inc_unchecked(&oprofile_stats.event_lost_overflow); return; } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/oprofile/oprof.c linux-2.6.39-pax/drivers/oprofile/oprof.c --- linux-2.6.39/drivers/oprofile/oprof.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/oprofile/oprof.c 2011-05-19 13:45:32.000000000 +0200 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; - atomic_inc(&oprofile_stats.multiplex_counter); + atomic_inc_unchecked(&oprofile_stats.multiplex_counter); start_switch_worker(); } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/oprofile/oprofile_stats.c linux-2.6.39-pax/drivers/oprofile/oprofile_stats.c --- linux-2.6.39/drivers/oprofile/oprofile_stats.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/oprofile/oprofile_stats.c 2011-05-19 13:45:32.000000000 +0200 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/oprofile/oprofile_stats.h linux-2.6.39-pax/drivers/oprofile/oprofile_stats.h --- linux-2.6.39/drivers/oprofile/oprofile_stats.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/oprofile/oprofile_stats.h 2011-05-19 13:45:32.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/oprofile/oprofilefs.c linux-2.6.39-pax/drivers/oprofile/oprofilefs.c --- linux-2.6.39/drivers/oprofile/oprofilefs.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/oprofile/oprofilefs.c 2011-05-19 13:45:32.000000000 +0200 @@ -186,7 +186,7 @@ static const struct file_operations atom 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/parisc/dino.c linux-2.6.39-pax/drivers/parisc/dino.c --- linux-2.6.39/drivers/parisc/dino.c 2011-05-19 10:22:06.000000000 +0200 +++ linux-2.6.39-pax/drivers/parisc/dino.c 2011-05-19 14:23:30.000000000 +0200 @@ -238,7 +238,7 @@ static int dino_cfg_write(struct pci_bus return 0; } -static struct pci_ops dino_cfg_ops = { +static const struct pci_ops dino_cfg_ops = { .read = dino_cfg_read, .write = dino_cfg_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/parisc/lba_pci.c linux-2.6.39-pax/drivers/parisc/lba_pci.c --- linux-2.6.39/drivers/parisc/lba_pci.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/parisc/lba_pci.c 2011-05-19 14:23:30.000000000 +0200 @@ -468,7 +468,7 @@ static int elroy_cfg_write(struct pci_bu } -static struct pci_ops elroy_cfg_ops = { +static const struct pci_ops elroy_cfg_ops = { .read = elroy_cfg_read, .write = elroy_cfg_write, }; @@ -541,7 +541,7 @@ static int mercury_cfg_write(struct pci_ return 0; } -static struct pci_ops mercury_cfg_ops = { +static const struct pci_ops mercury_cfg_ops = { .read = mercury_cfg_read, .write = mercury_cfg_write, }; @@ -1405,7 +1405,7 @@ lba_driver_probe(struct parisc_device *d { struct lba_device *lba_dev; struct pci_bus *lba_bus; - struct pci_ops *cfg_ops; + const struct pci_ops *cfg_ops; u32 func_class; void *tmp_obj; char *version; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/parport/procfs.c linux-2.6.39-pax/drivers/parport/procfs.c --- linux-2.6.39/drivers/parport/procfs.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/parport/procfs.c 2011-05-19 13:45:32.000000000 +0200 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t *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 @@ static int do_autoprobe(ctl_table *table *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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/access.c linux-2.6.39-pax/drivers/pci/access.c --- linux-2.6.39/drivers/pci/access.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pci/access.c 2011-05-19 14:23:30.000000000 +0200 @@ -74,9 +74,9 @@ EXPORT_SYMBOL(pci_bus_write_config_dword * * Return previous raw operations */ -struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, struct pci_ops *ops) +const struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, const struct pci_ops *ops) { - struct pci_ops *old_ops; + const struct pci_ops *old_ops; unsigned long flags; raw_spin_lock_irqsave(&pci_lock, flags); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.39-pax/drivers/pci/hotplug/acpiphp_glue.c --- linux-2.6.39/drivers/pci/hotplug/acpiphp_glue.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pci/hotplug/acpiphp_glue.c 2011-05-19 14:23:30.000000000 +0200 @@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif } -static struct acpi_dock_ops acpiphp_dock_ops = { +static const struct acpi_dock_ops acpiphp_dock_ops = { .handler = handle_hotplug_event_func, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.39-pax/drivers/pci/hotplug/cpqphp_nvram.c --- linux-2.6.39/drivers/pci/hotplug/cpqphp_nvram.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pci/hotplug/cpqphp_nvram.c 2011-05-19 13:45:32.000000000 +0200 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/hotplug/shpchp.h linux-2.6.39-pax/drivers/pci/hotplug/shpchp.h --- linux-2.6.39/drivers/pci/hotplug/shpchp.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pci/hotplug/shpchp.h 2011-05-19 14:23:30.000000000 +0200 @@ -86,7 +86,7 @@ struct slot { u8 presence_save; u8 pwr_save; struct controller *ctrl; - struct hpc_ops *hpc_ops; + const struct hpc_ops *hpc_ops; struct hotplug_slot *hotplug_slot; struct list_head slot_list; struct delayed_work work; /* work for button event */ @@ -107,7 +107,7 @@ struct controller { int slot_num_inc; /* 1 or -1 */ struct pci_dev *pci_dev; struct list_head slot_list; - struct hpc_ops *hpc_ops; + const struct hpc_ops *hpc_ops; wait_queue_head_t queue; /* sleep & wake process */ u8 slot_device_offset; u32 pcix_misc2_reg; /* for amd pogo errata */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/hotplug/shpchp_hpc.c linux-2.6.39-pax/drivers/pci/hotplug/shpchp_hpc.c --- linux-2.6.39/drivers/pci/hotplug/shpchp_hpc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pci/hotplug/shpchp_hpc.c 2011-05-19 14:23:30.000000000 +0200 @@ -910,7 +910,7 @@ static int shpc_get_max_bus_speed(struct return retval; } -static struct hpc_ops shpchp_hpc_ops = { +static const struct hpc_ops shpchp_hpc_ops = { .power_on_slot = hpc_power_on_slot, .slot_enable = hpc_slot_enable, .slot_disable = hpc_slot_disable, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/intel-iommu.c linux-2.6.39-pax/drivers/pci/intel-iommu.c --- linux-2.6.39/drivers/pci/intel-iommu.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pci/intel-iommu.c 2011-05-19 14:23:30.000000000 +0200 @@ -391,7 +391,7 @@ static int intel_iommu_strict; static DEFINE_SPINLOCK(device_domain_lock); static LIST_HEAD(device_domain_list); -static struct iommu_ops intel_iommu_ops; +static const struct iommu_ops intel_iommu_ops; static int __init intel_iommu_setup(char *str) { @@ -2945,7 +2945,7 @@ static int intel_mapping_error(struct de 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, @@ -3739,7 +3739,7 @@ static int intel_iommu_domain_has_cap(st return 0; } -static struct iommu_ops intel_iommu_ops = { +static const struct iommu_ops intel_iommu_ops = { .domain_init = intel_iommu_domain_init, .domain_destroy = intel_iommu_domain_destroy, .attach_dev = intel_iommu_attach_device, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/pci-acpi.c linux-2.6.39-pax/drivers/pci/pci-acpi.c --- linux-2.6.39/drivers/pci/pci-acpi.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pci/pci-acpi.c 2011-05-19 14:23:30.000000000 +0200 @@ -332,7 +332,7 @@ static int acpi_pci_run_wake(struct pci_ return 0; } -static struct pci_platform_pm_ops acpi_pci_platform_pm = { +static const struct pci_platform_pm_ops acpi_pci_platform_pm = { .is_manageable = acpi_pci_power_manageable, .set_state = acpi_pci_set_power_state, .choose_state = acpi_pci_choose_state, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/pci.c linux-2.6.39-pax/drivers/pci/pci.c --- linux-2.6.39/drivers/pci/pci.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pci/pci.c 2011-05-19 14:23:30.000000000 +0200 @@ -480,9 +480,9 @@ pci_restore_bars(struct pci_dev *dev) pci_update_resource(dev, i); } -static struct pci_platform_pm_ops *pci_platform_pm; +static const struct pci_platform_pm_ops *pci_platform_pm; -int pci_set_platform_pm(struct pci_platform_pm_ops *ops) +int pci_set_platform_pm(const struct pci_platform_pm_ops *ops) { if (!ops->is_manageable || !ops->set_state || !ops->choose_state || !ops->sleep_wake || !ops->can_wakeup) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/pci.h linux-2.6.39-pax/drivers/pci/pci.h --- linux-2.6.39/drivers/pci/pci.h 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pci/pci.h 2011-05-19 14:23:30.000000000 +0200 @@ -65,7 +65,7 @@ struct pci_platform_pm_ops { int (*run_wake)(struct pci_dev *dev, bool enable); }; -extern int pci_set_platform_pm(struct pci_platform_pm_ops *ops); +extern int pci_set_platform_pm(const struct pci_platform_pm_ops *ops); extern void pci_update_current_state(struct pci_dev *dev, pci_power_t state); extern void pci_disable_enabled_device(struct pci_dev *dev); extern int pci_finish_runtime_suspend(struct pci_dev *dev); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/pcie/aer/aer_inject.c linux-2.6.39-pax/drivers/pci/pcie/aer/aer_inject.c --- linux-2.6.39/drivers/pci/pcie/aer/aer_inject.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pci/pcie/aer/aer_inject.c 2011-05-19 14:23:30.000000000 +0200 @@ -64,7 +64,7 @@ struct aer_error { struct pci_bus_ops { struct list_head list; struct pci_bus *bus; - struct pci_ops *ops; + const struct pci_ops *ops; }; static LIST_HEAD(einjected); @@ -110,7 +110,7 @@ static struct aer_error *__find_aer_erro } /* inject_lock must be held before calling */ -static struct pci_ops *__find_pci_bus_ops(struct pci_bus *bus) +static const struct pci_ops *__find_pci_bus_ops(struct pci_bus *bus) { struct pci_bus_ops *bus_ops; @@ -187,7 +187,7 @@ static int pci_read_aer(struct pci_bus * u32 *sim; struct aer_error *err; unsigned long flags; - struct pci_ops *ops; + const struct pci_ops *ops; int domain; spin_lock_irqsave(&inject_lock, flags); @@ -219,7 +219,7 @@ int pci_write_aer(struct pci_bus *bus, u struct aer_error *err; unsigned long flags; int rw1cs; - struct pci_ops *ops; + const struct pci_ops *ops; int domain; spin_lock_irqsave(&inject_lock, flags); @@ -254,7 +254,7 @@ static struct pci_ops pci_ops_aer = { static void pci_bus_ops_init(struct pci_bus_ops *bus_ops, struct pci_bus *bus, - struct pci_ops *ops) + const struct pci_ops *ops) { INIT_LIST_HEAD(&bus_ops->list); bus_ops->bus = bus; @@ -263,7 +263,7 @@ static void pci_bus_ops_init(struct pci_ static int pci_bus_set_aer_ops(struct pci_bus *bus) { - struct pci_ops *ops; + const struct pci_ops *ops; struct pci_bus_ops *bus_ops; unsigned long flags; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/pcie/aer/aerdrv_core.c linux-2.6.39-pax/drivers/pci/pcie/aer/aerdrv_core.c --- linux-2.6.39/drivers/pci/pcie/aer/aerdrv_core.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pci/pcie/aer/aerdrv_core.c 2011-05-19 14:23:30.000000000 +0200 @@ -239,7 +239,7 @@ static bool find_source_device(struct pc static int report_error_detected(struct pci_dev *dev, void *data) { pci_ers_result_t vote; - struct pci_error_handlers *err_handler; + const struct pci_error_handlers *err_handler; struct aer_broadcast_data *result_data; result_data = (struct aer_broadcast_data *) data; @@ -273,7 +273,7 @@ static int report_error_detected(struct static int report_mmio_enabled(struct pci_dev *dev, void *data) { pci_ers_result_t vote; - struct pci_error_handlers *err_handler; + const struct pci_error_handlers *err_handler; struct aer_broadcast_data *result_data; result_data = (struct aer_broadcast_data *) data; @@ -291,7 +291,7 @@ static int report_mmio_enabled(struct pc static int report_slot_reset(struct pci_dev *dev, void *data) { pci_ers_result_t vote; - struct pci_error_handlers *err_handler; + const struct pci_error_handlers *err_handler; struct aer_broadcast_data *result_data; result_data = (struct aer_broadcast_data *) data; @@ -308,7 +308,7 @@ static int report_slot_reset(struct pci_ static int report_resume(struct pci_dev *dev, void *data) { - struct pci_error_handlers *err_handler; + const struct pci_error_handlers *err_handler; dev->error_state = pci_channel_io_normal; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/pcie/aspm.c linux-2.6.39-pax/drivers/pci/pcie/aspm.c --- linux-2.6.39/drivers/pci/pcie/aspm.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pci/pcie/aspm.c 2011-05-19 13:45:32.000000000 +0200 @@ -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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/probe.c linux-2.6.39-pax/drivers/pci/probe.c --- linux-2.6.39/drivers/pci/probe.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pci/probe.c 2011-05-19 14:23:27.000000000 +0200 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( 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 @@ int __pci_read_base(struct pci_dev *dev, 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); @@ -1407,7 +1407,7 @@ unsigned int __devinit pci_scan_child_bu } struct pci_bus * pci_create_bus(struct device *parent, - int bus, struct pci_ops *ops, void *sysdata) + int bus, const struct pci_ops *ops, void *sysdata) { int error; struct pci_bus *b, *b2; @@ -1483,7 +1483,7 @@ err_out: } struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, - int bus, struct pci_ops *ops, void *sysdata) + int bus, const struct pci_ops *ops, void *sysdata) { struct pci_bus *b; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pci/xen-pcifront.c linux-2.6.39-pax/drivers/pci/xen-pcifront.c --- linux-2.6.39/drivers/pci/xen-pcifront.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pci/xen-pcifront.c 2011-05-19 14:23:27.000000000 +0200 @@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_ struct pcifront_sd *sd = bus->sysdata; struct pcifront_device *pdev = pcifront_get_pdev(sd); + pax_track_stack(); + if (verbose_request) dev_info(&pdev->xdev->dev, "read dev=%04x:%02x:%02x.%01x - offset %x size %d\n", @@ -226,6 +228,8 @@ static int pcifront_bus_write(struct pci struct pcifront_sd *sd = bus->sysdata; struct pcifront_device *pdev = pcifront_get_pdev(sd); + pax_track_stack(); + if (verbose_request) dev_info(&pdev->xdev->dev, "write dev=%04x:%02x:%02x.%01x - " @@ -236,7 +240,7 @@ static int pcifront_bus_write(struct pci return errno_to_pcibios_err(do_pci_op(pdev, &op)); } -struct pci_ops pcifront_bus_ops = { +const struct pci_ops pcifront_bus_ops = { .read = pcifront_bus_read, .write = pcifront_bus_write, }; @@ -258,6 +262,8 @@ static int pci_frontend_enable_msix(stru struct pcifront_device *pdev = pcifront_get_pdev(sd); struct msi_desc *entry; + pax_track_stack(); + if (nvec > SH_INFO_MAX_VEC) { dev_err(&dev->dev, "too much vector for pci frontend: %x." " Increase SH_INFO_MAX_VEC.\n", nvec); @@ -309,6 +315,8 @@ static void pci_frontend_disable_msix(st struct pcifront_sd *sd = dev->bus->sysdata; struct pcifront_device *pdev = pcifront_get_pdev(sd); + pax_track_stack(); + err = do_pci_op(pdev, &op); /* What should do for error ? */ @@ -328,6 +336,8 @@ static int pci_frontend_enable_msi(struc struct pcifront_sd *sd = dev->bus->sysdata; struct pcifront_device *pdev = pcifront_get_pdev(sd); + pax_track_stack(); + err = do_pci_op(pdev, &op); if (likely(!err)) { vector[0] = op.value; @@ -368,7 +378,7 @@ static void pci_frontend_disable_msi(str printk(KERN_DEBUG "get fake response frombackend\n"); } -static struct xen_pci_frontend_ops pci_frontend_ops = { +static const struct xen_pci_frontend_ops pci_frontend_ops = { .enable_msi = pci_frontend_enable_msi, .disable_msi = pci_frontend_disable_msi, .enable_msix = pci_frontend_enable_msix, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/at91_cf.c linux-2.6.39-pax/drivers/pcmcia/at91_cf.c --- linux-2.6.39/drivers/pcmcia/at91_cf.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pcmcia/at91_cf.c 2011-05-19 14:23:30.000000000 +0200 @@ -203,7 +203,7 @@ at91_cf_set_mem_map(struct pcmcia_socket return 0; } -static struct pccard_operations at91_cf_ops = { +static const struct pccard_operations at91_cf_ops = { .init = at91_cf_ss_init, .suspend = at91_cf_ss_suspend, .get_status = at91_cf_get_status, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/bfin_cf_pcmcia.c linux-2.6.39-pax/drivers/pcmcia/bfin_cf_pcmcia.c --- linux-2.6.39/drivers/pcmcia/bfin_cf_pcmcia.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pcmcia/bfin_cf_pcmcia.c 2011-05-19 14:23:30.000000000 +0200 @@ -184,7 +184,7 @@ bfin_cf_set_mem_map(struct pcmcia_socket return 0; } -static struct pccard_operations bfin_cf_ops = { +static const struct pccard_operations bfin_cf_ops = { .init = bfin_cf_ss_init, .suspend = bfin_cf_ss_suspend, .get_status = bfin_cf_get_status, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/db1xxx_ss.c linux-2.6.39-pax/drivers/pcmcia/db1xxx_ss.c --- linux-2.6.39/drivers/pcmcia/db1xxx_ss.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pcmcia/db1xxx_ss.c 2011-05-19 14:23:30.000000000 +0200 @@ -384,7 +384,7 @@ static int au1x00_pcmcia_set_mem_map(str return 0; } -static struct pccard_operations db1x_pcmcia_operations = { +static const struct pccard_operations db1x_pcmcia_operations = { .init = db1x_pcmcia_sock_init, .suspend = db1x_pcmcia_sock_suspend, .get_status = db1x_pcmcia_get_status, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/electra_cf.c linux-2.6.39-pax/drivers/pcmcia/electra_cf.c --- linux-2.6.39/drivers/pcmcia/electra_cf.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pcmcia/electra_cf.c 2011-05-19 14:23:30.000000000 +0200 @@ -173,7 +173,7 @@ static int electra_cf_set_mem_map(struct return 0; } -static struct pccard_operations electra_cf_ops = { +static const struct pccard_operations electra_cf_ops = { .init = electra_cf_ss_init, .get_status = electra_cf_get_status, .set_socket = electra_cf_set_socket, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/m32r_cfc.c linux-2.6.39-pax/drivers/pcmcia/m32r_cfc.c --- linux-2.6.39/drivers/pcmcia/m32r_cfc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pcmcia/m32r_cfc.c 2011-05-19 14:23:30.000000000 +0200 @@ -674,7 +674,7 @@ static int pcc_init(struct pcmcia_socket return 0; } -static struct pccard_operations pcc_operations = { +static const struct pccard_operations pcc_operations = { .init = pcc_init, .get_status = pcc_get_status, .set_socket = pcc_set_socket, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/m32r_pcc.c linux-2.6.39-pax/drivers/pcmcia/m32r_pcc.c --- linux-2.6.39/drivers/pcmcia/m32r_pcc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pcmcia/m32r_pcc.c 2011-05-19 14:23:30.000000000 +0200 @@ -652,7 +652,7 @@ static int pcc_init(struct pcmcia_socket return 0; } -static struct pccard_operations pcc_operations = { +static const struct pccard_operations pcc_operations = { .init = pcc_init, .get_status = pcc_get_status, .set_socket = pcc_set_socket, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/m8xx_pcmcia.c linux-2.6.39-pax/drivers/pcmcia/m8xx_pcmcia.c --- linux-2.6.39/drivers/pcmcia/m8xx_pcmcia.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pcmcia/m8xx_pcmcia.c 2011-05-19 14:23:30.000000000 +0200 @@ -1139,7 +1139,7 @@ static int m8xx_sock_suspend(struct pcmc return m8xx_set_socket(sock, &dead_socket); } -static struct pccard_operations m8xx_services = { +static const struct pccard_operations m8xx_services = { .init = m8xx_sock_init, .suspend = m8xx_sock_suspend, .get_status = m8xx_get_status, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/omap_cf.c linux-2.6.39-pax/drivers/pcmcia/omap_cf.c --- linux-2.6.39/drivers/pcmcia/omap_cf.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pcmcia/omap_cf.c 2011-05-19 14:23:30.000000000 +0200 @@ -185,7 +185,7 @@ omap_cf_set_mem_map(struct pcmcia_socket return 0; } -static struct pccard_operations omap_cf_ops = { +static const struct pccard_operations omap_cf_ops = { .init = omap_cf_ss_init, .suspend = omap_cf_ss_suspend, .get_status = omap_cf_get_status, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/rsrc_iodyn.c linux-2.6.39-pax/drivers/pcmcia/rsrc_iodyn.c --- linux-2.6.39/drivers/pcmcia/rsrc_iodyn.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pcmcia/rsrc_iodyn.c 2011-05-19 14:23:30.000000000 +0200 @@ -161,7 +161,7 @@ static int iodyn_find_io(struct pcmcia_s } -struct pccard_resource_ops pccard_iodyn_ops = { +const struct pccard_resource_ops pccard_iodyn_ops = { .validate_mem = NULL, .find_io = iodyn_find_io, .find_mem = NULL, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/rsrc_mgr.c linux-2.6.39-pax/drivers/pcmcia/rsrc_mgr.c --- linux-2.6.39/drivers/pcmcia/rsrc_mgr.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pcmcia/rsrc_mgr.c 2011-05-19 14:23:30.000000000 +0200 @@ -57,7 +57,7 @@ static int static_find_io(struct pcmcia_ } -struct pccard_resource_ops pccard_static_ops = { +const struct pccard_resource_ops pccard_static_ops = { .validate_mem = NULL, .find_io = static_find_io, .find_mem = NULL, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/vrc4171_card.c linux-2.6.39-pax/drivers/pcmcia/vrc4171_card.c --- linux-2.6.39/drivers/pcmcia/vrc4171_card.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pcmcia/vrc4171_card.c 2011-05-19 14:23:30.000000000 +0200 @@ -479,7 +479,7 @@ static int pccard_set_mem_map(struct pcm return 0; } -static struct pccard_operations vrc4171_pccard_operations = { +static const struct pccard_operations vrc4171_pccard_operations = { .init = pccard_init, .get_status = pccard_get_status, .set_socket = pccard_set_socket, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/vrc4173_cardu.c linux-2.6.39-pax/drivers/pcmcia/vrc4173_cardu.c --- linux-2.6.39/drivers/pcmcia/vrc4173_cardu.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/pcmcia/vrc4173_cardu.c 2011-05-19 14:23:30.000000000 +0200 @@ -384,7 +384,7 @@ static void cardu_proc_setup(unsigned in { } -static struct pccard_operations cardu_operations = { +static const struct pccard_operations cardu_operations = { .init = cardu_init, .register_callback = cardu_register_callback, .inquire_socket = cardu_inquire_socket, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pcmcia/xxs1500_ss.c linux-2.6.39-pax/drivers/pcmcia/xxs1500_ss.c --- linux-2.6.39/drivers/pcmcia/xxs1500_ss.c 2011-05-19 10:22:07.000000000 +0200 +++ linux-2.6.39-pax/drivers/pcmcia/xxs1500_ss.c 2011-05-19 14:23:30.000000000 +0200 @@ -196,7 +196,7 @@ static int au1x00_pcmcia_set_mem_map(str return 0; } -static struct pccard_operations xxs1500_pcmcia_operations = { +static const struct pccard_operations xxs1500_pcmcia_operations = { .init = xxs1500_pcmcia_sock_init, .suspend = xxs1500_pcmcia_sock_suspend, .get_status = xxs1500_pcmcia_get_status, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/platform/x86/acerhdf.c linux-2.6.39-pax/drivers/platform/x86/acerhdf.c --- linux-2.6.39/drivers/platform/x86/acerhdf.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/platform/x86/acerhdf.c 2011-05-19 14:23:31.000000000 +0200 @@ -406,7 +406,7 @@ static int acerhdf_get_crit_temp(struct } /* bind callback functions to thermalzone */ -static struct thermal_zone_device_ops acerhdf_dev_ops = { +static const struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, @@ -481,7 +481,7 @@ err_out: } /* bind fan callbacks to fan device */ -static struct thermal_cooling_device_ops acerhdf_cooling_ops = { +static const struct thermal_cooling_device_ops acerhdf_cooling_ops = { .get_max_state = acerhdf_get_max_state, .get_cur_state = acerhdf_get_cur_state, .set_cur_state = acerhdf_set_cur_state, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/platform/x86/ideapad-laptop.c linux-2.6.39-pax/drivers/platform/x86/ideapad-laptop.c --- linux-2.6.39/drivers/platform/x86/ideapad-laptop.c 2011-05-19 10:22:09.000000000 +0200 +++ linux-2.6.39-pax/drivers/platform/x86/ideapad-laptop.c 2011-05-19 14:23:31.000000000 +0200 @@ -207,7 +207,7 @@ static int ideapad_rfk_set(void *data, b return write_ec_cmd(ideapad_handle, opcode, !blocked); } -static struct rfkill_ops ideapad_rfk_ops = { +static const struct rfkill_ops ideapad_rfk_ops = { .set_block = ideapad_rfk_set, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/platform/x86/intel_menlow.c linux-2.6.39-pax/drivers/platform/x86/intel_menlow.c --- linux-2.6.39/drivers/platform/x86/intel_menlow.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/platform/x86/intel_menlow.c 2011-05-19 14:23:31.000000000 +0200 @@ -143,7 +143,7 @@ static int memory_set_cur_bandwidth(stru return 0; } -static struct thermal_cooling_device_ops memory_cooling_ops = { +static const struct thermal_cooling_device_ops memory_cooling_ops = { .get_max_state = memory_get_max_bandwidth, .get_cur_state = memory_get_cur_bandwidth, .set_cur_state = memory_set_cur_bandwidth, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/platform/x86/intel_mid_thermal.c linux-2.6.39-pax/drivers/platform/x86/intel_mid_thermal.c --- linux-2.6.39/drivers/platform/x86/intel_mid_thermal.c 2011-05-19 10:22:09.000000000 +0200 +++ linux-2.6.39-pax/drivers/platform/x86/intel_mid_thermal.c 2011-05-19 14:23:31.000000000 +0200 @@ -458,7 +458,7 @@ static int read_curr_temp(struct thermal } /* Can't be const */ -static struct thermal_zone_device_ops tzd_ops = { +static const struct thermal_zone_device_ops tzd_ops = { .get_temp = read_curr_temp, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/platform/x86/samsung-laptop.c linux-2.6.39-pax/drivers/platform/x86/samsung-laptop.c --- linux-2.6.39/drivers/platform/x86/samsung-laptop.c 2011-05-19 10:22:10.000000000 +0200 +++ linux-2.6.39-pax/drivers/platform/x86/samsung-laptop.c 2011-05-19 14:23:31.000000000 +0200 @@ -419,7 +419,7 @@ static int rfkill_set(void *data, bool b return 0; } -static struct rfkill_ops rfkill_ops = { +static const struct rfkill_ops rfkill_ops = { .set_block = rfkill_set, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pnp/pnpbios/bioscalls.c linux-2.6.39-pax/drivers/pnp/pnpbios/bioscalls.c --- linux-2.6.39/drivers/pnp/pnpbios/bioscalls.c 2011-05-19 10:22:10.000000000 +0200 +++ linux-2.6.39-pax/drivers/pnp/pnpbios/bioscalls.c 2011-05-19 13:45:32.000000000 +0200 @@ -59,7 +59,7 @@ do { \ 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 @@ static inline u16 call_pnp_bios(u16 func 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 @@ static inline u16 call_pnp_bios(u16 func :"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 @@ int pnp_bios_read_escd(char *data, u32 n 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 @@ void pnpbios_calls_init(union pnp_bios_i 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 @@ void pnpbios_calls_init(union pnp_bios_i set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS], (unsigned long)__va(header->fields.pm16dseg)); } + + pax_close_kernel(); } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/pnp/resource.c linux-2.6.39-pax/drivers/pnp/resource.c --- linux-2.6.39/drivers/pnp/resource.c 2011-05-19 10:22:10.000000000 +0200 +++ linux-2.6.39-pax/drivers/pnp/resource.c 2011-05-19 13:45:32.000000000 +0200 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s 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 @@ int pnp_check_dma(struct pnp_dev *dev, s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/power/max8925_power.c linux-2.6.39-pax/drivers/power/max8925_power.c --- linux-2.6.39/drivers/power/max8925_power.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/power/max8925_power.c 2011-05-19 14:23:31.000000000 +0200 @@ -426,7 +426,7 @@ static __devinit int max8925_power_probe { struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent); struct max8925_platform_data *max8925_pdata; - struct max8925_power_pdata *pdata = NULL; + const struct max8925_power_pdata *pdata = NULL; struct max8925_power_info *info; int ret; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/regulator/core.c linux-2.6.39-pax/drivers/regulator/core.c --- linux-2.6.39/drivers/regulator/core.c 2011-05-19 10:22:10.000000000 +0200 +++ linux-2.6.39-pax/drivers/regulator/core.c 2011-05-19 14:23:31.000000000 +0200 @@ -2883,7 +2883,7 @@ core_initcall(regulator_init); static int __init regulator_init_complete(void) { struct regulator_dev *rdev; - struct regulator_ops *ops; + const struct regulator_ops *ops; struct regulation_constraints *c; int enabled, ret; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-at32ap700x.c linux-2.6.39-pax/drivers/rtc/rtc-at32ap700x.c --- linux-2.6.39/drivers/rtc/rtc-at32ap700x.c 2011-03-15 19:34:20.000000000 +0100 +++ linux-2.6.39-pax/drivers/rtc/rtc-at32ap700x.c 2011-05-19 14:23:31.000000000 +0200 @@ -187,7 +187,7 @@ static irqreturn_t at32_rtc_interrupt(in return ret; } -static struct rtc_class_ops at32_rtc_ops = { +static const struct rtc_class_ops at32_rtc_ops = { .read_time = at32_rtc_readtime, .set_time = at32_rtc_settime, .read_alarm = at32_rtc_readalarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-au1xxx.c linux-2.6.39-pax/drivers/rtc/rtc-au1xxx.c --- linux-2.6.39/drivers/rtc/rtc-au1xxx.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/rtc/rtc-au1xxx.c 2011-05-19 14:23:31.000000000 +0200 @@ -57,7 +57,7 @@ static int au1xtoy_rtc_set_time(struct d return 0; } -static struct rtc_class_ops au1xtoy_rtc_ops = { +static const struct rtc_class_ops au1xtoy_rtc_ops = { .read_time = au1xtoy_rtc_read_time, .set_time = au1xtoy_rtc_set_time, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-bfin.c linux-2.6.39-pax/drivers/rtc/rtc-bfin.c --- linux-2.6.39/drivers/rtc/rtc-bfin.c 2011-05-19 10:22:10.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-bfin.c 2011-05-19 14:23:31.000000000 +0200 @@ -333,7 +333,7 @@ static int bfin_rtc_proc(struct device * #undef yesno } -static struct rtc_class_ops bfin_rtc_ops = { +static const struct rtc_class_ops bfin_rtc_ops = { .read_time = bfin_rtc_read_time, .set_time = bfin_rtc_set_time, .read_alarm = bfin_rtc_read_alarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-coh901331.c linux-2.6.39-pax/drivers/rtc/rtc-coh901331.c --- linux-2.6.39/drivers/rtc/rtc-coh901331.c 2011-05-19 10:22:10.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-coh901331.c 2011-05-19 14:23:31.000000000 +0200 @@ -142,7 +142,7 @@ static int coh901331_alarm_irq_enable(st return 0; } -static struct rtc_class_ops coh901331_ops = { +static const struct rtc_class_ops coh901331_ops = { .read_time = coh901331_read_time, .set_mmss = coh901331_set_mmss, .read_alarm = coh901331_read_alarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-davinci.c linux-2.6.39-pax/drivers/rtc/rtc-davinci.c --- linux-2.6.39/drivers/rtc/rtc-davinci.c 2011-05-19 10:22:10.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-davinci.c 2011-05-19 14:23:31.000000000 +0200 @@ -469,7 +469,7 @@ static int davinci_rtc_set_alarm(struct return 0; } -static struct rtc_class_ops davinci_rtc_ops = { +static const struct rtc_class_ops davinci_rtc_ops = { .ioctl = davinci_rtc_ioctl, .read_time = davinci_rtc_read_time, .set_time = davinci_rtc_set_time, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-dm355evm.c linux-2.6.39-pax/drivers/rtc/rtc-dm355evm.c --- linux-2.6.39/drivers/rtc/rtc-dm355evm.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/rtc/rtc-dm355evm.c 2011-05-19 14:23:31.000000000 +0200 @@ -115,7 +115,7 @@ static int dm355evm_rtc_set_time(struct return 0; } -static struct rtc_class_ops dm355evm_rtc_ops = { +static const struct rtc_class_ops dm355evm_rtc_ops = { .read_time = dm355evm_rtc_read_time, .set_time = dm355evm_rtc_set_time, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-ds1302.c linux-2.6.39-pax/drivers/rtc/rtc-ds1302.c --- linux-2.6.39/drivers/rtc/rtc-ds1302.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/rtc/rtc-ds1302.c 2011-05-19 14:23:31.000000000 +0200 @@ -199,7 +199,7 @@ static int ds1302_rtc_ioctl(struct devic return -ENOIOCTLCMD; } -static struct rtc_class_ops ds1302_rtc_ops = { +static const struct rtc_class_ops ds1302_rtc_ops = { .read_time = ds1302_rtc_read_time, .set_time = ds1302_rtc_set_time, .ioctl = ds1302_rtc_ioctl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-imxdi.c linux-2.6.39-pax/drivers/rtc/rtc-imxdi.c --- linux-2.6.39/drivers/rtc/rtc-imxdi.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/rtc/rtc-imxdi.c 2011-05-19 14:23:31.000000000 +0200 @@ -290,7 +290,7 @@ static int dryice_rtc_set_alarm(struct d return 0; } -static struct rtc_class_ops dryice_rtc_ops = { +static const struct rtc_class_ops dryice_rtc_ops = { .read_time = dryice_rtc_read_time, .set_mmss = dryice_rtc_set_mmss, .alarm_irq_enable = dryice_rtc_alarm_irq_enable, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-jz4740.c linux-2.6.39-pax/drivers/rtc/rtc-jz4740.c --- linux-2.6.39/drivers/rtc/rtc-jz4740.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-jz4740.c 2011-05-19 14:23:31.000000000 +0200 @@ -174,7 +174,7 @@ static int jz4740_rtc_alarm_irq_enable(s return jz4740_rtc_ctrl_set_bits(rtc, JZ_RTC_CTRL_AF_IRQ, enable); } -static struct rtc_class_ops jz4740_rtc_ops = { +static const struct rtc_class_ops jz4740_rtc_ops = { .read_time = jz4740_rtc_read_time, .set_mmss = jz4740_rtc_set_mmss, .read_alarm = jz4740_rtc_read_alarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-m41t80.c linux-2.6.39-pax/drivers/rtc/rtc-m41t80.c --- linux-2.6.39/drivers/rtc/rtc-m41t80.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-m41t80.c 2011-05-19 14:23:31.000000000 +0200 @@ -354,7 +354,7 @@ static int m41t80_rtc_read_alarm(struct return 0; } -static struct rtc_class_ops m41t80_rtc_ops = { +static const struct rtc_class_ops m41t80_rtc_ops = { .read_time = m41t80_rtc_read_time, .set_time = m41t80_rtc_set_time, .read_alarm = m41t80_rtc_read_alarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-mxc.c linux-2.6.39-pax/drivers/rtc/rtc-mxc.c --- linux-2.6.39/drivers/rtc/rtc-mxc.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-mxc.c 2011-05-19 14:23:31.000000000 +0200 @@ -355,7 +355,7 @@ static int mxc_rtc_set_alarm(struct devi } /* RTC layer */ -static struct rtc_class_ops mxc_rtc_ops = { +static const struct rtc_class_ops mxc_rtc_ops = { .release = mxc_rtc_release, .read_time = mxc_rtc_read_time, .set_mmss = mxc_rtc_set_mmss, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-nuc900.c linux-2.6.39-pax/drivers/rtc/rtc-nuc900.c --- linux-2.6.39/drivers/rtc/rtc-nuc900.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-nuc900.c 2011-05-19 14:23:31.000000000 +0200 @@ -214,7 +214,7 @@ static int nuc900_rtc_set_alarm(struct d return 0; } -static struct rtc_class_ops nuc900_rtc_ops = { +static const struct rtc_class_ops nuc900_rtc_ops = { .read_time = nuc900_rtc_read_time, .set_time = nuc900_rtc_set_time, .read_alarm = nuc900_rtc_read_alarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-omap.c linux-2.6.39-pax/drivers/rtc/rtc-omap.c --- linux-2.6.39/drivers/rtc/rtc-omap.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-omap.c 2011-05-19 14:23:31.000000000 +0200 @@ -274,7 +274,7 @@ static int omap_rtc_set_alarm(struct dev return 0; } -static struct rtc_class_ops omap_rtc_ops = { +static const struct rtc_class_ops omap_rtc_ops = { .read_time = omap_rtc_read_time, .set_time = omap_rtc_set_time, .read_alarm = omap_rtc_read_alarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-pcf50633.c linux-2.6.39-pax/drivers/rtc/rtc-pcf50633.c --- linux-2.6.39/drivers/rtc/rtc-pcf50633.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-pcf50633.c 2011-05-19 14:23:31.000000000 +0200 @@ -238,7 +238,7 @@ static int pcf50633_rtc_set_alarm(struct return ret; } -static struct rtc_class_ops pcf50633_rtc_ops = { +static const struct rtc_class_ops pcf50633_rtc_ops = { .read_time = pcf50633_rtc_read_time, .set_time = pcf50633_rtc_set_time, .read_alarm = pcf50633_rtc_read_alarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-pl031.c linux-2.6.39-pax/drivers/rtc/rtc-pl031.c --- linux-2.6.39/drivers/rtc/rtc-pl031.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-pl031.c 2011-05-19 14:23:31.000000000 +0200 @@ -374,7 +374,7 @@ err_req: } /* Operations for the original ARM version */ -static struct rtc_class_ops arm_pl031_ops = { +static const struct rtc_class_ops arm_pl031_ops = { .read_time = pl031_read_time, .set_time = pl031_set_time, .read_alarm = pl031_read_alarm, @@ -383,7 +383,7 @@ static struct rtc_class_ops arm_pl031_op }; /* The First ST derivative */ -static struct rtc_class_ops stv1_pl031_ops = { +static const struct rtc_class_ops stv1_pl031_ops = { .read_time = pl031_read_time, .set_time = pl031_set_time, .read_alarm = pl031_read_alarm, @@ -392,7 +392,7 @@ static struct rtc_class_ops stv1_pl031_o }; /* And the second ST derivative */ -static struct rtc_class_ops stv2_pl031_ops = { +static const struct rtc_class_ops stv2_pl031_ops = { .read_time = pl031_stv2_read_time, .set_time = pl031_stv2_set_time, .read_alarm = pl031_stv2_read_alarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-rx8025.c linux-2.6.39-pax/drivers/rtc/rtc-rx8025.c --- linux-2.6.39/drivers/rtc/rtc-rx8025.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-rx8025.c 2011-05-19 14:23:31.000000000 +0200 @@ -424,7 +424,7 @@ static int rx8025_alarm_irq_enable(struc return 0; } -static struct rtc_class_ops rx8025_rtc_ops = { +static const struct rtc_class_ops rx8025_rtc_ops = { .read_time = rx8025_get_time, .set_time = rx8025_set_time, .read_alarm = rx8025_read_alarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-sh.c linux-2.6.39-pax/drivers/rtc/rtc-sh.c --- linux-2.6.39/drivers/rtc/rtc-sh.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-sh.c 2011-05-19 14:23:31.000000000 +0200 @@ -576,7 +576,7 @@ static int sh_rtc_set_alarm(struct devic return 0; } -static struct rtc_class_ops sh_rtc_ops = { +static const struct rtc_class_ops sh_rtc_ops = { .read_time = sh_rtc_read_time, .set_time = sh_rtc_set_time, .read_alarm = sh_rtc_read_alarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-stmp3xxx.c linux-2.6.39-pax/drivers/rtc/rtc-stmp3xxx.c --- linux-2.6.39/drivers/rtc/rtc-stmp3xxx.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-stmp3xxx.c 2011-05-19 14:23:31.000000000 +0200 @@ -133,7 +133,7 @@ static int stmp3xxx_rtc_set_alarm(struct return 0; } -static struct rtc_class_ops stmp3xxx_rtc_ops = { +static const struct rtc_class_ops stmp3xxx_rtc_ops = { .alarm_irq_enable = stmp3xxx_alarm_irq_enable, .read_time = stmp3xxx_rtc_gettime, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-tegra.c linux-2.6.39-pax/drivers/rtc/rtc-tegra.c --- linux-2.6.39/drivers/rtc/rtc-tegra.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-tegra.c 2011-05-19 14:23:31.000000000 +0200 @@ -294,7 +294,7 @@ static irqreturn_t tegra_rtc_irq_handler return IRQ_HANDLED; } -static struct rtc_class_ops tegra_rtc_ops = { +static const struct rtc_class_ops tegra_rtc_ops = { .read_time = tegra_rtc_read_time, .set_time = tegra_rtc_set_time, .read_alarm = tegra_rtc_read_alarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-twl.c linux-2.6.39-pax/drivers/rtc/rtc-twl.c --- linux-2.6.39/drivers/rtc/rtc-twl.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/rtc/rtc-twl.c 2011-05-19 14:23:31.000000000 +0200 @@ -415,7 +415,7 @@ out: return ret; } -static struct rtc_class_ops twl_rtc_ops = { +static const struct rtc_class_ops twl_rtc_ops = { .read_time = twl_rtc_read_time, .set_time = twl_rtc_set_time, .read_alarm = twl_rtc_read_alarm, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/rtc/rtc-v3020.c linux-2.6.39-pax/drivers/rtc/rtc-v3020.c --- linux-2.6.39/drivers/rtc/rtc-v3020.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/rtc/rtc-v3020.c 2011-05-19 14:23:31.000000000 +0200 @@ -62,7 +62,7 @@ struct v3020 { /* GPIO access */ struct v3020_gpio *gpio; - struct v3020_chip_ops *ops; + const struct v3020_chip_ops *ops; struct rtc_device *rtc; }; @@ -100,7 +100,7 @@ static unsigned char v3020_mmio_read_bit return !!(readl(chip->ioaddress) & (1 << chip->leftshift)); } -static struct v3020_chip_ops v3020_mmio_ops = { +static const struct v3020_chip_ops v3020_mmio_ops = { .map_io = v3020_mmio_map, .unmap_io = v3020_mmio_unmap, .read_bit = v3020_mmio_read_bit, @@ -177,7 +177,7 @@ static unsigned char v3020_gpio_read_bit return bit; } -static struct v3020_chip_ops v3020_gpio_ops = { +static const struct v3020_chip_ops v3020_gpio_ops = { .map_io = v3020_gpio_map, .unmap_io = v3020_gpio_unmap, .read_bit = v3020_gpio_read_bit, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/s390/char/con3270.c linux-2.6.39-pax/drivers/s390/char/con3270.c --- linux-2.6.39/drivers/s390/char/con3270.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/s390/char/con3270.c 2011-05-19 14:23:31.000000000 +0200 @@ -28,7 +28,7 @@ #define CON3270_OUTPUT_BUFFER_SIZE 1024 #define CON3270_STRING_PAGES 4 -static struct raw3270_fn con3270_fn; +static const struct raw3270_fn con3270_fn; /* * Main 3270 console view data structure. @@ -413,7 +413,7 @@ con3270_irq(struct con3270 *cp, struct r } /* Console view to a 3270 device. */ -static struct raw3270_fn con3270_fn = { +static const struct raw3270_fn con3270_fn = { .activate = con3270_activate, .deactivate = con3270_deactivate, .intv = (void *) con3270_irq diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/s390/char/fs3270.c linux-2.6.39-pax/drivers/s390/char/fs3270.c --- linux-2.6.39/drivers/s390/char/fs3270.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/s390/char/fs3270.c 2011-05-19 14:23:31.000000000 +0200 @@ -24,7 +24,7 @@ #include "raw3270.h" #include "ctrlchar.h" -static struct raw3270_fn fs3270_fn; +static const struct raw3270_fn fs3270_fn; struct fs3270 { struct raw3270_view view; @@ -413,7 +413,7 @@ fs3270_release(struct raw3270_view *view } /* View to a 3270 device. Can be console, tty or fullscreen. */ -static struct raw3270_fn fs3270_fn = { +static const struct raw3270_fn fs3270_fn = { .activate = fs3270_activate, .deactivate = fs3270_deactivate, .intv = (void *) fs3270_irq, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/s390/char/raw3270.c linux-2.6.39-pax/drivers/s390/char/raw3270.c --- linux-2.6.39/drivers/s390/char/raw3270.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/s390/char/raw3270.c 2011-05-19 14:23:31.000000000 +0200 @@ -488,7 +488,7 @@ raw3270_init_irq(struct raw3270_view *vi return RAW3270_IO_DONE; } -static struct raw3270_fn raw3270_init_fn = { +static const struct raw3270_fn raw3270_init_fn = { .intv = raw3270_init_irq }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/s390/char/tty3270.c linux-2.6.39-pax/drivers/s390/char/tty3270.c --- linux-2.6.39/drivers/s390/char/tty3270.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/s390/char/tty3270.c 2011-05-19 14:23:31.000000000 +0200 @@ -37,7 +37,7 @@ struct tty_driver *tty3270_driver; static int tty3270_max_index; -static struct raw3270_fn tty3270_fn; +static const struct raw3270_fn tty3270_fn; struct tty3270_cell { unsigned char character; @@ -834,7 +834,7 @@ tty3270_del_views(void) } } -static struct raw3270_fn tty3270_fn = { +static const struct raw3270_fn tty3270_fn = { .activate = tty3270_activate, .deactivate = tty3270_deactivate, .intv = (void *) tty3270_irq, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/s390/cio/qdio_debug.c linux-2.6.39-pax/drivers/s390/cio/qdio_debug.c --- linux-2.6.39/drivers/s390/cio/qdio_debug.c 2011-03-15 19:34:22.000000000 +0100 +++ linux-2.6.39-pax/drivers/s390/cio/qdio_debug.c 2011-05-19 14:23:31.000000000 +0200 @@ -225,7 +225,7 @@ static int qperf_seq_open(struct inode * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/s390/crypto/zcrypt_cex2a.c linux-2.6.39-pax/drivers/s390/crypto/zcrypt_cex2a.c --- linux-2.6.39/drivers/s390/crypto/zcrypt_cex2a.c 2011-03-15 19:34:22.000000000 +0100 +++ linux-2.6.39-pax/drivers/s390/crypto/zcrypt_cex2a.c 2011-05-19 14:23:31.000000000 +0200 @@ -415,7 +415,7 @@ out_free: /** * The crypto operations for a CEX2A card. */ -static struct zcrypt_ops zcrypt_cex2a_ops = { +static const struct zcrypt_ops zcrypt_cex2a_ops = { .rsa_modexpo = zcrypt_cex2a_modexpo, .rsa_modexpo_crt = zcrypt_cex2a_modexpo_crt, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/s390/crypto/zcrypt_pcica.c linux-2.6.39-pax/drivers/s390/crypto/zcrypt_pcica.c --- linux-2.6.39/drivers/s390/crypto/zcrypt_pcica.c 2011-03-15 19:34:22.000000000 +0100 +++ linux-2.6.39-pax/drivers/s390/crypto/zcrypt_pcica.c 2011-05-19 14:23:31.000000000 +0200 @@ -347,7 +347,7 @@ out_free: /** * The crypto operations for a PCICA card. */ -static struct zcrypt_ops zcrypt_pcica_ops = { +static const struct zcrypt_ops zcrypt_pcica_ops = { .rsa_modexpo = zcrypt_pcica_modexpo, .rsa_modexpo_crt = zcrypt_pcica_modexpo_crt, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/s390/crypto/zcrypt_pcicc.c linux-2.6.39-pax/drivers/s390/crypto/zcrypt_pcicc.c --- linux-2.6.39/drivers/s390/crypto/zcrypt_pcicc.c 2011-03-15 19:34:22.000000000 +0100 +++ linux-2.6.39-pax/drivers/s390/crypto/zcrypt_pcicc.c 2011-05-19 14:23:31.000000000 +0200 @@ -553,7 +553,7 @@ out_free: /** * The crypto operations for a PCICC card. */ -static struct zcrypt_ops zcrypt_pcicc_ops = { +static const struct zcrypt_ops zcrypt_pcicc_ops = { .rsa_modexpo = zcrypt_pcicc_modexpo, .rsa_modexpo_crt = zcrypt_pcicc_modexpo_crt, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/s390/crypto/zcrypt_pcixcc.c linux-2.6.39-pax/drivers/s390/crypto/zcrypt_pcixcc.c --- linux-2.6.39/drivers/s390/crypto/zcrypt_pcixcc.c 2011-03-15 19:34:22.000000000 +0100 +++ linux-2.6.39-pax/drivers/s390/crypto/zcrypt_pcixcc.c 2011-05-19 14:23:31.000000000 +0200 @@ -851,13 +851,13 @@ static long zcrypt_pcixcc_rng(struct zcr /** * The crypto operations for a PCIXCC/CEX2C card. */ -static struct zcrypt_ops zcrypt_pcixcc_ops = { +static const struct zcrypt_ops zcrypt_pcixcc_ops = { .rsa_modexpo = zcrypt_pcixcc_modexpo, .rsa_modexpo_crt = zcrypt_pcixcc_modexpo_crt, .send_cprb = zcrypt_pcixcc_send_cprb, }; -static struct zcrypt_ops zcrypt_pcixcc_with_rng_ops = { +static const struct zcrypt_ops zcrypt_pcixcc_with_rng_ops = { .rsa_modexpo = zcrypt_pcixcc_modexpo, .rsa_modexpo_crt = zcrypt_pcixcc_modexpo_crt, .send_cprb = zcrypt_pcixcc_send_cprb, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/s390/kvm/kvm_virtio.c linux-2.6.39-pax/drivers/s390/kvm/kvm_virtio.c --- linux-2.6.39/drivers/s390/kvm/kvm_virtio.c 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/s390/kvm/kvm_virtio.c 2011-05-19 14:23:31.000000000 +0200 @@ -266,7 +266,7 @@ error: /* * The config ops structure as defined by virtio config */ -static struct virtio_config_ops kvm_vq_configspace_ops = { +static const struct virtio_config_ops kvm_vq_configspace_ops = { .get_features = kvm_get_features, .finalize_features = kvm_finalize_features, .get = kvm_get, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/s390/net/qeth_core.h linux-2.6.39-pax/drivers/s390/net/qeth_core.h --- linux-2.6.39/drivers/s390/net/qeth_core.h 2011-05-19 10:22:11.000000000 +0200 +++ linux-2.6.39-pax/drivers/s390/net/qeth_core.h 2011-05-19 14:23:31.000000000 +0200 @@ -743,7 +743,7 @@ struct qeth_card { struct qeth_qdio_info qdio; struct qeth_perf_stats perf_stats; int read_or_write_problem; - struct qeth_osn_info osn_info; + const struct qeth_osn_info osn_info; struct qeth_discipline discipline; atomic_t force_alloc_skb; struct service_level qeth_service_level; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/53c700.c linux-2.6.39-pax/drivers/scsi/53c700.c --- linux-2.6.39/drivers/scsi/53c700.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/53c700.c 2011-05-19 14:23:31.000000000 +0200 @@ -2153,7 +2153,7 @@ EXPORT_SYMBOL(NCR_700_detect); EXPORT_SYMBOL(NCR_700_release); EXPORT_SYMBOL(NCR_700_intr); -static struct spi_function_template NCR_700_transport_functions = { +static struct spi_function_template NCR_700_transport_functions = { .set_period = NCR_700_set_period, .show_period = 1, .set_offset = NCR_700_set_offset, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/BusLogic.c linux-2.6.39-pax/drivers/scsi/BusLogic.c --- linux-2.6.39/drivers/scsi/BusLogic.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/BusLogic.c 2011-05-19 13:45:32.000000000 +0200 @@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter *PrototypeHostAdapter) { + pax_track_stack(); + /* If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint Host Adapters; otherwise, default to the standard ISA MultiMaster probe. diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/aacraid/commctrl.c linux-2.6.39-pax/drivers/scsi/aacraid/commctrl.c --- linux-2.6.39/drivers/scsi/aacraid/commctrl.c 2011-05-19 10:22:13.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/aacraid/commctrl.c 2011-05-19 13:45:32.000000000 +0200 @@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d u32 actual_fibsize64, actual_fibsize = 0; int i; + pax_track_stack(); if (dev->in_reset) { dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n")); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/bfa/bfa_core.c linux-2.6.39-pax/drivers/scsi/bfa/bfa_core.c --- linux-2.6.39/drivers/scsi/bfa/bfa_core.c 2011-05-19 10:22:14.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/bfa/bfa_core.c 2011-05-19 14:23:31.000000000 +0200 @@ -24,7 +24,7 @@ BFA_TRC_FILE(HAL, CORE); /* * BFA module list terminated by NULL */ -static struct bfa_module_s *hal_mods[] = { +static const struct bfa_module_s *hal_mods[] = { &hal_mod_sgpg, &hal_mod_fcport, &hal_mod_fcxp, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/bfa/bfa_fcs.c linux-2.6.39-pax/drivers/scsi/bfa/bfa_fcs.c --- linux-2.6.39/drivers/scsi/bfa/bfa_fcs.c 2011-05-19 10:22:14.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/bfa/bfa_fcs.c 2011-05-19 14:23:31.000000000 +0200 @@ -70,7 +70,7 @@ bfa_fcs_attach(struct bfa_fcs_s *fcs, st bfa_boolean_t min_cfg) { int i; - struct bfa_fcs_mod_s *mod; + const struct bfa_fcs_mod_s *mod; fcs->bfa = bfa; fcs->bfad = bfad; @@ -93,7 +93,7 @@ void bfa_fcs_init(struct bfa_fcs_s *fcs) { int i, npbc_vports; - struct bfa_fcs_mod_s *mod; + const struct bfa_fcs_mod_s *mod; struct bfi_pbc_vport_s pbc_vports[BFI_PBC_MAX_VPORTS]; for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) { @@ -140,7 +140,7 @@ bfa_fcs_driver_info_init(struct bfa_fcs_ void bfa_fcs_exit(struct bfa_fcs_s *fcs) { - struct bfa_fcs_mod_s *mod; + const struct bfa_fcs_mod_s *mod; int nmods, i; bfa_wc_init(&fcs->wc, bfa_fcs_exit_comp, fcs); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/bfa/bfa_fcs_lport.c linux-2.6.39-pax/drivers/scsi/bfa/bfa_fcs_lport.c --- linux-2.6.39/drivers/scsi/bfa/bfa_fcs_lport.c 2011-05-19 10:22:14.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/bfa/bfa_fcs_lport.c 2011-05-19 13:45:32.000000000 +0200 @@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc u16 len, count; u16 templen; + pax_track_stack(); + /* * get hba attributes */ @@ -1836,6 +1838,8 @@ bfa_fcs_lport_fdmi_build_portattr_block( u8 count = 0; u16 templen; + pax_track_stack(); + /* * get port attributes */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/bfa/bfa_fcs_rport.c linux-2.6.39-pax/drivers/scsi/bfa/bfa_fcs_rport.c --- linux-2.6.39/drivers/scsi/bfa/bfa_fcs_rport.c 2011-03-15 19:34:24.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/bfa/bfa_fcs_rport.c 2011-05-19 13:45:32.000000000 +0200 @@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc struct fc_rpsc_speed_info_s speeds; struct bfa_port_attr_s pport_attr; + pax_track_stack(); + bfa_trc(port->fcs, rx_fchs->s_id); bfa_trc(port->fcs, rx_fchs->d_id); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/bfa/bfa_modules.h linux-2.6.39-pax/drivers/scsi/bfa/bfa_modules.h --- linux-2.6.39/drivers/scsi/bfa/bfa_modules.h 2011-03-15 19:34:24.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/bfa/bfa_modules.h 2011-05-19 14:23:31.000000000 +0200 @@ -68,8 +68,8 @@ enum { static void bfa_ ## __mod ## _stop(struct bfa_s *bfa); \ static void bfa_ ## __mod ## _iocdisable(struct bfa_s *bfa); \ \ - extern struct bfa_module_s hal_mod_ ## __mod; \ - struct bfa_module_s hal_mod_ ## __mod = { \ + extern const struct bfa_module_s hal_mod_ ## __mod; \ + const struct bfa_module_s hal_mod_ ## __mod = { \ bfa_ ## __mod ## _meminfo, \ bfa_ ## __mod ## _attach, \ bfa_ ## __mod ## _detach, \ @@ -116,12 +116,12 @@ struct bfa_s { }; extern bfa_boolean_t bfa_auto_recover; -extern struct bfa_module_s hal_mod_sgpg; -extern struct bfa_module_s hal_mod_fcport; -extern struct bfa_module_s hal_mod_fcxp; -extern struct bfa_module_s hal_mod_lps; -extern struct bfa_module_s hal_mod_uf; -extern struct bfa_module_s hal_mod_rport; -extern struct bfa_module_s hal_mod_fcpim; +extern const struct bfa_module_s hal_mod_sgpg; +extern const struct bfa_module_s hal_mod_fcport; +extern const struct bfa_module_s hal_mod_fcxp; +extern const struct bfa_module_s hal_mod_lps; +extern const struct bfa_module_s hal_mod_uf; +extern const struct bfa_module_s hal_mod_rport; +extern const struct bfa_module_s hal_mod_fcpim; #endif /* __BFA_MODULES_H__ */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/bfa/bfad.c linux-2.6.39-pax/drivers/scsi/bfa/bfad.c --- linux-2.6.39/drivers/scsi/bfa/bfad.c 2011-05-19 10:22:14.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/bfa/bfad.c 2011-05-19 13:45:32.000000000 +0200 @@ -1027,6 +1027,8 @@ bfad_start_ops(struct bfad_s *bfad) { struct bfad_vport_s *vport, *vport_new; struct bfa_fcs_driver_info_s driver_info; + pax_track_stack(); + /* Fill the driver_info info to fcs*/ memset(&driver_info, 0, sizeof(driver_info)); strncpy(driver_info.version, BFAD_DRIVER_VERSION, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/dpt_i2o.c linux-2.6.39-pax/drivers/scsi/dpt_i2o.c --- linux-2.6.39/drivers/scsi/dpt_i2o.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/dpt_i2o.c 2011-05-19 13:45:32.000000000 +0200 @@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p dma_addr_t addr; ulong flags = 0; + pax_track_stack(); + memset(&msg, 0, MAX_MESSAGE_SIZE*4); // get user msg size in u32s if(get_user(size, &user_msg[0])){ @@ -2317,6 +2319,8 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pH s32 rcode; dma_addr_t addr; + pax_track_stack(); + memset(msg, 0 , sizeof(msg)); len = scsi_bufflen(cmd); direction = 0x00000000; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/eata.c linux-2.6.39-pax/drivers/scsi/eata.c --- linux-2.6.39/drivers/scsi/eata.c 2011-05-19 10:22:14.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/eata.c 2011-05-19 13:45:32.000000000 +0200 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por struct hostdata *ha; char name[16]; + pax_track_stack(); + sprintf(name, "%s%d", driver_name, j); if (!request_region(port_base, REGION_SIZE, driver_name)) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/esp_scsi.c linux-2.6.39-pax/drivers/scsi/esp_scsi.c --- linux-2.6.39/drivers/scsi/esp_scsi.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/esp_scsi.c 2011-05-19 14:23:31.000000000 +0200 @@ -2680,7 +2680,7 @@ static void esp_set_width(struct scsi_ta tp->flags |= ESP_TGT_CHECK_NEGO; } -static struct spi_function_template esp_transport_ops = { +static const struct spi_function_template esp_transport_ops = { .set_offset = esp_set_offset, .show_offset = 1, .set_period = esp_set_period, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/fcoe/fcoe.c linux-2.6.39-pax/drivers/scsi/fcoe/fcoe.c --- linux-2.6.39/drivers/scsi/fcoe/fcoe.c 2011-05-19 10:22:14.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/fcoe/fcoe.c 2011-05-19 14:23:31.000000000 +0200 @@ -138,7 +138,7 @@ static int fcoe_vport_disable(struct fc_ static void fcoe_set_vport_symbolic_name(struct fc_vport *); static void fcoe_set_port_id(struct fc_lport *, u32, struct fc_frame *); -static struct libfc_function_template fcoe_libfc_fcn_templ = { +static const struct libfc_function_template fcoe_libfc_fcn_templ = { .frame_send = fcoe_xmit, .ddp_setup = fcoe_ddp_setup, .ddp_done = fcoe_ddp_done, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/fcoe/fcoe_ctlr.c linux-2.6.39-pax/drivers/scsi/fcoe/fcoe_ctlr.c --- linux-2.6.39/drivers/scsi/fcoe/fcoe_ctlr.c 2011-05-19 10:22:14.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/fcoe/fcoe_ctlr.c 2011-05-19 14:23:27.000000000 +0200 @@ -1912,7 +1912,7 @@ static void fcoe_ctlr_vn_rport_callback( mutex_unlock(&fip->ctlr_mutex); } -static struct fc_rport_operations fcoe_ctlr_vn_rport_ops = { +static const struct fc_rport_operations fcoe_ctlr_vn_rport_ops = { .event_callback = fcoe_ctlr_vn_rport_callback, }; @@ -2458,6 +2458,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe } buf; int rc; + pax_track_stack(); + fiph = (struct fip_header *)skb->data; sub = fiph->fip_subcode; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/fnic/fnic_main.c linux-2.6.39-pax/drivers/scsi/fnic/fnic_main.c --- linux-2.6.39/drivers/scsi/fnic/fnic_main.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/fnic/fnic_main.c 2011-05-19 14:23:31.000000000 +0200 @@ -69,7 +69,7 @@ module_param(fnic_log_level, int, S_IRUG MODULE_PARM_DESC(fnic_log_level, "bit mask of fnic logging levels"); -static struct libfc_function_template fnic_transport_template = { +static const struct libfc_function_template fnic_transport_template = { .frame_send = fnic_send, .lport_set_port_id = fnic_set_port_id, .fcp_abort_io = fnic_empty_scsi_cleanup, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/gdth.c linux-2.6.39-pax/drivers/scsi/gdth.c --- linux-2.6.39/drivers/scsi/gdth.c 2011-03-15 19:34:25.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/gdth.c 2011-05-19 13:45:32.000000000 +0200 @@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg) unsigned long flags; gdth_ha_str *ha; + pax_track_stack(); + if (copy_from_user(&ldrv, arg, sizeof(gdth_ioctl_lockdrv))) return -EFAULT; ha = gdth_find_ha(ldrv.ionode); @@ -4139,6 +4141,8 @@ static int ioc_resetdrv(void __user *arg gdth_ha_str *ha; int rval; + pax_track_stack(); + if (copy_from_user(&res, arg, sizeof(gdth_ioctl_reset)) || res.number >= MAX_HDRIVES) return -EFAULT; @@ -4174,6 +4178,8 @@ static int ioc_general(void __user *arg, gdth_ha_str *ha; int rval; + pax_track_stack(); + if (copy_from_user(&gen, arg, sizeof(gdth_ioctl_general))) return -EFAULT; ha = gdth_find_ha(gen.ionode); @@ -4642,6 +4648,9 @@ static void gdth_flush(gdth_ha_str *ha) int i; gdth_cmd_str gdtcmd; char cmnd[MAX_COMMAND_SIZE]; + + pax_track_stack(); + memset(cmnd, 0xff, MAX_COMMAND_SIZE); TRACE2(("gdth_flush() hanum %d\n", ha->hanum)); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/gdth_proc.c linux-2.6.39-pax/drivers/scsi/gdth_proc.c --- linux-2.6.39/drivers/scsi/gdth_proc.c 2011-03-15 19:34:25.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/gdth_proc.c 2011-05-19 13:45:32.000000000 +0200 @@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi u64 paddr; char cmnd[MAX_COMMAND_SIZE]; + + pax_track_stack(); + memset(cmnd, 0xff, 12); memset(&gdtcmd, 0, sizeof(gdth_cmd_str)); @@ -175,6 +178,8 @@ static int gdth_get_info(char *buffer,ch gdth_hget_str *phg; char cmnd[MAX_COMMAND_SIZE]; + pax_track_stack(); + gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL); estr = kmalloc(sizeof(*estr), GFP_KERNEL); if (!gdtcmd || !estr) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/hosts.c linux-2.6.39-pax/drivers/scsi/hosts.c --- linux-2.6.39/drivers/scsi/hosts.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/hosts.c 2011-05-19 13:45:32.000000000 +0200 @@ -42,7 +42,7 @@ #include "scsi_logging.h" -static atomic_t scsi_host_next_hn; /* host_no for next new host */ +static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */ static void scsi_host_cls_release(struct device *dev) @@ -354,7 +354,7 @@ struct Scsi_Host *scsi_host_alloc(struct * subtract one because we increment first then return, but we need to * know what the next host number was before increment */ - shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1; + shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1; shost->dma_channel = 0xff; /* These three are default values which can be overridden */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/hpsa.h linux-2.6.39-pax/drivers/scsi/hpsa.h --- linux-2.6.39/drivers/scsi/hpsa.h 2011-05-19 10:22:14.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/hpsa.h 2011-05-19 14:23:31.000000000 +0200 @@ -347,7 +347,7 @@ static struct access_method SA5_access = SA5_completed, }; -static struct access_method SA5_performant_access = { +static const struct access_method SA5_performant_access = { SA5_submit_command, SA5_performant_intr_mask, SA5_fifo_full, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/hptiop.c linux-2.6.39-pax/drivers/scsi/hptiop.c --- linux-2.6.39/drivers/scsi/hptiop.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/hptiop.c 2011-05-19 14:23:31.000000000 +0200 @@ -1226,7 +1226,7 @@ static void hptiop_remove(struct pci_dev scsi_host_put(host); } -static struct hptiop_adapter_ops hptiop_itl_ops = { +static const struct hptiop_adapter_ops hptiop_itl_ops = { .iop_wait_ready = iop_wait_ready_itl, .internal_memalloc = NULL, .internal_memfree = NULL, @@ -1241,7 +1241,7 @@ static struct hptiop_adapter_ops hptiop_ .post_req = hptiop_post_req_itl, }; -static struct hptiop_adapter_ops hptiop_mv_ops = { +static const struct hptiop_adapter_ops hptiop_mv_ops = { .iop_wait_ready = iop_wait_ready_mv, .internal_memalloc = hptiop_internal_memalloc_mv, .internal_memfree = hptiop_internal_memfree_mv, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/ibmvscsi/ibmvfc.c linux-2.6.39-pax/drivers/scsi/ibmvscsi/ibmvfc.c --- linux-2.6.39/drivers/scsi/ibmvscsi/ibmvfc.c 2011-03-15 19:34:25.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/ibmvscsi/ibmvfc.c 2011-05-19 14:23:31.000000000 +0200 @@ -4881,7 +4881,7 @@ static struct vio_device_id ibmvfc_devic }; MODULE_DEVICE_TABLE(vio, ibmvfc_device_table); -static struct dev_pm_ops ibmvfc_pm_ops = { +static const struct dev_pm_ops ibmvfc_pm_ops = { .resume = ibmvfc_resume }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.c linux-2.6.39-pax/drivers/scsi/ibmvscsi/ibmvscsi.c --- linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/ibmvscsi/ibmvscsi.c 2011-05-19 14:23:31.000000000 +0200 @@ -104,7 +104,7 @@ static struct scsi_transport_template *i #define IBMVSCSI_VERSION "1.5.9" -static struct ibmvscsi_ops *ibmvscsi_ops; +static const struct ibmvscsi_ops *ibmvscsi_ops; MODULE_DESCRIPTION("IBM Virtual SCSI"); MODULE_AUTHOR("Dave Boutcher"); @@ -2059,7 +2059,7 @@ static struct vio_device_id ibmvscsi_dev }; MODULE_DEVICE_TABLE(vio, ibmvscsi_device_table); -static struct dev_pm_ops ibmvscsi_pm_ops = { +static const struct dev_pm_ops ibmvscsi_pm_ops = { .resume = ibmvscsi_resume }; @@ -2075,7 +2075,7 @@ static struct vio_driver ibmvscsi_driver } }; -static struct srp_function_template ibmvscsi_transport_functions = { +static const struct srp_function_template ibmvscsi_transport_functions = { }; int __init ibmvscsi_module_init(void) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.h linux-2.6.39-pax/drivers/scsi/ibmvscsi/ibmvscsi.h --- linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/ibmvscsi/ibmvscsi.h 2011-05-19 14:23:31.000000000 +0200 @@ -127,7 +127,7 @@ struct ibmvscsi_ops { int (*resume) (struct ibmvscsi_host_data *hostdata); }; -extern struct ibmvscsi_ops iseriesvscsi_ops; -extern struct ibmvscsi_ops rpavscsi_ops; +extern const struct ibmvscsi_ops iseriesvscsi_ops; +extern const struct ibmvscsi_ops rpavscsi_ops; #endif /* IBMVSCSI_H */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/ibmvscsi/ibmvstgt.c linux-2.6.39-pax/drivers/scsi/ibmvscsi/ibmvstgt.c --- linux-2.6.39/drivers/scsi/ibmvscsi/ibmvstgt.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/ibmvscsi/ibmvstgt.c 2011-05-19 14:23:31.000000000 +0200 @@ -951,7 +951,7 @@ static int get_system_info(void) return 0; } -static struct srp_function_template ibmvstgt_transport_functions = { +static const struct srp_function_template ibmvstgt_transport_functions = { .tsk_mgmt_response = ibmvstgt_tsk_mgmt_response, .it_nexus_response = ibmvstgt_it_nexus_response, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/ibmvscsi/iseries_vscsi.c linux-2.6.39-pax/drivers/scsi/ibmvscsi/iseries_vscsi.c --- linux-2.6.39/drivers/scsi/ibmvscsi/iseries_vscsi.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/ibmvscsi/iseries_vscsi.c 2011-05-19 14:23:31.000000000 +0200 @@ -163,7 +163,7 @@ static int iseriesvscsi_resume(struct ib return 0; } -struct ibmvscsi_ops iseriesvscsi_ops = { +const struct ibmvscsi_ops iseriesvscsi_ops = { .init_crq_queue = iseriesvscsi_init_crq_queue, .release_crq_queue = iseriesvscsi_release_crq_queue, .reset_crq_queue = iseriesvscsi_reset_crq_queue, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/ibmvscsi/rpa_vscsi.c linux-2.6.39-pax/drivers/scsi/ibmvscsi/rpa_vscsi.c --- linux-2.6.39/drivers/scsi/ibmvscsi/rpa_vscsi.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/ibmvscsi/rpa_vscsi.c 2011-05-19 14:23:31.000000000 +0200 @@ -358,7 +358,7 @@ static int rpavscsi_resume(struct ibmvsc return 0; } -struct ibmvscsi_ops rpavscsi_ops = { +const struct ibmvscsi_ops rpavscsi_ops = { .init_crq_queue = rpavscsi_init_crq_queue, .release_crq_queue = rpavscsi_release_crq_queue, .reset_crq_queue = rpavscsi_reset_crq_queue, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/ipr.c linux-2.6.39-pax/drivers/scsi/ipr.c --- linux-2.6.39/drivers/scsi/ipr.c 2011-05-19 10:22:14.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/ipr.c 2011-05-19 14:23:31.000000000 +0200 @@ -6210,7 +6210,7 @@ static bool ipr_qc_fill_rtf(struct ata_q 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/libfc/fc_exch.c linux-2.6.39-pax/drivers/scsi/libfc/fc_exch.c --- linux-2.6.39/drivers/scsi/libfc/fc_exch.c 2011-05-19 10:22:14.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/libfc/fc_exch.c 2011-05-19 13:45:32.000000000 +0200 @@ -105,12 +105,12 @@ struct fc_exch_mgr { * 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; }; @@ -700,7 +700,7 @@ static struct fc_exch *fc_exch_em_alloc( /* 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)); @@ -761,7 +761,7 @@ out: 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; } @@ -906,7 +906,7 @@ static enum fc_pf_rjt_reason fc_seq_look 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; } @@ -936,7 +936,7 @@ static enum fc_pf_rjt_reason fc_seq_look 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; } @@ -947,7 +947,7 @@ static enum fc_pf_rjt_reason fc_seq_look } 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; } @@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_look } 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; } @@ -1392,22 +1392,22 @@ static void fc_exch_recv_seq_resp(struct 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); @@ -1416,7 +1416,7 @@ static void fc_exch_recv_seq_resp(struct 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; } @@ -1479,9 +1479,9 @@ static void fc_exch_recv_resp(struct fc_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/libfc/fc_lport.c linux-2.6.39-pax/drivers/scsi/libfc/fc_lport.c --- linux-2.6.39/drivers/scsi/libfc/fc_lport.c 2011-05-19 10:22:15.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/libfc/fc_lport.c 2011-05-19 14:23:31.000000000 +0200 @@ -1299,7 +1299,7 @@ static void fc_lport_enter_ns(struct fc_ fc_lport_error(lport, fp); } -static struct fc_rport_operations fc_lport_rport_ops = { +static const struct fc_rport_operations fc_lport_rport_ops = { .event_callback = fc_lport_rport_callback, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/libfc/fc_rport.c linux-2.6.39-pax/drivers/scsi/libfc/fc_rport.c --- linux-2.6.39/drivers/scsi/libfc/fc_rport.c 2011-05-19 10:22:15.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/libfc/fc_rport.c 2011-05-19 14:23:31.000000000 +0200 @@ -256,7 +256,7 @@ static void fc_rport_work(struct work_st struct fc_rport_libfc_priv *rpriv; enum fc_rport_event event; struct fc_lport *lport = rdata->local_port; - struct fc_rport_operations *rport_ops; + const struct fc_rport_operations *rport_ops; struct fc_rport_identifiers ids; struct fc_rport *rport; struct fc4_prov *prov; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/libsas/sas_ata.c linux-2.6.39-pax/drivers/scsi/libsas/sas_ata.c --- linux-2.6.39/drivers/scsi/libsas/sas_ata.c 2011-05-19 10:22:15.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/libsas/sas_ata.c 2011-05-19 14:23:27.000000000 +0200 @@ -307,14 +307,14 @@ static void sas_ata_post_internal(struct } } -static struct ata_port_operations sas_sata_ops = { +static const struct ata_port_operations sas_sata_ops = { .prereset = ata_std_prereset, .softreset = NULL, .hardreset = sas_ata_hard_reset, .postreset = ata_std_postreset, .error_handler = ata_std_error_handler, .post_internal_cmd = sas_ata_post_internal, - .qc_defer = ata_std_qc_defer, + .qc_defer = ata_std_qc_defer, .qc_prep = ata_noop_qc_prep, .qc_issue = sas_ata_qc_issue, .qc_fill_rtf = sas_ata_qc_fill_rtf, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/lpfc/lpfc.h linux-2.6.39-pax/drivers/scsi/lpfc/lpfc.h --- linux-2.6.39/drivers/scsi/lpfc/lpfc.h 2011-05-19 10:22:15.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/lpfc/lpfc.h 2011-05-19 13:45:32.000000000 +0200 @@ -419,7 +419,7 @@ struct lpfc_vport { struct dentry *debug_nodelist; struct dentry *vport_debugfs_root; struct lpfc_debugfs_trc *disc_trc; - atomic_t disc_trc_cnt; + atomic_unchecked_t disc_trc_cnt; #endif uint8_t stat_data_enabled; uint8_t stat_data_blocked; @@ -785,8 +785,8 @@ struct lpfc_hba { struct timer_list fabric_block_timer; unsigned long bit_flags; #define FABRIC_COMANDS_BLOCKED 0 - atomic_t num_rsrc_err; - atomic_t num_cmd_success; + atomic_unchecked_t num_rsrc_err; + atomic_unchecked_t num_cmd_success; unsigned long last_rsrc_error_time; unsigned long last_ramp_down_time; unsigned long last_ramp_up_time; @@ -800,7 +800,7 @@ struct lpfc_hba { struct dentry *debug_dumpDif; /* BlockGuard BPL*/ struct dentry *debug_slow_ring_trc; struct lpfc_debugfs_trc *slow_ring_trc; - atomic_t slow_ring_trc_cnt; + atomic_unchecked_t slow_ring_trc_cnt; /* iDiag debugfs sub-directory */ struct dentry *idiag_root; struct dentry *idiag_pci_cfg; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.39-pax/drivers/scsi/lpfc/lpfc_debugfs.c --- linux-2.6.39/drivers/scsi/lpfc/lpfc_debugfs.c 2011-05-19 10:22:15.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/lpfc/lpfc_debugfs.c 2011-05-19 13:45:32.000000000 +0200 @@ -104,7 +104,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_ #include -static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0); +static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0); static unsigned long lpfc_debugfs_start_time = 0L; /* iDiag */ @@ -141,7 +141,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_v lpfc_debugfs_enable = 0; len = 0; - index = (atomic_read(&vport->disc_trc_cnt) + 1) & + index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) & (lpfc_debugfs_max_disc_trc - 1); for (i = index; i < lpfc_debugfs_max_disc_trc; i++) { dtp = vport->disc_trc + i; @@ -202,7 +202,7 @@ lpfc_debugfs_slow_ring_trc_data(struct l lpfc_debugfs_enable = 0; len = 0; - index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) & + index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) & (lpfc_debugfs_max_slow_ring_trc - 1); for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) { dtp = phba->slow_ring_trc + i; @@ -380,6 +380,8 @@ lpfc_debugfs_dumpHBASlim_data(struct lpf uint32_t *ptr; char buffer[1024]; + pax_track_stack(); + off = 0; spin_lock_irq(&phba->hbalock); @@ -617,14 +619,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport !vport || !vport->disc_trc) return; - index = atomic_inc_return(&vport->disc_trc_cnt) & + index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) & (lpfc_debugfs_max_disc_trc - 1); dtp = vport->disc_trc + index; dtp->fmt = fmt; dtp->data1 = data1; dtp->data2 = data2; dtp->data3 = data3; - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt); + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt); dtp->jif = jiffies; #endif return; @@ -655,14 +657,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_h !phba || !phba->slow_ring_trc) return; - index = atomic_inc_return(&phba->slow_ring_trc_cnt) & + index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) & (lpfc_debugfs_max_slow_ring_trc - 1); dtp = phba->slow_ring_trc + index; dtp->fmt = fmt; dtp->data1 = data1; dtp->data2 = data2; dtp->data3 = data3; - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt); + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt); dtp->jif = jiffies; #endif return; @@ -2145,7 +2147,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor "slow_ring buffer\n"); goto debug_failed; } - atomic_set(&phba->slow_ring_trc_cnt, 0); + atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0); memset(phba->slow_ring_trc, 0, (sizeof(struct lpfc_debugfs_trc) * lpfc_debugfs_max_slow_ring_trc)); @@ -2191,7 +2193,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor "buffer\n"); goto debug_failed; } - atomic_set(&vport->disc_trc_cnt, 0); + atomic_set_unchecked(&vport->disc_trc_cnt, 0); snprintf(name, sizeof(name), "discovery_trace"); vport->debug_disc_trc = diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.39-pax/drivers/scsi/lpfc/lpfc_scsi.c --- linux-2.6.39/drivers/scsi/lpfc/lpfc_scsi.c 2011-05-19 10:22:15.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/lpfc/lpfc_scsi.c 2011-05-19 13:45:32.000000000 +0200 @@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb uint32_t evt_posted; spin_lock_irqsave(&phba->hbalock, flags); - atomic_inc(&phba->num_rsrc_err); + atomic_inc_unchecked(&phba->num_rsrc_err); phba->last_rsrc_error_time = jiffies; if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) { @@ -338,7 +338,7 @@ lpfc_rampup_queue_depth(struct lpfc_vpor unsigned long flags; struct lpfc_hba *phba = vport->phba; uint32_t evt_posted; - atomic_inc(&phba->num_cmd_success); + atomic_inc_unchecked(&phba->num_cmd_success); if (vport->cfg_lun_queue_depth <= queue_depth) return; @@ -382,8 +382,8 @@ lpfc_ramp_down_queue_handler(struct lpfc unsigned long num_rsrc_err, num_cmd_success; int i; - num_rsrc_err = atomic_read(&phba->num_rsrc_err); - num_cmd_success = atomic_read(&phba->num_cmd_success); + num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err); + num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success); vports = lpfc_create_vport_work_array(phba); if (vports != NULL) @@ -403,8 +403,8 @@ lpfc_ramp_down_queue_handler(struct lpfc } } lpfc_destroy_vport_work_array(phba, vports); - atomic_set(&phba->num_rsrc_err, 0); - atomic_set(&phba->num_cmd_success, 0); + atomic_set_unchecked(&phba->num_rsrc_err, 0); + atomic_set_unchecked(&phba->num_cmd_success, 0); } /** @@ -438,8 +438,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_h } } lpfc_destroy_vport_work_array(phba, vports); - atomic_set(&phba->num_rsrc_err, 0); - atomic_set(&phba->num_cmd_success, 0); + atomic_set_unchecked(&phba->num_rsrc_err, 0); + atomic_set_unchecked(&phba->num_cmd_success, 0); } /** diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/mac_esp.c linux-2.6.39-pax/drivers/scsi/mac_esp.c --- linux-2.6.39/drivers/scsi/mac_esp.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/mac_esp.c 2011-05-19 14:23:31.000000000 +0200 @@ -473,7 +473,7 @@ static irqreturn_t mac_scsi_esp_intr(int return IRQ_HANDLED; } -static struct esp_driver_ops mac_esp_ops = { +static const struct esp_driver_ops mac_esp_ops = { .esp_write8 = mac_esp_write8, .esp_read8 = mac_esp_read8, .map_single = mac_esp_map_single, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.39-pax/drivers/scsi/megaraid/megaraid_mbox.c --- linux-2.6.39/drivers/scsi/megaraid/megaraid_mbox.c 2011-05-19 10:22:16.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/megaraid/megaraid_mbox.c 2011-05-19 13:45:32.000000000 +0200 @@ -3510,6 +3510,8 @@ megaraid_cmm_register(adapter_t *adapter int rval; int i; + pax_track_stack(); + // Allocate memory for the base list of scb for management module. adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/megaraid/megaraid_sas.h linux-2.6.39-pax/drivers/scsi/megaraid/megaraid_sas.h --- linux-2.6.39/drivers/scsi/megaraid/megaraid_sas.h 2011-05-19 10:22:16.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/megaraid/megaraid_sas.h 2011-05-19 14:23:31.000000000 +0200 @@ -1330,7 +1330,7 @@ struct megasas_instance { atomic_t fw_outstanding; atomic_t fw_reset_no_pci_access; - struct megasas_instance_template *instancet; + const struct megasas_instance_template *instancet; struct tasklet_struct isr_tasklet; struct work_struct work_init; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_base.c linux-2.6.39-pax/drivers/scsi/megaraid/megaraid_sas_base.c --- linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_base.c 2011-05-19 10:22:16.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/megaraid/megaraid_sas_base.c 2011-05-19 14:23:31.000000000 +0200 @@ -366,7 +366,7 @@ megasas_check_reset_xscale(struct megasa return 0; } -static struct megasas_instance_template megasas_instance_template_xscale = { +static const struct megasas_instance_template megasas_instance_template_xscale = { .fire_cmd = megasas_fire_cmd_xscale, .enable_intr = megasas_enable_intr_xscale, @@ -497,7 +497,7 @@ megasas_check_reset_ppc(struct megasas_i { return 0; } -static struct megasas_instance_template megasas_instance_template_ppc = { +static const struct megasas_instance_template megasas_instance_template_ppc = { .fire_cmd = megasas_fire_cmd_ppc, .enable_intr = megasas_enable_intr_ppc, @@ -623,7 +623,7 @@ megasas_check_reset_skinny(struct megasa return 0; } -static struct megasas_instance_template megasas_instance_template_skinny = { +static const struct megasas_instance_template megasas_instance_template_skinny = { .fire_cmd = megasas_fire_cmd_skinny, .enable_intr = megasas_enable_intr_skinny, @@ -810,7 +810,7 @@ megasas_check_reset_gen2(struct megasas_ return 0; } -static struct megasas_instance_template megasas_instance_template_gen2 = { +static const struct megasas_instance_template megasas_instance_template_gen2 = { .fire_cmd = megasas_fire_cmd_gen2, .enable_intr = megasas_enable_intr_gen2, @@ -834,7 +834,7 @@ static struct megasas_instance_template /* * Template added for TB (Fusion) */ -extern struct megasas_instance_template megasas_instance_template_fusion; +extern const struct megasas_instance_template megasas_instance_template_fusion; /** * megasas_issue_polled - Issues a polling command diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_fusion.c linux-2.6.39-pax/drivers/scsi/megaraid/megaraid_sas_fusion.c --- linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_fusion.c 2011-05-19 10:22:16.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/megaraid/megaraid_sas_fusion.c 2011-05-19 14:23:31.000000000 +0200 @@ -2236,7 +2236,7 @@ void megasas_fusion_ocr_wq(struct work_s megasas_reset_fusion(instance->host); } -struct megasas_instance_template megasas_instance_template_fusion = { +const struct megasas_instance_template megasas_instance_template_fusion = { .fire_cmd = megasas_fire_cmd_fusion, .enable_intr = megasas_enable_intr_fusion, .disable_intr = megasas_disable_intr_fusion, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/ncr53c8xx.c linux-2.6.39-pax/drivers/scsi/ncr53c8xx.c --- linux-2.6.39/drivers/scsi/ncr53c8xx.c 2011-05-19 10:22:17.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/ncr53c8xx.c 2011-05-19 14:23:31.000000000 +0200 @@ -8606,7 +8606,7 @@ static void ncr53c8xx_get_signalling(str spi_signalling(shost) = type; } -static struct spi_function_template ncr53c8xx_transport_functions = { +static struct spi_function_template ncr53c8xx_transport_functions = { .set_period = ncr53c8xx_set_period, .show_period = 1, .set_offset = ncr53c8xx_set_offset, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/osd/osd_initiator.c linux-2.6.39-pax/drivers/scsi/osd/osd_initiator.c --- linux-2.6.39/drivers/scsi/osd/osd_initiator.c 2011-05-19 10:22:17.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/osd/osd_initiator.c 2011-05-19 13:45:32.000000000 +0200 @@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st int nelem = ARRAY_SIZE(get_attrs), a = 0; int ret; + pax_track_stack(); + or = osd_start_request(od, GFP_KERNEL); if (!or) return -ENOMEM; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/pmcraid.c linux-2.6.39-pax/drivers/scsi/pmcraid.c --- linux-2.6.39/drivers/scsi/pmcraid.c 2011-05-19 10:22:17.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/pmcraid.c 2011-05-19 13:45:32.000000000 +0200 @@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc res->scsi_dev = scsi_dev; scsi_dev->hostdata = res; res->change_detected = 0; - atomic_set(&res->read_failures, 0); - atomic_set(&res->write_failures, 0); + atomic_set_unchecked(&res->read_failures, 0); + atomic_set_unchecked(&res->write_failures, 0); rc = 0; } spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags); @@ -2677,9 +2677,9 @@ static int pmcraid_error_handler(struct /* If this was a SCSI read/write command keep count of errors */ if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD) - atomic_inc(&res->read_failures); + atomic_inc_unchecked(&res->read_failures); else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD) - atomic_inc(&res->write_failures); + atomic_inc_unchecked(&res->write_failures); if (!RES_IS_GSCSI(res->cfg_entry) && masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) { @@ -3535,7 +3535,7 @@ static int pmcraid_queuecommand_lck( * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses * hrrq_id assigned here in queuecommand */ - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) % + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) % pinstance->num_hrrq; cmd->cmd_done = pmcraid_io_done; @@ -3860,7 +3860,7 @@ static long pmcraid_ioctl_passthrough( * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses * hrrq_id assigned here in queuecommand */ - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) % + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) % pinstance->num_hrrq; if (request_size) { @@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(stru pinstance = container_of(workp, struct pmcraid_instance, worker_q); /* add resources only after host is added into system */ - if (!atomic_read(&pinstance->expose_resources)) + if (!atomic_read_unchecked(&pinstance->expose_resources)) return; fw_version = be16_to_cpu(pinstance->inq_data->fw_version); @@ -5329,8 +5329,8 @@ static int __devinit pmcraid_init_instan init_waitqueue_head(&pinstance->reset_wait_q); atomic_set(&pinstance->outstanding_cmds, 0); - atomic_set(&pinstance->last_message_id, 0); - atomic_set(&pinstance->expose_resources, 0); + atomic_set_unchecked(&pinstance->last_message_id, 0); + atomic_set_unchecked(&pinstance->expose_resources, 0); INIT_LIST_HEAD(&pinstance->free_res_q); INIT_LIST_HEAD(&pinstance->used_res_q); @@ -6045,7 +6045,7 @@ static int __devinit pmcraid_probe( /* Schedule worker thread to handle CCN and take care of adding and * removing devices to OS */ - atomic_set(&pinstance->expose_resources, 1); + atomic_set_unchecked(&pinstance->expose_resources, 1); schedule_work(&pinstance->worker_q); return rc; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/pmcraid.h linux-2.6.39-pax/drivers/scsi/pmcraid.h --- linux-2.6.39/drivers/scsi/pmcraid.h 2011-05-19 10:22:17.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/pmcraid.h 2011-05-19 13:45:32.000000000 +0200 @@ -750,7 +750,7 @@ struct pmcraid_instance { struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS]; /* Message id as filled in last fired IOARCB, used to identify HRRQ */ - atomic_t last_message_id; + atomic_unchecked_t last_message_id; /* configuration table */ struct pmcraid_config_table *cfg_table; @@ -779,7 +779,7 @@ struct pmcraid_instance { atomic_t outstanding_cmds; /* should add/delete resources to mid-layer now ?*/ - atomic_t expose_resources; + atomic_unchecked_t expose_resources; @@ -815,8 +815,8 @@ struct pmcraid_resource_entry { struct pmcraid_config_table_entry_ext cfg_entry_ext; }; struct scsi_device *scsi_dev; /* Link scsi_device structure */ - atomic_t read_failures; /* count of failed READ commands */ - atomic_t write_failures; /* count of failed WRITE commands */ + atomic_unchecked_t read_failures; /* count of failed READ commands */ + atomic_unchecked_t write_failures; /* count of failed WRITE commands */ /* To indicate add/delete/modify during CCN */ u8 change_detected; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/qla2xxx/qla_os.c linux-2.6.39-pax/drivers/scsi/qla2xxx/qla_os.c --- linux-2.6.39/drivers/scsi/qla2xxx/qla_os.c 2011-05-19 10:22:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/qla2xxx/qla_os.c 2011-05-19 14:23:31.000000000 +0200 @@ -4097,7 +4097,7 @@ static struct pci_driver qla2xxx_pci_dri .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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.39-pax/drivers/scsi/qla4xxx/ql4_def.h --- linux-2.6.39/drivers/scsi/qla4xxx/ql4_def.h 2011-05-19 10:22:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/qla4xxx/ql4_def.h 2011-05-19 13:45:32.000000000 +0200 @@ -256,7 +256,7 @@ struct ddb_entry { atomic_t retry_relogin_timer; /* Min Time between relogins * (4000 only) */ atomic_t relogin_timer; /* Max Time to wait for relogin to complete */ - atomic_t relogin_retry_count; /* Num of times relogin has been + atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been * retried */ uint16_t port; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.39-pax/drivers/scsi/qla4xxx/ql4_init.c --- linux-2.6.39/drivers/scsi/qla4xxx/ql4_init.c 2011-05-19 10:22:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/qla4xxx/ql4_init.c 2011-05-19 13:45:32.000000000 +0200 @@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_ ddb_entry->fw_ddb_index = fw_ddb_index; atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY); atomic_set(&ddb_entry->relogin_timer, 0); - atomic_set(&ddb_entry->relogin_retry_count, 0); + atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0); atomic_set(&ddb_entry->state, DDB_STATE_ONLINE); list_add_tail(&ddb_entry->list, &ha->ddb_list); ha->fw_ddb_index_map[fw_ddb_index] = ddb_entry; @@ -1433,7 +1433,7 @@ int qla4xxx_process_ddb_changed(struct s if ((ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_ACTIVE) && (atomic_read(&ddb_entry->state) != DDB_STATE_ONLINE)) { atomic_set(&ddb_entry->state, DDB_STATE_ONLINE); - atomic_set(&ddb_entry->relogin_retry_count, 0); + atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0); atomic_set(&ddb_entry->relogin_timer, 0); clear_bit(DF_RELOGIN, &ddb_entry->flags); iscsi_unblock_session(ddb_entry->sess); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.39-pax/drivers/scsi/qla4xxx/ql4_os.c --- linux-2.6.39/drivers/scsi/qla4xxx/ql4_os.c 2011-05-19 10:22:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/qla4xxx/ql4_os.c 2011-05-19 13:45:32.000000000 +0200 @@ -802,13 +802,13 @@ static void qla4xxx_timer(struct scsi_ql ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_FAILED) { /* Reset retry relogin timer */ - atomic_inc(&ddb_entry->relogin_retry_count); + atomic_inc_unchecked(&ddb_entry->relogin_retry_count); DEBUG2(printk("scsi%ld: ddb [%d] relogin" " timed out-retrying" " relogin (%d)\n", ha->host_no, ddb_entry->fw_ddb_index, - atomic_read(&ddb_entry-> + atomic_read_unchecked(&ddb_entry-> relogin_retry_count)) ); start_dpc++; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/scsi.c linux-2.6.39-pax/drivers/scsi/scsi.c --- linux-2.6.39/drivers/scsi/scsi.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/scsi.c 2011-05-19 13:45:32.000000000 +0200 @@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd * unsigned long timeout; int rtn = 0; - atomic_inc(&cmd->device->iorequest_cnt); + atomic_inc_unchecked(&cmd->device->iorequest_cnt); /* check if the device is still usable */ if (unlikely(cmd->device->sdev_state == SDEV_DEL)) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/scsi_debug.c linux-2.6.39-pax/drivers/scsi/scsi_debug.c --- linux-2.6.39/drivers/scsi/scsi_debug.c 2011-05-19 10:22:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/scsi_debug.c 2011-05-19 13:45:32.000000000 +0200 @@ -1493,6 +1493,8 @@ static int resp_mode_select(struct scsi_ unsigned char arr[SDEBUG_MAX_MSELECT_SZ]; unsigned char *cmd = (unsigned char *)scp->cmnd; + pax_track_stack(); + if ((errsts = check_readiness(scp, 1, devip))) return errsts; memset(arr, 0, sizeof(arr)); @@ -1590,6 +1592,8 @@ static int resp_log_sense(struct scsi_cm unsigned char arr[SDEBUG_MAX_LSENSE_SZ]; unsigned char *cmd = (unsigned char *)scp->cmnd; + pax_track_stack(); + if ((errsts = check_readiness(scp, 1, devip))) return errsts; memset(arr, 0, sizeof(arr)); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/scsi_lib.c linux-2.6.39-pax/drivers/scsi/scsi_lib.c --- linux-2.6.39/drivers/scsi/scsi_lib.c 2011-05-19 10:22:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/scsi_lib.c 2011-05-19 13:45:32.000000000 +0200 @@ -1410,7 +1410,7 @@ static void scsi_kill_request(struct req shost = sdev->host; scsi_init_cmd_errh(cmd); cmd->result = DID_NO_CONNECT << 16; - atomic_inc(&cmd->device->iorequest_cnt); + atomic_inc_unchecked(&cmd->device->iorequest_cnt); /* * SCSI request completion path will do scsi_device_unbusy(), @@ -1436,9 +1436,9 @@ static void scsi_softirq_done(struct req INIT_LIST_HEAD(&cmd->eh_entry); - atomic_inc(&cmd->device->iodone_cnt); + atomic_inc_unchecked(&cmd->device->iodone_cnt); if (cmd->result) - atomic_inc(&cmd->device->ioerr_cnt); + atomic_inc_unchecked(&cmd->device->ioerr_cnt); disposition = scsi_decide_disposition(cmd); if (disposition != SUCCESS && diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/scsi_sysfs.c linux-2.6.39-pax/drivers/scsi/scsi_sysfs.c --- linux-2.6.39/drivers/scsi/scsi_sysfs.c 2011-05-19 10:22:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/scsi_sysfs.c 2011-05-19 13:45:32.000000000 +0200 @@ -621,7 +621,7 @@ show_iostat_##field(struct device *dev, char *buf) \ { \ struct scsi_device *sdev = to_scsi_device(dev); \ - unsigned long long count = atomic_read(&sdev->field); \ + unsigned long long count = atomic_read_unchecked(&sdev->field); \ return snprintf(buf, 20, "0x%llx\n", count); \ } \ static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/scsi_transport_fc.c linux-2.6.39-pax/drivers/scsi/scsi_transport_fc.c --- linux-2.6.39/drivers/scsi/scsi_transport_fc.c 2011-05-19 10:22:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/scsi_transport_fc.c 2011-05-19 13:45:32.000000000 +0200 @@ -485,7 +485,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_ * Netlink Infrastructure */ -static atomic_t fc_event_seq; +static atomic_unchecked_t fc_event_seq; /** * fc_get_event_number - Obtain the next sequential FC event number @@ -498,7 +498,7 @@ static atomic_t fc_event_seq; u32 fc_get_event_number(void) { - return atomic_add_return(1, &fc_event_seq); + return atomic_add_return_unchecked(1, &fc_event_seq); } EXPORT_SYMBOL(fc_get_event_number); @@ -646,7 +646,7 @@ static __init int fc_transport_init(void { int error; - atomic_set(&fc_event_seq, 0); + atomic_set_unchecked(&fc_event_seq, 0); error = transport_class_register(&fc_host_class); if (error) @@ -836,7 +836,7 @@ static int fc_str_to_dev_loss(const char 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/scsi_transport_iscsi.c linux-2.6.39-pax/drivers/scsi/scsi_transport_iscsi.c --- linux-2.6.39/drivers/scsi/scsi_transport_iscsi.c 2011-05-19 10:22:20.000000000 +0200 +++ linux-2.6.39-pax/drivers/scsi/scsi_transport_iscsi.c 2011-05-19 13:45:32.000000000 +0200 @@ -83,7 +83,7 @@ struct iscsi_internal { struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1]; }; -static atomic_t iscsi_session_nr; /* sysfs session id for next new session */ +static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */ static struct workqueue_struct *iscsi_eh_timer_workq; /* @@ -761,7 +761,7 @@ int iscsi_add_session(struct iscsi_cls_s int err; ihost = shost->shost_data; - session->sid = atomic_add_return(1, &iscsi_session_nr); + session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr); if (id == ISCSI_MAX_TARGET) { for (id = 0; id < ISCSI_MAX_TARGET; id++) { @@ -2200,7 +2200,7 @@ static __init int iscsi_transport_init(v printk(KERN_INFO "Loading iSCSI transport class v%s.\n", ISCSI_TRANSPORT_VERSION); - atomic_set(&iscsi_session_nr, 0); + atomic_set_unchecked(&iscsi_session_nr, 0); err = class_register(&iscsi_transport_class); if (err) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/scsi_transport_srp.c linux-2.6.39-pax/drivers/scsi/scsi_transport_srp.c --- linux-2.6.39/drivers/scsi/scsi_transport_srp.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/scsi_transport_srp.c 2011-05-19 13:45:32.000000000 +0200 @@ -33,7 +33,7 @@ #include "scsi_transport_srp_internal.h" struct srp_host_attrs { - atomic_t next_port_id; + atomic_unchecked_t next_port_id; }; #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data) @@ -62,7 +62,7 @@ static int srp_host_setup(struct transpo struct Scsi_Host *shost = dev_to_shost(dev); struct srp_host_attrs *srp_host = to_srp_host_attrs(shost); - atomic_set(&srp_host->next_port_id, 0); + atomic_set_unchecked(&srp_host->next_port_id, 0); return 0; } @@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct S memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id)); rport->roles = ids->roles; - id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id); + id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id); dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id); transport_setup_device(&rport->dev); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/sg.c linux-2.6.39-pax/drivers/scsi/sg.c --- linux-2.6.39/drivers/scsi/sg.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/sg.c 2011-05-19 13:45:32.000000000 +0200 @@ -2310,7 +2310,7 @@ struct sg_proc_leaf { 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 @@ sg_proc_init(void) { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.39-pax/drivers/scsi/sym53c8xx_2/sym_glue.c --- linux-2.6.39/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-03-15 19:34:31.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-05-19 13:45:32.000000000 +0200 @@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p int do_iounmap = 0; int do_disable_device = 1; + pax_track_stack(); + memset(&sym_dev, 0, sizeof(sym_dev)); memset(&nvram, 0, sizeof(nvram)); sym_dev.pdev = pdev; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/scsi/vmw_pvscsi.c linux-2.6.39-pax/drivers/scsi/vmw_pvscsi.c --- linux-2.6.39/drivers/scsi/vmw_pvscsi.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/scsi/vmw_pvscsi.c 2011-05-19 13:45:32.000000000 +0200 @@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const dma_addr_t base; unsigned i; + pax_track_stack(); + cmd.ringsStatePPN = adapter->ringStatePA >> PAGE_SHIFT; cmd.reqRingNumPages = adapter->req_pages; cmd.cmpRingNumPages = adapter->cmp_pages; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/sh/clk/cpg.c linux-2.6.39-pax/drivers/sh/clk/cpg.c --- linux-2.6.39/drivers/sh/clk/cpg.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/sh/clk/cpg.c 2011-05-19 14:23:31.000000000 +0200 @@ -26,7 +26,7 @@ static void sh_clk_mstp32_disable(struct clk->enable_reg); } -static struct clk_ops sh_clk_mstp32_clk_ops = { +static const struct clk_ops sh_clk_mstp32_clk_ops = { .enable = sh_clk_mstp32_enable, .disable = sh_clk_mstp32_disable, .recalc = followparent_recalc, @@ -150,7 +150,7 @@ static void sh_clk_div6_disable(struct c __raw_writel(value, clk->enable_reg); } -static struct clk_ops sh_clk_div6_clk_ops = { +static const struct clk_ops sh_clk_div6_clk_ops = { .recalc = sh_clk_div6_recalc, .round_rate = sh_clk_div_round_rate, .set_rate = sh_clk_div6_set_rate, @@ -158,7 +158,7 @@ static struct clk_ops sh_clk_div6_clk_op .disable = sh_clk_div6_disable, }; -static struct clk_ops sh_clk_div6_reparent_clk_ops = { +static const struct clk_ops sh_clk_div6_reparent_clk_ops = { .recalc = sh_clk_div6_recalc, .round_rate = sh_clk_div_round_rate, .set_rate = sh_clk_div6_set_rate, @@ -282,13 +282,13 @@ static void sh_clk_div4_disable(struct c __raw_writel(__raw_readl(clk->enable_reg) | (1 << 8), clk->enable_reg); } -static struct clk_ops sh_clk_div4_clk_ops = { +static const struct clk_ops sh_clk_div4_clk_ops = { .recalc = sh_clk_div4_recalc, .set_rate = sh_clk_div4_set_rate, .round_rate = sh_clk_div_round_rate, }; -static struct clk_ops sh_clk_div4_enable_clk_ops = { +static const struct clk_ops sh_clk_div4_enable_clk_ops = { .recalc = sh_clk_div4_recalc, .set_rate = sh_clk_div4_set_rate, .round_rate = sh_clk_div_round_rate, @@ -296,7 +296,7 @@ static struct clk_ops sh_clk_div4_enable .disable = sh_clk_div4_disable, }; -static struct clk_ops sh_clk_div4_reparent_clk_ops = { +static const struct clk_ops sh_clk_div4_reparent_clk_ops = { .recalc = sh_clk_div4_recalc, .set_rate = sh_clk_div4_set_rate, .round_rate = sh_clk_div_round_rate, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/spi/dw_spi.h linux-2.6.39-pax/drivers/spi/dw_spi.h --- linux-2.6.39/drivers/spi/dw_spi.h 2011-05-19 10:22:21.000000000 +0200 +++ linux-2.6.39-pax/drivers/spi/dw_spi.h 2011-05-19 14:23:31.000000000 +0200 @@ -151,7 +151,7 @@ struct dw_spi { int dma_chan_done; struct device *dma_dev; dma_addr_t dma_addr; /* phy address of the Data register */ - struct dw_spi_dma_ops *dma_ops; + const struct dw_spi_dma_ops *dma_ops; void *dma_priv; /* platform relate info */ struct pci_dev *dmac; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/spi/dw_spi_mid.c linux-2.6.39-pax/drivers/spi/dw_spi_mid.c --- linux-2.6.39/drivers/spi/dw_spi_mid.c 2011-05-19 10:22:21.000000000 +0200 +++ linux-2.6.39-pax/drivers/spi/dw_spi_mid.c 2011-05-19 14:23:31.000000000 +0200 @@ -180,7 +180,7 @@ static int mid_spi_dma_transfer(struct d return 0; } -static struct dw_spi_dma_ops mid_dma_ops = { +static const struct dw_spi_dma_ops mid_dma_ops = { .dma_init = mid_spi_dma_init, .dma_exit = mid_spi_dma_exit, .dma_transfer = mid_spi_dma_transfer, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/spi/spi.c linux-2.6.39-pax/drivers/spi/spi.c --- linux-2.6.39/drivers/spi/spi.c 2011-05-19 10:22:21.000000000 +0200 +++ linux-2.6.39-pax/drivers/spi/spi.c 2011-05-19 13:45:32.000000000 +0200 @@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma EXPORT_SYMBOL_GPL(spi_bus_unlock); /* portable code must never pass more than 32 bytes */ -#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES) +#define SPI_BUFSIZ max(32U,SMP_CACHE_BYTES) static u8 *buf; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/ssb/driver_pcicore.c linux-2.6.39-pax/drivers/ssb/driver_pcicore.c --- linux-2.6.39/drivers/ssb/driver_pcicore.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/ssb/driver_pcicore.c 2011-05-19 14:23:31.000000000 +0200 @@ -223,7 +223,7 @@ static int ssb_pcicore_write_config(stru return err ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL; } -static struct pci_ops ssb_pcicore_pciops = { +static const struct pci_ops ssb_pcicore_pciops = { .read = ssb_pcicore_read_config, .write = ssb_pcicore_write_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/ath6kl/os/linux/cfg80211.c linux-2.6.39-pax/drivers/staging/ath6kl/os/linux/cfg80211.c --- linux-2.6.39/drivers/staging/ath6kl/os/linux/cfg80211.c 2011-05-19 10:22:23.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/ath6kl/os/linux/cfg80211.c 2011-05-19 14:23:31.000000000 +0200 @@ -1391,8 +1391,7 @@ u32 cipher_suites[] = { WLAN_CIPHER_SUITE_CCMP, }; -static struct -cfg80211_ops ar6k_cfg80211_ops = { +static const struct cfg80211_ops ar6k_cfg80211_ops = { .change_virtual_intf = ar6k_cfg80211_change_iface, .add_virtual_intf = ar6k_cfg80211_add_virtual_intf, .del_virtual_intf = ar6k_cfg80211_del_virtual_intf, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.39-pax/drivers/staging/brcm80211/brcmfmac/dhd_linux.c --- linux-2.6.39/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-05-19 10:22:25.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-05-19 14:23:27.000000000 +0200 @@ -857,14 +857,14 @@ static void dhd_op_if(dhd_if_t *ifp) 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, " @@ -1500,7 +1500,7 @@ static void dhd_ethtool_get_drvinfo(stru sprintf(info->bus_info, "%s", dev_name(&wl_cfg80211_get_sdio_func()->dev)); } -struct ethtool_ops dhd_ethtool_ops = { +const struct ethtool_ops dhd_ethtool_ops = { .get_drvinfo = dhd_ethtool_get_drvinfo }; @@ -1923,7 +1923,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu 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; @@ -1939,7 +1939,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu /* * Save the dhd_info into the priv */ - memcpy(netdev_priv(net), &dhd, sizeof(dhd)); + memcpy(netdev_priv(net), dhd, sizeof(*dhd)); /* Set network interface name if it was provided as module parameter */ if (iface_name[0]) { @@ -2056,7 +2056,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu /* * 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; @@ -2206,7 +2206,7 @@ dhd_iovar(dhd_pub_t *pub, int ifidx, cha return ret; } -static struct net_device_ops dhd_ops_pri = { +static const struct net_device_ops dhd_ops_pri = { .ndo_open = dhd_open, .ndo_stop = dhd_stop, .ndo_get_stats = dhd_get_stats, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c linux-2.6.39-pax/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c --- linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c 2011-05-19 10:22:25.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c 2011-05-19 14:23:31.000000000 +0200 @@ -2109,7 +2109,7 @@ wl_cfg80211_flush_pmksa(struct wiphy *wi } -static struct cfg80211_ops wl_cfg80211_ops = { +static const struct cfg80211_ops wl_cfg80211_ops = { .change_virtual_intf = wl_cfg80211_change_iface, .scan = wl_cfg80211_scan, .set_wiphy_params = wl_cfg80211_set_wiphy_params, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.39-pax/drivers/staging/brcm80211/brcmfmac/wl_iw.c --- linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-05-19 10:22:25.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-05-19 13:45:32.000000000 +0200 @@ -495,7 +495,7 @@ wl_iw_get_range(struct net_device *dev, 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/comedi/comedi_fops.c linux-2.6.39-pax/drivers/staging/comedi/comedi_fops.c --- linux-2.6.39/drivers/staging/comedi/comedi_fops.c 2011-05-19 10:22:30.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/comedi/comedi_fops.c 2011-05-19 13:45:32.000000000 +0200 @@ -1445,7 +1445,7 @@ static void comedi_unmap(struct vm_area_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/cx25821/cx25821-alsa.c linux-2.6.39-pax/drivers/staging/cx25821/cx25821-alsa.c --- linux-2.6.39/drivers/staging/cx25821/cx25821-alsa.c 2011-05-19 10:22:31.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/cx25821/cx25821-alsa.c 2011-05-19 14:23:31.000000000 +0200 @@ -586,7 +586,7 @@ static struct page *snd_cx25821_page(str /* * operators */ -static struct snd_pcm_ops snd_cx25821_pcm_ops = { +static const struct snd_pcm_ops snd_cx25821_pcm_ops = { .open = snd_cx25821_pcm_open, .close = snd_cx25821_close, .ioctl = snd_pcm_lib_ioctl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/cx25821/cx25821-i2c.c linux-2.6.39-pax/drivers/staging/cx25821/cx25821-i2c.c --- linux-2.6.39/drivers/staging/cx25821/cx25821-i2c.c 2011-03-15 19:34:46.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/cx25821/cx25821-i2c.c 2011-05-19 14:23:31.000000000 +0200 @@ -282,7 +282,7 @@ static u32 cx25821_functionality(struct I2C_FUNC_SMBUS_READ_WORD_DATA | I2C_FUNC_SMBUS_WRITE_WORD_DATA; } -static struct i2c_algorithm cx25821_i2c_algo_template = { +static const struct i2c_algorithm cx25821_i2c_algo_template = { .master_xfer = i2c_xfer, .functionality = cx25821_functionality, #ifdef NEED_ALGO_CONTROL diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/et131x/et1310_tx.c linux-2.6.39-pax/drivers/staging/et131x/et1310_tx.c --- linux-2.6.39/drivers/staging/et131x/et1310_tx.c 2011-05-19 10:22:35.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/et131x/et1310_tx.c 2011-05-19 13:45:32.000000000 +0200 @@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru struct net_device_stats *stats = &etdev->net_stats; if (tcb->flags & fMP_DEST_BROAD) - atomic_inc(&etdev->Stats.brdcstxmt); + atomic_inc_unchecked(&etdev->Stats.brdcstxmt); else if (tcb->flags & fMP_DEST_MULTI) - atomic_inc(&etdev->Stats.multixmt); + atomic_inc_unchecked(&etdev->Stats.multixmt); else - atomic_inc(&etdev->Stats.unixmt); + atomic_inc_unchecked(&etdev->Stats.unixmt); if (tcb->skb) { stats->tx_bytes += tcb->skb->len; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/et131x/et131x_adapter.h linux-2.6.39-pax/drivers/staging/et131x/et131x_adapter.h --- linux-2.6.39/drivers/staging/et131x/et131x_adapter.h 2011-05-19 10:22:35.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/et131x/et131x_adapter.h 2011-05-19 13:45:32.000000000 +0200 @@ -110,11 +110,11 @@ typedef struct _ce_stats_t { * operations */ u32 unircv; /* # multicast packets received */ - atomic_t unixmt; /* # multicast packets for Tx */ + atomic_unchecked_t unixmt; /* # multicast packets for Tx */ u32 multircv; /* # multicast packets received */ - atomic_t multixmt; /* # multicast packets for Tx */ + atomic_unchecked_t multixmt; /* # multicast packets for Tx */ u32 brdcstrcv; /* # broadcast packets received */ - atomic_t brdcstxmt; /* # broadcast packets for Tx */ + atomic_unchecked_t brdcstxmt; /* # broadcast packets for Tx */ u32 norcvbuf; /* # Rx packets discarded */ u32 noxmtbuf; /* # Tx packets discarded */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2.6.39-pax/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c --- linux-2.6.39/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-05-19 10:22:35.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-05-19 14:23:31.000000000 +0200 @@ -55,7 +55,7 @@ int numofmsgbuf = 0; // // 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/generic_serial/rio/rio_linux.c linux-2.6.39-pax/drivers/staging/generic_serial/rio/rio_linux.c --- linux-2.6.39/drivers/staging/generic_serial/rio/rio_linux.c 2011-05-19 10:22:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/generic_serial/rio/rio_linux.c 2011-05-19 14:23:31.000000000 +0200 @@ -221,7 +221,7 @@ module_param(rio_poll, int, 0); module_param(rio_debug, int, 0644); module_param(rio_irqmask, long, 0); -static struct real_driver rio_real_driver = { +static const struct real_driver rio_real_driver = { rio_disable_tx_interrupts, rio_enable_tx_interrupts, rio_disable_rx_interrupts, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/generic_serial/ser_a2232.c linux-2.6.39-pax/drivers/staging/generic_serial/ser_a2232.c --- linux-2.6.39/drivers/staging/generic_serial/ser_a2232.c 2011-05-19 10:22:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/generic_serial/ser_a2232.c 2011-05-19 14:23:31.000000000 +0200 @@ -144,7 +144,7 @@ static int a2232_open(struct tty_struct /*--------------------------------------------------------------------------- * Interface from generic_serial.c back here *--------------------------------------------------------------------------*/ -static struct real_driver a2232_real_driver = { +static const struct real_driver a2232_real_driver = { a2232_disable_tx_interrupts, a2232_enable_tx_interrupts, a2232_disable_rx_interrupts, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/generic_serial/sx.c linux-2.6.39-pax/drivers/staging/generic_serial/sx.c --- linux-2.6.39/drivers/staging/generic_serial/sx.c 2011-05-19 10:22:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/generic_serial/sx.c 2011-05-19 14:23:31.000000000 +0200 @@ -355,7 +355,7 @@ module_param(sx_irqmask, int, 0); MODULE_LICENSE("GPL"); -static struct real_driver sx_real_driver = { +static const struct real_driver sx_real_driver = { sx_disable_tx_interrupts, sx_enable_tx_interrupts, sx_disable_rx_interrupts, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/generic_serial/vme_scc.c linux-2.6.39-pax/drivers/staging/generic_serial/vme_scc.c --- linux-2.6.39/drivers/staging/generic_serial/vme_scc.c 2011-05-19 10:22:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/generic_serial/vme_scc.c 2011-05-19 14:23:31.000000000 +0200 @@ -94,7 +94,7 @@ static struct scc_port scc_ports[2]; * Interface from generic_serial.c back here *--------------------------------------------------------------------------*/ -static struct real_driver scc_real_driver = { +static const struct real_driver scc_real_driver = { scc_disable_tx_interrupts, scc_enable_tx_interrupts, scc_disable_rx_interrupts, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/gma500/psb_fb.c linux-2.6.39-pax/drivers/staging/gma500/psb_fb.c --- linux-2.6.39/drivers/staging/gma500/psb_fb.c 2011-05-19 10:22:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/gma500/psb_fb.c 2011-05-19 14:23:31.000000000 +0200 @@ -230,7 +230,7 @@ static void psbfb_vm_close(struct vm_are DRM_DEBUG("vm_close\n"); } -static struct vm_operations_struct psbfb_vm_ops = { +static const struct vm_operations_struct psbfb_vm_ops = { .fault = psbfb_vm_fault, .open = psbfb_vm_open, .close = psbfb_vm_close diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/go7007/go7007-i2c.c linux-2.6.39-pax/drivers/staging/go7007/go7007-i2c.c --- linux-2.6.39/drivers/staging/go7007/go7007-i2c.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/go7007/go7007-i2c.c 2011-05-19 14:23:31.000000000 +0200 @@ -198,7 +198,7 @@ static u32 go7007_functionality(struct i return I2C_FUNC_SMBUS_BYTE_DATA; } -static struct i2c_algorithm go7007_algo = { +static const struct i2c_algorithm go7007_algo = { .smbus_xfer = go7007_smbus_xfer, .master_xfer = go7007_i2c_master_xfer, .functionality = go7007_functionality, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/go7007/go7007-usb.c linux-2.6.39-pax/drivers/staging/go7007/go7007-usb.c --- linux-2.6.39/drivers/staging/go7007/go7007-usb.c 2011-05-19 10:22:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/go7007/go7007-usb.c 2011-05-19 14:23:31.000000000 +0200 @@ -849,7 +849,7 @@ static int go7007_usb_send_firmware(stru &transferred, timeout); } -static struct go7007_hpi_ops go7007_usb_ezusb_hpi_ops = { +static const struct go7007_hpi_ops go7007_usb_ezusb_hpi_ops = { .interface_reset = go7007_usb_interface_reset, .write_interrupt = go7007_usb_ezusb_write_interrupt, .read_interrupt = go7007_usb_read_interrupt, @@ -858,7 +858,7 @@ static struct go7007_hpi_ops go7007_usb_ .send_firmware = go7007_usb_send_firmware, }; -static struct go7007_hpi_ops go7007_usb_onboard_hpi_ops = { +static const struct go7007_hpi_ops go7007_usb_onboard_hpi_ops = { .interface_reset = go7007_usb_interface_reset, .write_interrupt = go7007_usb_onboard_write_interrupt, .read_interrupt = go7007_usb_read_interrupt, @@ -950,7 +950,7 @@ static u32 go7007_usb_functionality(stru return (I2C_FUNC_SMBUS_EMUL) & ~I2C_FUNC_SMBUS_QUICK; } -static struct i2c_algorithm go7007_usb_algo = { +static const struct i2c_algorithm go7007_usb_algo = { .master_xfer = go7007_usb_i2c_master_xfer, .functionality = go7007_usb_functionality, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/go7007/go7007-v4l2.c linux-2.6.39-pax/drivers/staging/go7007/go7007-v4l2.c --- linux-2.6.39/drivers/staging/go7007/go7007-v4l2.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/go7007/go7007-v4l2.c 2011-05-19 13:45:32.000000000 +0200 @@ -1672,7 +1672,7 @@ static int go7007_vm_fault(struct vm_are 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/go7007/saa7134-go7007.c linux-2.6.39-pax/drivers/staging/go7007/saa7134-go7007.c --- linux-2.6.39/drivers/staging/go7007/saa7134-go7007.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/go7007/saa7134-go7007.c 2011-05-19 14:23:31.000000000 +0200 @@ -421,7 +421,7 @@ static int saa7134_go7007_send_command(s } -static struct go7007_hpi_ops saa7134_go7007_hpi_ops = { +static const struct go7007_hpi_ops saa7134_go7007_hpi_ops = { .interface_reset = saa7134_go7007_interface_reset, .write_interrupt = saa7134_go7007_write_interrupt, .read_interrupt = saa7134_go7007_read_interrupt, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/go7007/snd-go7007.c linux-2.6.39-pax/drivers/staging/go7007/snd-go7007.c --- linux-2.6.39/drivers/staging/go7007/snd-go7007.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/go7007/snd-go7007.c 2011-05-19 14:23:31.000000000 +0200 @@ -204,7 +204,7 @@ static struct page *go7007_snd_pcm_page( return vmalloc_to_page(substream->runtime->dma_area + offset); } -static struct snd_pcm_ops go7007_snd_capture_ops = { +static const struct snd_pcm_ops go7007_snd_capture_ops = { .open = go7007_snd_capture_open, .close = go7007_snd_capture_close, .ioctl = snd_pcm_lib_ioctl, @@ -227,7 +227,7 @@ static int go7007_snd_free(struct snd_de return 0; } -static struct snd_device_ops go7007_snd_device_ops = { +static const struct snd_device_ops go7007_snd_device_ops = { .dev_free = go7007_snd_free, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/hv/channel.c linux-2.6.39-pax/drivers/staging/hv/channel.c --- linux-2.6.39/drivers/staging/hv/channel.c 2011-05-19 10:22:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/hv/channel.c 2011-05-19 13:45:32.000000000 +0200 @@ -509,8 +509,8 @@ int vmbus_establish_gpadl(struct vmbus_c unsigned long flags; int ret = 0; - next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle); - atomic_inc(&vmbus_connection.next_gpadl_handle); + next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle); + atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle); ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount); if (ret) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/hv/hv.c linux-2.6.39-pax/drivers/staging/hv/hv.c --- linux-2.6.39/drivers/staging/hv/hv.c 2011-05-19 10:22:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/hv/hv.c 2011-05-19 13:45:32.000000000 +0200 @@ -163,7 +163,7 @@ static u64 do_hypercall(u64 control, voi 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/hv/rndis_filter.c linux-2.6.39-pax/drivers/staging/hv/rndis_filter.c --- linux-2.6.39/drivers/staging/hv/rndis_filter.c 2011-05-19 10:22:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/hv/rndis_filter.c 2011-05-19 13:45:32.000000000 +0200 @@ -49,7 +49,7 @@ struct rndis_device { enum rndis_device_state state; u32 link_stat; - atomic_t new_req_id; + atomic_unchecked_t new_req_id; spinlock_t request_lock; struct list_head req_list; @@ -144,7 +144,7 @@ static struct rndis_request *get_rndis_r * template */ set = &rndis_msg->msg.set_req; - set->req_id = atomic_inc_return(&dev->new_req_id); + set->req_id = atomic_inc_return_unchecked(&dev->new_req_id); /* Add to the request list */ spin_lock_irqsave(&dev->request_lock, flags); @@ -709,7 +709,7 @@ static void rndis_filter_halt_device(str /* Setup the rndis set */ halt = &request->request_msg.msg.halt_req; - halt->req_id = atomic_inc_return(&dev->new_req_id); + halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id); /* Ignore return since this msg is optional. */ rndis_filter_send_request(dev, request); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/hv/vmbus_drv.c linux-2.6.39-pax/drivers/staging/hv/vmbus_drv.c --- linux-2.6.39/drivers/staging/hv/vmbus_drv.c 2011-05-19 10:22:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/hv/vmbus_drv.c 2011-05-19 13:45:32.000000000 +0200 @@ -661,14 +661,14 @@ int vmbus_child_device_register(struct h { int ret = 0; - static atomic_t device_num = ATOMIC_INIT(0); + static atomic_unchecked_t device_num = ATOMIC_INIT(0); DPRINT_DBG(VMBUS_DRV, "child device (%p) registering", child_device_obj); /* Set the device name. Otherwise, device_register() will fail. */ dev_set_name(&child_device_obj->device, "vmbus_0_%d", - atomic_inc_return(&device_num)); + atomic_inc_return_unchecked(&device_num)); /* The new device belongs to this bus */ child_device_obj->device.bus = &vmbus_drv.bus; /* device->dev.bus; */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/hv/vmbus_private.h linux-2.6.39-pax/drivers/staging/hv/vmbus_private.h --- linux-2.6.39/drivers/staging/hv/vmbus_private.h 2011-05-19 10:22:36.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/hv/vmbus_private.h 2011-05-19 13:45:32.000000000 +0200 @@ -58,7 +58,7 @@ enum vmbus_connect_state { struct vmbus_connection { enum vmbus_connect_state conn_state; - atomic_t next_gpadl_handle; + atomic_unchecked_t next_gpadl_handle; /* * Represents channel interrupts. Each bit position represents a diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/iio/ring_generic.h linux-2.6.39-pax/drivers/staging/iio/ring_generic.h --- linux-2.6.39/drivers/staging/iio/ring_generic.h 2011-05-19 10:22:38.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/iio/ring_generic.h 2011-05-19 14:23:31.000000000 +0200 @@ -134,7 +134,7 @@ struct iio_ring_buffer { struct iio_handler access_handler; struct iio_event_interface ev_int; struct iio_shared_ev_pointer shared_ev_pointer; - struct iio_ring_access_funcs access; + const struct iio_ring_access_funcs access; int (*preenable)(struct iio_dev *); int (*postenable)(struct iio_dev *); int (*predisable)(struct iio_dev *); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/intel_sst/intel_sst_drv_interface.c linux-2.6.39-pax/drivers/staging/intel_sst/intel_sst_drv_interface.c --- linux-2.6.39/drivers/staging/intel_sst/intel_sst_drv_interface.c 2011-05-19 10:22:38.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/intel_sst/intel_sst_drv_interface.c 2011-05-19 14:23:31.000000000 +0200 @@ -470,7 +470,7 @@ int sst_device_control(int cmd, void *ar } -struct intel_sst_pcm_control pcm_ops = { +const struct intel_sst_pcm_control pcm_ops = { .open = sst_open_pcm_stream, .device_control = sst_device_control, .close = sst_close_pcm_stream, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/intel_sst/intelmid_ctrl.c linux-2.6.39-pax/drivers/staging/intel_sst/intelmid_ctrl.c --- linux-2.6.39/drivers/staging/intel_sst/intelmid_ctrl.c 2011-03-15 19:34:49.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/intel_sst/intelmid_ctrl.c 2011-05-19 14:23:31.000000000 +0200 @@ -494,7 +494,7 @@ static int snd_intelmad_device_set(struc struct snd_intelmad *intelmaddata; struct snd_pmic_ops *scard_ops; int ret_val = 0, vendor, status; - struct intel_sst_pcm_control *pcm_control; + const struct intel_sst_pcm_control *pcm_control; pr_debug("snd_intelmad_device_set called\n"); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/line6/capture.c linux-2.6.39-pax/drivers/staging/line6/capture.c --- linux-2.6.39/drivers/staging/line6/capture.c 2011-03-15 19:34:49.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/line6/capture.c 2011-05-19 14:23:31.000000000 +0200 @@ -378,7 +378,7 @@ snd_line6_capture_pointer(struct snd_pcm } /* capture operators */ -struct snd_pcm_ops snd_line6_capture_ops = { +const struct snd_pcm_ops snd_line6_capture_ops = { .open = snd_line6_capture_open, .close = snd_line6_capture_close, .ioctl = snd_pcm_lib_ioctl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/line6/capture.h linux-2.6.39-pax/drivers/staging/line6/capture.h --- linux-2.6.39/drivers/staging/line6/capture.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/line6/capture.h 2011-05-19 14:23:31.000000000 +0200 @@ -17,7 +17,7 @@ #include "driver.h" #include "pcm.h" -extern struct snd_pcm_ops snd_line6_capture_ops; +extern const struct snd_pcm_ops snd_line6_capture_ops; extern void line6_capture_copy(struct snd_line6_pcm *line6pcm, char *fbuf, int fsize); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/line6/midi.c linux-2.6.39-pax/drivers/staging/line6/midi.c --- linux-2.6.39/drivers/staging/line6/midi.c 2011-03-15 19:34:49.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/line6/midi.c 2011-05-19 14:23:31.000000000 +0200 @@ -239,14 +239,14 @@ static void line6_midi_input_trigger(str line6->line6midi->substream_receive = 0; } -static struct snd_rawmidi_ops line6_midi_output_ops = { +static const struct snd_rawmidi_ops line6_midi_output_ops = { .open = line6_midi_output_open, .close = line6_midi_output_close, .trigger = line6_midi_output_trigger, .drain = line6_midi_output_drain, }; -static struct snd_rawmidi_ops line6_midi_input_ops = { +static const struct snd_rawmidi_ops line6_midi_input_ops = { .open = line6_midi_input_open, .close = line6_midi_input_close, .trigger = line6_midi_input_trigger, @@ -373,7 +373,7 @@ static int snd_line6_midi_free(struct sn */ int line6_init_midi(struct usb_line6 *line6) { - static struct snd_device_ops midi_ops = { + static const struct snd_device_ops midi_ops = { .dev_free = snd_line6_midi_free, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/line6/pcm.c linux-2.6.39-pax/drivers/staging/line6/pcm.c --- linux-2.6.39/drivers/staging/line6/pcm.c 2011-05-19 10:22:38.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/line6/pcm.c 2011-05-19 14:23:31.000000000 +0200 @@ -384,7 +384,7 @@ void line6_pcm_disconnect(struct snd_lin int line6_init_pcm(struct usb_line6 *line6, struct line6_pcm_properties *properties) { - static struct snd_device_ops pcm_ops = { + static const struct snd_device_ops pcm_ops = { .dev_free = snd_line6_pcm_free, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/line6/playback.c linux-2.6.39-pax/drivers/staging/line6/playback.c --- linux-2.6.39/drivers/staging/line6/playback.c 2011-03-15 19:34:49.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/line6/playback.c 2011-05-19 14:23:31.000000000 +0200 @@ -536,7 +536,7 @@ snd_line6_playback_pointer(struct snd_pc } /* playback operators */ -struct snd_pcm_ops snd_line6_playback_ops = { +const struct snd_pcm_ops snd_line6_playback_ops = { .open = snd_line6_playback_open, .close = snd_line6_playback_close, .ioctl = snd_pcm_lib_ioctl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/line6/playback.h linux-2.6.39-pax/drivers/staging/line6/playback.h --- linux-2.6.39/drivers/staging/line6/playback.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/line6/playback.h 2011-05-19 14:23:31.000000000 +0200 @@ -27,7 +27,7 @@ */ #define USE_CLEAR_BUFFER_WORKAROUND 1 -extern struct snd_pcm_ops snd_line6_playback_ops; +extern const struct snd_pcm_ops snd_line6_playback_ops; extern int line6_create_audio_out_urbs(struct snd_line6_pcm *line6pcm); extern int line6_submit_audio_out_all_urbs(struct snd_line6_pcm *line6pcm); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/msm/staging-devices.c linux-2.6.39-pax/drivers/staging/msm/staging-devices.c --- linux-2.6.39/drivers/staging/msm/staging-devices.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/msm/staging-devices.c 2011-05-19 14:23:31.000000000 +0200 @@ -211,7 +211,7 @@ static int msm_fb_lcdc_gpio_config(int o } -static struct lcdc_platform_data lcdc_pdata = { +static const struct lcdc_platform_data lcdc_pdata = { .lcdc_gpio_config = msm_fb_lcdc_gpio_config, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/octeon/ethernet-rx.c linux-2.6.39-pax/drivers/staging/octeon/ethernet-rx.c --- linux-2.6.39/drivers/staging/octeon/ethernet-rx.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/octeon/ethernet-rx.c 2011-05-19 13:45:32.000000000 +0200 @@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi /* Increment RX stats for virtual ports */ if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) { #ifdef CONFIG_64BIT - atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets); - atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes); + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets); + atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes); #else - atomic_add(1, (atomic_t *)&priv->stats.rx_packets); - atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes); + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets); + atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes); #endif } netif_receive_skb(skb); @@ -433,9 +433,9 @@ static int cvm_oct_napi_poll(struct napi dev->name); */ #ifdef CONFIG_64BIT - atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped); + atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped); #else - atomic_add(1, (atomic_t *)&priv->stats.rx_dropped); + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped); #endif dev_kfree_skb_irq(skb); } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/octeon/ethernet.c linux-2.6.39-pax/drivers/staging/octeon/ethernet.c --- linux-2.6.39/drivers/staging/octeon/ethernet.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/octeon/ethernet.c 2011-05-19 13:45:33.000000000 +0200 @@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_ * since the RX tasklet also increments it. */ #ifdef CONFIG_64BIT - atomic64_add(rx_status.dropped_packets, - (atomic64_t *)&priv->stats.rx_dropped); + atomic64_add_unchecked(rx_status.dropped_packets, + (atomic64_unchecked_t *)&priv->stats.rx_dropped); #else - atomic_add(rx_status.dropped_packets, - (atomic_t *)&priv->stats.rx_dropped); + atomic_add_unchecked(rx_status.dropped_packets, + (atomic_unchecked_t *)&priv->stats.rx_dropped); #endif } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.c linux-2.6.39-pax/drivers/staging/olpc_dcon/olpc_dcon.c --- linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.c 2011-05-19 10:22:39.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/olpc_dcon/olpc_dcon.c 2011-05-19 14:23:31.000000000 +0200 @@ -43,7 +43,7 @@ module_param(noinit, int, 0444); static int useaa = 1; module_param(useaa, int, 0444); -static struct dcon_platform_data *pdata; +static const struct dcon_platform_data *pdata; /* I2C structures */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.h linux-2.6.39-pax/drivers/staging/olpc_dcon/olpc_dcon.h --- linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.h 2011-05-19 10:22:39.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/olpc_dcon/olpc_dcon.h 2011-05-19 14:23:31.000000000 +0200 @@ -92,11 +92,11 @@ struct dcon_platform_data { extern irqreturn_t dcon_interrupt(int irq, void *id); #ifdef CONFIG_FB_OLPC_DCON_1 -extern struct dcon_platform_data dcon_pdata_xo_1; +extern const struct dcon_platform_data dcon_pdata_xo_1; #endif #ifdef CONFIG_FB_OLPC_DCON_1_5 -extern struct dcon_platform_data dcon_pdata_xo_1_5; +extern const struct dcon_platform_data dcon_pdata_xo_1_5; #endif #endif diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c linux-2.6.39-pax/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c --- linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c 2011-05-19 10:22:39.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c 2011-05-19 14:23:31.000000000 +0200 @@ -196,7 +196,7 @@ static u8 dcon_read_status_xo_1(void) return status; } -struct dcon_platform_data dcon_pdata_xo_1 = { +const struct dcon_platform_data dcon_pdata_xo_1 = { .init = dcon_init_xo_1, .bus_stabilize_wiggle = dcon_wiggle_xo_1, .set_dconload = dcon_set_dconload_1, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c linux-2.6.39-pax/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c --- linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c 2011-05-19 10:22:39.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c 2011-05-19 14:23:31.000000000 +0200 @@ -185,7 +185,7 @@ static u8 dcon_read_status_xo_1_5(void) return status; } -struct dcon_platform_data dcon_pdata_xo_1_5 = { +const struct dcon_platform_data dcon_pdata_xo_1_5 = { .init = dcon_init_xo_1_5, .bus_stabilize_wiggle = dcon_wiggle_xo_1_5, .set_dconload = dcon_set_dconload_xo_1_5, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/phison/phison.c linux-2.6.39-pax/drivers/staging/phison/phison.c --- linux-2.6.39/drivers/staging/phison/phison.c 2011-03-15 19:34:50.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/phison/phison.c 2011-05-19 14:23:31.000000000 +0200 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/pohmelfs/inode.c linux-2.6.39-pax/drivers/staging/pohmelfs/inode.c --- linux-2.6.39/drivers/staging/pohmelfs/inode.c 2011-05-19 10:22:39.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/pohmelfs/inode.c 2011-05-19 13:45:35.000000000 +0200 @@ -1855,7 +1855,7 @@ static int pohmelfs_fill_super(struct su 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; @@ -1870,7 +1870,7 @@ static int pohmelfs_fill_super(struct su INIT_LIST_HEAD(&psb->crypto_ready_list); INIT_LIST_HEAD(&psb->crypto_active_list); - atomic_set(&psb->trans_gen, 1); + atomic_set_unchecked(&psb->trans_gen, 1); atomic_long_set(&psb->total_inodes, 0); mutex_init(&psb->state_lock); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/pohmelfs/mcache.c linux-2.6.39-pax/drivers/staging/pohmelfs/mcache.c --- linux-2.6.39/drivers/staging/pohmelfs/mcache.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/pohmelfs/mcache.c 2011-05-19 13:45:35.000000000 +0200 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/pohmelfs/netfs.h linux-2.6.39-pax/drivers/staging/pohmelfs/netfs.h --- linux-2.6.39/drivers/staging/pohmelfs/netfs.h 2011-05-19 10:22:39.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/pohmelfs/netfs.h 2011-05-19 13:45:35.000000000 +0200 @@ -571,14 +571,14 @@ struct pohmelfs_config; 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; unsigned int trans_retries; - atomic_t trans_gen; + atomic_unchecked_t trans_gen; unsigned int crypto_attached_size; unsigned int crypto_align_size; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/pohmelfs/trans.c linux-2.6.39-pax/drivers/staging/pohmelfs/trans.c --- linux-2.6.39/drivers/staging/pohmelfs/trans.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/pohmelfs/trans.c 2011-05-19 13:45:35.000000000 +0200 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran int err; struct netfs_cmd *cmd = t->iovec.iov_base; - t->gen = atomic_inc_return(&psb->trans_gen); + t->gen = atomic_inc_return_unchecked(&psb->trans_gen); cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) + t->attached_size + t->attached_pages * sizeof(struct netfs_cmd); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.39-pax/drivers/staging/rtl8192u/ieee80211/proc.c --- linux-2.6.39/drivers/staging/rtl8192u/ieee80211/proc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/rtl8192u/ieee80211/proc.c 2011-05-19 14:23:31.000000000 +0200 @@ -87,7 +87,7 @@ static int c_show(struct seq_file *m, vo return 0; } -static struct seq_operations crypto_seq_ops = { +static const struct seq_operations crypto_seq_ops = { .start = c_start, .next = c_next, .stop = c_stop, @@ -99,7 +99,7 @@ static int crypto_info_open(struct inode 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/rtl8712/rtl871x_io.h linux-2.6.39-pax/drivers/staging/rtl8712/rtl871x_io.h --- linux-2.6.39/drivers/staging/rtl8712/rtl871x_io.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/rtl8712/rtl871x_io.h 2011-05-19 14:23:31.000000000 +0200 @@ -107,7 +107,7 @@ struct intf_hdl { void (*intf_hdl_unload)(u8 *priv); void (*intf_hdl_open)(u8 *priv); void (*intf_hdl_close)(u8 *priv); - struct _io_ops io_ops; + const struct _io_ops io_ops; }; struct reg_protocol_rd { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/solo6x10/g723.c linux-2.6.39-pax/drivers/staging/solo6x10/g723.c --- linux-2.6.39/drivers/staging/solo6x10/g723.c 2011-05-19 10:22:44.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/solo6x10/g723.c 2011-05-19 14:23:31.000000000 +0200 @@ -237,7 +237,7 @@ static int snd_solo_pcm_copy(struct snd_ return 0; } -static struct snd_pcm_ops snd_solo_pcm_ops = { +static const struct snd_pcm_ops snd_solo_pcm_ops = { .open = snd_solo_pcm_open, .close = snd_solo_pcm_close, .ioctl = snd_pcm_lib_ioctl, @@ -334,7 +334,7 @@ static int solo_snd_pcm_init(struct solo int solo_g723_init(struct solo_dev *solo_dev) { - static struct snd_device_ops ops = { NULL }; + static const struct snd_device_ops ops = { NULL }; struct snd_card *card; struct snd_kcontrol_new kctl; char name[32]; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/spectra/ffsport.c linux-2.6.39-pax/drivers/staging/spectra/ffsport.c --- linux-2.6.39/drivers/staging/spectra/ffsport.c 2011-05-19 10:22:45.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/spectra/ffsport.c 2011-05-19 14:23:31.000000000 +0200 @@ -604,7 +604,7 @@ int GLOB_SBD_unlocked_ioctl(struct block 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/tm6000/tm6000-alsa.c linux-2.6.39-pax/drivers/staging/tm6000/tm6000-alsa.c --- linux-2.6.39/drivers/staging/tm6000/tm6000-alsa.c 2011-05-19 10:22:45.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/tm6000/tm6000-alsa.c 2011-05-19 14:23:31.000000000 +0200 @@ -380,7 +380,7 @@ static snd_pcm_uframes_t snd_tm6000_poin /* * operators */ -static struct snd_pcm_ops snd_tm6000_pcm_ops = { +static const struct snd_pcm_ops snd_tm6000_pcm_ops = { .open = snd_tm6000_pcm_open, .close = snd_tm6000_close, .ioctl = snd_pcm_lib_ioctl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/tty/istallion.c linux-2.6.39-pax/drivers/staging/tty/istallion.c --- linux-2.6.39/drivers/staging/tty/istallion.c 2011-05-19 10:22:46.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/tty/istallion.c 2011-05-19 13:45:35.000000000 +0200 @@ -4226,6 +4226,8 @@ static int stli_getportstruct(struct stl struct stliport stli_dummyport; struct stliport *portp; + pax_track_stack(); + if (copy_from_user(&stli_dummyport, arg, sizeof(struct stliport))) return -EFAULT; portp = stli_getport(stli_dummyport.brdnr, stli_dummyport.panelnr, @@ -4248,6 +4250,8 @@ static int stli_getbrdstruct(struct stli struct stlibrd stli_dummybrd; struct stlibrd *brdp; + pax_track_stack(); + if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd))) return -EFAULT; if (stli_dummybrd.brdnr >= STL_MAXBRDS) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/tty/stallion.c linux-2.6.39-pax/drivers/staging/tty/stallion.c --- linux-2.6.39/drivers/staging/tty/stallion.c 2011-05-19 10:22:46.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/tty/stallion.c 2011-05-19 13:45:35.000000000 +0200 @@ -2406,6 +2406,8 @@ static int stl_getportstruct(struct stlp struct stlport stl_dummyport; struct stlport *portp; + pax_track_stack(); + if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport))) return -EFAULT; portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/usbip/vhci.h linux-2.6.39-pax/drivers/staging/usbip/vhci.h --- linux-2.6.39/drivers/staging/usbip/vhci.h 2011-05-19 10:22:46.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/usbip/vhci.h 2011-05-19 13:45:35.000000000 +0200 @@ -92,7 +92,7 @@ struct vhci_hcd { unsigned resuming:1; unsigned long re_timeout; - atomic_t seqnum; + atomic_unchecked_t seqnum; /* * NOTE: diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/usbip/vhci_hcd.c linux-2.6.39-pax/drivers/staging/usbip/vhci_hcd.c --- linux-2.6.39/drivers/staging/usbip/vhci_hcd.c 2011-05-19 10:22:46.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/usbip/vhci_hcd.c 2011-05-19 13:45:35.000000000 +0200 @@ -536,7 +536,7 @@ static void vhci_tx_urb(struct urb *urb) return; } - priv->seqnum = atomic_inc_return(&the_controller->seqnum); + priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum); if (priv->seqnum == 0xffff) usbip_uinfo("seqnum max\n"); @@ -795,7 +795,7 @@ static int vhci_urb_dequeue(struct usb_h return -ENOMEM; } - unlink->seqnum = atomic_inc_return(&the_controller->seqnum); + unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum); if (unlink->seqnum == 0xffff) usbip_uinfo("seqnum max\n"); @@ -992,7 +992,7 @@ static int vhci_start(struct usb_hcd *hc vdev->rhport = rhport; } - atomic_set(&vhci->seqnum, 0); + atomic_set_unchecked(&vhci->seqnum, 0); spin_lock_init(&vhci->lock); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/usbip/vhci_rx.c linux-2.6.39-pax/drivers/staging/usbip/vhci_rx.c --- linux-2.6.39/drivers/staging/usbip/vhci_rx.c 2011-05-19 10:22:46.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/usbip/vhci_rx.c 2011-05-19 13:45:35.000000000 +0200 @@ -81,7 +81,7 @@ static void vhci_recv_ret_submit(struct usbip_uerr("cannot find a urb of seqnum %u\n", pdu->base.seqnum); usbip_uinfo("max seqnum %d\n", - atomic_read(&the_controller->seqnum)); + atomic_read_unchecked(&the_controller->seqnum)); usbip_event_add(ud, VDEV_EVENT_ERROR_TCP); return; } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/vme/devices/vme_user.c linux-2.6.39-pax/drivers/staging/vme/devices/vme_user.c --- linux-2.6.39/drivers/staging/vme/devices/vme_user.c 2011-03-15 19:34:54.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/vme/devices/vme_user.c 2011-05-19 14:23:31.000000000 +0200 @@ -138,7 +138,7 @@ static long vme_user_unlocked_ioctl(stru 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.39-pax/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c --- linux-2.6.39/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-05-19 10:22:46.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-05-19 14:23:31.000000000 +0200 @@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct ge /*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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/wlags49_h2/wl_netdev.c linux-2.6.39-pax/drivers/staging/wlags49_h2/wl_netdev.c --- linux-2.6.39/drivers/staging/wlags49_h2/wl_netdev.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/staging/wlags49_h2/wl_netdev.c 2011-05-19 14:23:31.000000000 +0200 @@ -474,7 +474,7 @@ static void wl_get_drvinfo(struct net_de } } // wl_get_drvinfo -static struct ethtool_ops wl_ethtool_ops = { +static const struct ethtool_ops wl_ethtool_ops = { .get_drvinfo = wl_get_drvinfo, .get_link = ethtool_op_get_link, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.39-pax/drivers/staging/wlan-ng/hfa384x_usb.c --- linux-2.6.39/drivers/staging/wlan-ng/hfa384x_usb.c 2011-05-19 10:22:47.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/wlan-ng/hfa384x_usb.c 2011-05-19 14:23:31.000000000 +0200 @@ -671,7 +671,7 @@ struct usbctlx_cmd_completor { hfa384x_cmdresult_t *result; }; -static inline int usbctlx_cmd_completor_fn(struct usbctlx_completor *head) +static inline int usbctlx_cmd_completor_fn(const struct usbctlx_completor *head) { struct usbctlx_cmd_completor *complete; @@ -705,7 +705,7 @@ struct usbctlx_rrid_completor { unsigned int riddatalen; }; -static int usbctlx_rrid_completor_fn(struct usbctlx_completor *head) +static int usbctlx_rrid_completor_fn(const struct usbctlx_completor *head) { struct usbctlx_rrid_completor *complete; hfa384x_rridresult_t rridresult; @@ -768,7 +768,7 @@ struct usbctlx_rmem_completor { }; typedef struct usbctlx_rmem_completor usbctlx_rmem_completor_t; -static int usbctlx_rmem_completor_fn(struct usbctlx_completor *head) +static int usbctlx_rmem_completor_fn(const struct usbctlx_completor *head) { usbctlx_rmem_completor_t *complete = (usbctlx_rmem_completor_t *) head; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/zcache/tmem.c linux-2.6.39-pax/drivers/staging/zcache/tmem.c --- linux-2.6.39/drivers/staging/zcache/tmem.c 2011-05-19 10:22:49.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/zcache/tmem.c 2011-05-19 14:23:31.000000000 +0200 @@ -39,7 +39,7 @@ * A tmem host implementation must use this function to register callbacks * for memory allocation. */ -static struct tmem_hostops tmem_hostops; +static const struct tmem_hostops tmem_hostops; static void tmem_objnode_tree_init(void); @@ -53,7 +53,7 @@ void tmem_register_hostops(struct tmem_h * A tmem host implementation must use this function to register * callbacks for a page-accessible memory (PAM) implementation */ -static struct tmem_pamops tmem_pamops; +static const struct tmem_pamops tmem_pamops; void tmem_register_pamops(struct tmem_pamops *m) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/staging/zcache/zcache.c linux-2.6.39-pax/drivers/staging/zcache/zcache.c --- linux-2.6.39/drivers/staging/zcache/zcache.c 2011-05-19 10:22:49.000000000 +0200 +++ linux-2.6.39-pax/drivers/staging/zcache/zcache.c 2011-05-19 14:23:31.000000000 +0200 @@ -882,7 +882,7 @@ static void zcache_obj_free(struct tmem_ kmem_cache_free(zcache_obj_cache, obj); } -static struct tmem_hostops zcache_hostops = { +static const struct tmem_hostops zcache_hostops = { .obj_alloc = zcache_obj_alloc, .obj_free = zcache_obj_free, .objnode_alloc = zcache_objnode_alloc, @@ -987,7 +987,7 @@ static void zcache_pampd_free(void *pamp } } -static struct tmem_pamops zcache_pamops = { +static const struct tmem_pamops zcache_pamops = { .create = zcache_pampd_create, .get_data = zcache_pampd_get_data, .free = zcache_pampd_free, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/target/target_core_alua.c linux-2.6.39-pax/drivers/target/target_core_alua.c --- linux-2.6.39/drivers/target/target_core_alua.c 2011-05-19 10:22:49.000000000 +0200 +++ linux-2.6.39-pax/drivers/target/target_core_alua.c 2011-05-19 13:45:35.000000000 +0200 @@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_ char path[ALUA_METADATA_PATH_LEN]; int len; + pax_track_stack(); + memset(path, 0, ALUA_METADATA_PATH_LEN); len = snprintf(md_buf, tg_pt_gp->tg_pt_gp_md_buf_len, @@ -938,6 +940,8 @@ static int core_alua_update_tpg_secondar char path[ALUA_METADATA_PATH_LEN], wwn[ALUA_SECONDARY_METADATA_WWN_LEN]; int len; + pax_track_stack(); + memset(path, 0, ALUA_METADATA_PATH_LEN); memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/target/target_core_cdb.c linux-2.6.39-pax/drivers/target/target_core_cdb.c --- linux-2.6.39/drivers/target/target_core_cdb.c 2011-05-19 10:22:49.000000000 +0200 +++ linux-2.6.39-pax/drivers/target/target_core_cdb.c 2011-05-19 13:45:35.000000000 +0200 @@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd * int length = 0; unsigned char buf[SE_MODE_PAGE_BUF]; + pax_track_stack(); + memset(buf, 0, SE_MODE_PAGE_BUF); switch (cdb[2] & 0x3f) { diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/target/target_core_configfs.c linux-2.6.39-pax/drivers/target/target_core_configfs.c --- linux-2.6.39/drivers/target/target_core_configfs.c 2011-05-19 10:22:49.000000000 +0200 +++ linux-2.6.39-pax/drivers/target/target_core_configfs.c 2011-05-19 14:23:27.000000000 +0200 @@ -1280,6 +1280,8 @@ static ssize_t target_core_dev_pr_show_a ssize_t len = 0; int reg_count = 0, prf_isid; + pax_track_stack(); + if (!(su_dev->se_dev_ptr)) return -ENODEV; @@ -2682,7 +2684,7 @@ static void target_core_alua_drop_tg_pt_ config_item_put(item); } -static struct configfs_group_operations target_core_alua_tg_pt_gps_group_ops = { +static const struct configfs_group_operations target_core_alua_tg_pt_gps_group_ops = { .make_group = &target_core_alua_create_tg_pt_gp, .drop_item = &target_core_alua_drop_tg_pt_gp, }; @@ -2726,7 +2728,7 @@ static void target_core_stat_rmdir( return; } -static struct configfs_group_operations target_core_stat_group_ops = { +static const struct configfs_group_operations target_core_stat_group_ops = { .make_group = &target_core_stat_mkdir, .drop_item = &target_core_stat_rmdir, }; @@ -2939,7 +2941,7 @@ static void target_core_drop_subdev( mutex_unlock(&hba->hba_access_mutex); } -static struct configfs_group_operations target_core_hba_group_ops = { +static const struct configfs_group_operations target_core_hba_group_ops = { .make_group = target_core_make_subdev, .drop_item = target_core_drop_subdev, }; @@ -3117,7 +3119,7 @@ static void target_core_call_delhbafromt config_item_put(item); } -static struct configfs_group_operations target_core_group_ops = { +static const struct configfs_group_operations target_core_group_ops = { .make_group = target_core_call_addhbatotarget, .drop_item = target_core_call_delhbafromtarget, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/target/target_core_fabric_configfs.c linux-2.6.39-pax/drivers/target/target_core_fabric_configfs.c --- linux-2.6.39/drivers/target/target_core_fabric_configfs.c 2011-05-19 10:22:49.000000000 +0200 +++ linux-2.6.39-pax/drivers/target/target_core_fabric_configfs.c 2011-05-19 14:23:31.000000000 +0200 @@ -1174,7 +1174,7 @@ static void target_fabric_drop_wwn( config_item_put(item); } -static struct configfs_group_operations target_fabric_wwn_group_ops = { +static const struct configfs_group_operations target_fabric_wwn_group_ops = { .make_group = target_fabric_make_wwn, .drop_item = target_fabric_drop_wwn, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/target/target_core_pr.c linux-2.6.39-pax/drivers/target/target_core_pr.c --- linux-2.6.39/drivers/target/target_core_pr.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/target/target_core_pr.c 2011-05-19 13:45:35.000000000 +0200 @@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi unsigned char t_port[PR_APTPL_MAX_TPORT_LEN]; u16 tpgt; + pax_track_stack(); + memset(i_port, 0, PR_APTPL_MAX_IPORT_LEN); memset(t_port, 0, PR_APTPL_MAX_TPORT_LEN); /* @@ -1861,6 +1863,8 @@ static int __core_scsi3_update_aptpl_buf ssize_t len = 0; int reg_count = 0; + pax_track_stack(); + memset(buf, 0, pr_aptpl_buf_len); /* * Called to clear metadata once APTPL has been deactivated. @@ -1983,6 +1987,8 @@ static int __core_scsi3_write_aptpl_to_f char path[512]; int ret; + pax_track_stack(); + memset(iov, 0, sizeof(struct iovec)); memset(path, 0, 512); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/target/target_core_tmr.c linux-2.6.39-pax/drivers/target/target_core_tmr.c --- linux-2.6.39/drivers/target/target_core_tmr.c 2011-03-15 19:34:56.000000000 +0100 +++ linux-2.6.39-pax/drivers/target/target_core_tmr.c 2011-05-19 13:45:35.000000000 +0200 @@ -262,7 +262,7 @@ int core_tmr_lun_reset( CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key, T_TASK(cmd)->t_task_cdbs, atomic_read(&T_TASK(cmd)->t_task_cdbs_left), - atomic_read(&T_TASK(cmd)->t_task_cdbs_sent), + atomic_read_unchecked(&T_TASK(cmd)->t_task_cdbs_sent), atomic_read(&T_TASK(cmd)->t_transport_active), atomic_read(&T_TASK(cmd)->t_transport_stop), atomic_read(&T_TASK(cmd)->t_transport_sent)); @@ -304,7 +304,7 @@ int core_tmr_lun_reset( DEBUG_LR("LUN_RESET: got t_transport_active = 1 for" " task: %p, t_fe_count: %d dev: %p\n", task, fe_count, dev); - atomic_set(&T_TASK(cmd)->t_transport_aborted, 1); + atomic_set_unchecked(&T_TASK(cmd)->t_transport_aborted, 1); spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags); core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count); @@ -314,7 +314,7 @@ int core_tmr_lun_reset( } DEBUG_LR("LUN_RESET: Got t_transport_active = 0 for task: %p," " t_fe_count: %d dev: %p\n", task, fe_count, dev); - atomic_set(&T_TASK(cmd)->t_transport_aborted, 1); + atomic_set_unchecked(&T_TASK(cmd)->t_transport_aborted, 1); spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags); core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/target/target_core_transport.c linux-2.6.39-pax/drivers/target/target_core_transport.c --- linux-2.6.39/drivers/target/target_core_transport.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/target/target_core_transport.c 2011-05-19 13:45:35.000000000 +0200 @@ -1675,7 +1675,7 @@ struct se_device *transport_add_device_t dev->queue_depth = dev_limits->queue_depth; atomic_set(&dev->depth_left, dev->queue_depth); - atomic_set(&dev->dev_ordered_id, 0); + atomic_set_unchecked(&dev->dev_ordered_id, 0); se_dev_set_default_attribs(dev, dev_limits); @@ -1876,7 +1876,7 @@ static int transport_check_alloc_task_at * Used to determine when ORDERED commands should go from * Dormant to Active status. */ - cmd->se_ordered_id = atomic_inc_return(&SE_DEV(cmd)->dev_ordered_id); + cmd->se_ordered_id = atomic_inc_return_unchecked(&SE_DEV(cmd)->dev_ordered_id); smp_mb__after_atomic_inc(); DEBUG_STA("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n", cmd->se_ordered_id, cmd->sam_task_attr, @@ -2156,7 +2156,7 @@ static void transport_generic_request_fa " t_transport_active: %d t_transport_stop: %d" " t_transport_sent: %d\n", T_TASK(cmd)->t_task_cdbs, atomic_read(&T_TASK(cmd)->t_task_cdbs_left), - atomic_read(&T_TASK(cmd)->t_task_cdbs_sent), + atomic_read_unchecked(&T_TASK(cmd)->t_task_cdbs_sent), atomic_read(&T_TASK(cmd)->t_task_cdbs_ex_left), atomic_read(&T_TASK(cmd)->t_transport_active), atomic_read(&T_TASK(cmd)->t_transport_stop), @@ -2660,9 +2660,9 @@ check_depth: spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags); atomic_set(&task->task_active, 1); atomic_set(&task->task_sent, 1); - atomic_inc(&T_TASK(cmd)->t_task_cdbs_sent); + atomic_inc_unchecked(&T_TASK(cmd)->t_task_cdbs_sent); - if (atomic_read(&T_TASK(cmd)->t_task_cdbs_sent) == + if (atomic_read_unchecked(&T_TASK(cmd)->t_task_cdbs_sent) == T_TASK(cmd)->t_task_cdbs) atomic_set(&cmd->transport_sent, 1); @@ -5549,7 +5549,7 @@ static void transport_generic_wait_for_t atomic_set(&T_TASK(cmd)->transport_lun_stop, 0); } if (!atomic_read(&T_TASK(cmd)->t_transport_active) || - atomic_read(&T_TASK(cmd)->t_transport_aborted)) + atomic_read_unchecked(&T_TASK(cmd)->t_transport_aborted)) goto remove; atomic_set(&T_TASK(cmd)->t_transport_stop, 1); @@ -5778,7 +5778,7 @@ int transport_check_aborted_status(struc { int ret = 0; - if (atomic_read(&T_TASK(cmd)->t_transport_aborted) != 0) { + if (atomic_read_unchecked(&T_TASK(cmd)->t_transport_aborted) != 0) { if (!(send_status) || (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS)) return 1; @@ -5806,7 +5806,7 @@ void transport_send_task_abort(struct se */ if (cmd->data_direction == DMA_TO_DEVICE) { if (CMD_TFO(cmd)->write_pending_status(cmd) != 0) { - atomic_inc(&T_TASK(cmd)->t_transport_aborted); + atomic_inc_unchecked(&T_TASK(cmd)->t_transport_aborted); smp_mb__after_atomic_inc(); cmd->scsi_status = SAM_STAT_TASK_ABORTED; transport_new_cmd_failure(cmd); @@ -5930,7 +5930,7 @@ static void transport_processing_shutdow CMD_TFO(cmd)->get_task_tag(cmd), T_TASK(cmd)->t_task_cdbs, atomic_read(&T_TASK(cmd)->t_task_cdbs_left), - atomic_read(&T_TASK(cmd)->t_task_cdbs_sent), + atomic_read_unchecked(&T_TASK(cmd)->t_task_cdbs_sent), atomic_read(&T_TASK(cmd)->t_transport_active), atomic_read(&T_TASK(cmd)->t_transport_stop), atomic_read(&T_TASK(cmd)->t_transport_sent)); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/telephony/ixj.c linux-2.6.39-pax/drivers/telephony/ixj.c --- linux-2.6.39/drivers/telephony/ixj.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/telephony/ixj.c 2011-05-19 13:45:36.000000000 +0200 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j) bool mContinue; char *pIn, *pOut; + pax_track_stack(); + if (!SCI_Prepare(j)) return 0; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/hvc/hvc_console.h linux-2.6.39-pax/drivers/tty/hvc/hvc_console.h --- linux-2.6.39/drivers/tty/hvc/hvc_console.h 2011-03-15 19:34:56.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/hvc/hvc_console.h 2011-05-19 14:23:31.000000000 +0200 @@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vter /* 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/hvc/hvc_iucv.c linux-2.6.39-pax/drivers/tty/hvc/hvc_iucv.c --- linux-2.6.39/drivers/tty/hvc/hvc_iucv.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/hvc/hvc_iucv.c 2011-05-19 14:23:31.000000000 +0200 @@ -1203,7 +1203,7 @@ static int param_get_vmidfilter(char *bu #define param_check_vmidfilter(name, p) __param_check(name, p, void) -static struct kernel_param_ops param_ops_vmidfilter = { +static const struct kernel_param_ops param_ops_vmidfilter = { .set = param_set_vmidfilter, .get = param_get_vmidfilter, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/hvc/hvc_xen.c linux-2.6.39-pax/drivers/tty/hvc/hvc_xen.c --- linux-2.6.39/drivers/tty/hvc/hvc_xen.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/hvc/hvc_xen.c 2011-05-19 14:23:31.000000000 +0200 @@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vt 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 @@ static int dom0_write_console(uint32_t v 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 struct hv_ops dom0_hvc_ops = { 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; @@ -205,7 +205,7 @@ static void __exit xen_hvc_fini(void) static int xen_cons_init(void) { - struct hv_ops *ops; + const struct hv_ops *ops; if (!xen_pv_domain()) return 0; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/hvc/hvcs.c linux-2.6.39-pax/drivers/tty/hvc/hvcs.c --- linux-2.6.39/drivers/tty/hvc/hvcs.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/hvc/hvcs.c 2011-05-19 13:45:36.000000000 +0200 @@ -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 @@ struct hvcs_struct { 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 @@ -422,7 +423,7 @@ static ssize_t hvcs_vterm_state_store(st 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"); @@ -1145,7 +1146,7 @@ static int hvcs_open(struct tty_struct * 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; @@ -1179,7 +1180,7 @@ fast_open: 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); @@ -1223,7 +1224,7 @@ static void hvcs_close(struct tty_struct 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); @@ -1249,10 +1250,10 @@ static void hvcs_close(struct tty_struct 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); @@ -1268,7 +1269,7 @@ static void hvcs_hangup(struct tty_struc 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 @@ -1283,7 +1284,7 @@ static void hvcs_hangup(struct tty_struc 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. */ @@ -1354,7 +1355,7 @@ static int hvcs_write(struct tty_struct * 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; } @@ -1428,7 +1429,7 @@ static int hvcs_write_room(struct tty_st { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/ipwireless/tty.c linux-2.6.39-pax/drivers/tty/ipwireless/tty.c --- linux-2.6.39/drivers/tty/ipwireless/tty.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/ipwireless/tty.c 2011-05-19 13:45:36.000000000 +0200 @@ -29,6 +29,7 @@ #include #include #include +#include #include "tty.h" #include "network.h" @@ -51,7 +52,7 @@ struct ipw_tty { 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 @@ static int ipw_open(struct tty_struct *l 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 int ipw_open(struct tty_struct *l 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 @@ static void ipw_hangup(struct tty_struct 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 @@ void ipwireless_tty_received(struct ipw_ return; } - if (!tty->open_count) { + if (!local_read(&tty->open_count)) { mutex_unlock(&tty->ipw_tty_mutex); return; } @@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct * 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 @@ static int ipw_write_room(struct tty_str 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 @@ static int ipw_chars_in_buffer(struct tt 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 @@ static int ipw_tiocmget(struct tty_struc 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 @@ ipw_tiocmset(struct tty_struct *linux_tt 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 @@ static int ipw_ioctl(struct tty_struct * 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 @@ void ipwireless_tty_free(struct ipw_tty 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/mxser.c linux-2.6.39-pax/drivers/tty/mxser.c --- linux-2.6.39/drivers/tty/mxser.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/mxser.c 2011-05-19 14:23:31.000000000 +0200 @@ -2340,7 +2340,7 @@ static const struct tty_operations mxser .get_icount = mxser_get_icount, }; -struct tty_port_operations mxser_port_ops = { +const struct tty_port_operations mxser_port_ops = { .carrier_raised = mxser_carrier_raised, .dtr_rts = mxser_dtr_rts, .activate = mxser_activate, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/n_gsm.c linux-2.6.39-pax/drivers/tty/n_gsm.c --- linux-2.6.39/drivers/tty/n_gsm.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/n_gsm.c 2011-05-19 13:45:36.000000000 +0200 @@ -1588,7 +1588,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/n_tty.c linux-2.6.39-pax/drivers/tty/n_tty.c --- linux-2.6.39/drivers/tty/n_tty.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/n_tty.c 2011-05-19 13:45:36.000000000 +0200 @@ -2122,6 +2122,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ { *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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/pty.c linux-2.6.39-pax/drivers/tty/pty.c --- linux-2.6.39/drivers/tty/pty.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/pty.c 2011-05-19 14:23:31.000000000 +0200 @@ -699,7 +699,18 @@ out: 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) { @@ -752,10 +763,6 @@ static void __init unix98_pty_init(void) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/rocket.c linux-2.6.39-pax/drivers/tty/rocket.c --- linux-2.6.39/drivers/tty/rocket.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/rocket.c 2011-05-19 13:45:36.000000000 +0200 @@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info struct rocket_ports tmp; int board; + pax_track_stack(); + if (!retports) return -EFAULT; memset(&tmp, 0, sizeof (tmp)); diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/21285.c linux-2.6.39-pax/drivers/tty/serial/21285.c --- linux-2.6.39/drivers/tty/serial/21285.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/21285.c 2011-05-19 14:23:31.000000000 +0200 @@ -340,7 +340,7 @@ static int serial21285_verify_port(struc return ret; } -static struct uart_ops serial21285_ops = { +static const struct uart_ops serial21285_ops = { .tx_empty = serial21285_tx_empty, .get_mctrl = serial21285_get_mctrl, .set_mctrl = serial21285_set_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/8250.c linux-2.6.39-pax/drivers/tty/serial/8250.c --- linux-2.6.39/drivers/tty/serial/8250.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/8250.c 2011-05-19 14:23:31.000000000 +0200 @@ -2708,7 +2708,7 @@ serial8250_type(struct uart_port *port) return uart_config[type].name; } -static struct uart_ops serial8250_pops = { +static const struct uart_ops serial8250_pops = { .tx_empty = serial8250_tx_empty, .set_mctrl = serial8250_set_mctrl, .get_mctrl = serial8250_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/altera_jtaguart.c linux-2.6.39-pax/drivers/tty/serial/altera_jtaguart.c --- linux-2.6.39/drivers/tty/serial/altera_jtaguart.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/altera_jtaguart.c 2011-05-19 14:23:31.000000000 +0200 @@ -281,7 +281,7 @@ static int altera_jtaguart_verify_port(s /* * Define the basic serial functions we support. */ -static struct uart_ops altera_jtaguart_ops = { +static const struct uart_ops altera_jtaguart_ops = { .tx_empty = altera_jtaguart_tx_empty, .get_mctrl = altera_jtaguart_get_mctrl, .set_mctrl = altera_jtaguart_set_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/altera_uart.c linux-2.6.39-pax/drivers/tty/serial/altera_uart.c --- linux-2.6.39/drivers/tty/serial/altera_uart.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/altera_uart.c 2011-05-19 14:23:31.000000000 +0200 @@ -380,7 +380,7 @@ static int altera_uart_verify_port(struc /* * Define the basic serial functions we support. */ -static struct uart_ops altera_uart_ops = { +static const struct uart_ops altera_uart_ops = { .tx_empty = altera_uart_tx_empty, .get_mctrl = altera_uart_get_mctrl, .set_mctrl = altera_uart_set_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/amba-pl010.c linux-2.6.39-pax/drivers/tty/serial/amba-pl010.c --- linux-2.6.39/drivers/tty/serial/amba-pl010.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/amba-pl010.c 2011-05-19 14:23:31.000000000 +0200 @@ -529,7 +529,7 @@ static int pl010_verify_port(struct uart return ret; } -static struct uart_ops amba_pl010_pops = { +static const struct uart_ops amba_pl010_pops = { .tx_empty = pl010_tx_empty, .set_mctrl = pl010_set_mctrl, .get_mctrl = pl010_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/amba-pl011.c linux-2.6.39-pax/drivers/tty/serial/amba-pl011.c --- linux-2.6.39/drivers/tty/serial/amba-pl011.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/amba-pl011.c 2011-05-19 14:23:31.000000000 +0200 @@ -1581,7 +1581,7 @@ static int pl010_verify_port(struct uart return ret; } -static struct uart_ops amba_pl011_pops = { +static const struct uart_ops amba_pl011_pops = { .tx_empty = pl01x_tx_empty, .set_mctrl = pl011_set_mctrl, .get_mctrl = pl01x_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/apbuart.c linux-2.6.39-pax/drivers/tty/serial/apbuart.c --- linux-2.6.39/drivers/tty/serial/apbuart.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/apbuart.c 2011-05-19 14:23:31.000000000 +0200 @@ -328,7 +328,7 @@ static int apbuart_verify_port(struct ua return ret; } -static struct uart_ops grlib_apbuart_ops = { +static const struct uart_ops grlib_apbuart_ops = { .tx_empty = apbuart_tx_empty, .set_mctrl = apbuart_set_mctrl, .get_mctrl = apbuart_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/atmel_serial.c linux-2.6.39-pax/drivers/tty/serial/atmel_serial.c --- linux-2.6.39/drivers/tty/serial/atmel_serial.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/atmel_serial.c 2011-05-19 14:23:31.000000000 +0200 @@ -1382,7 +1382,7 @@ atmel_ioctl(struct uart_port *port, unsi -static struct uart_ops atmel_pops = { +static const struct uart_ops atmel_pops = { .tx_empty = atmel_tx_empty, .set_mctrl = atmel_set_mctrl, .get_mctrl = atmel_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/bcm63xx_uart.c linux-2.6.39-pax/drivers/tty/serial/bcm63xx_uart.c --- linux-2.6.39/drivers/tty/serial/bcm63xx_uart.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/bcm63xx_uart.c 2011-05-19 14:23:31.000000000 +0200 @@ -636,7 +636,7 @@ static int bcm_uart_verify_port(struct u } /* serial core callbacks */ -static struct uart_ops bcm_uart_ops = { +static const struct uart_ops bcm_uart_ops = { .tx_empty = bcm_uart_tx_empty, .get_mctrl = bcm_uart_get_mctrl, .set_mctrl = bcm_uart_set_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/bfin_5xx.c linux-2.6.39-pax/drivers/tty/serial/bfin_5xx.c --- linux-2.6.39/drivers/tty/serial/bfin_5xx.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/bfin_5xx.c 2011-05-19 14:23:31.000000000 +0200 @@ -1036,7 +1036,7 @@ static int bfin_kgdboc_port_startup(stru } #endif -static struct uart_ops bfin_serial_pops = { +static const struct uart_ops bfin_serial_pops = { .tx_empty = bfin_serial_tx_empty, .set_mctrl = bfin_serial_set_mctrl, .get_mctrl = bfin_serial_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/bfin_sport_uart.c linux-2.6.39-pax/drivers/tty/serial/bfin_sport_uart.c --- linux-2.6.39/drivers/tty/serial/bfin_sport_uart.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/bfin_sport_uart.c 2011-05-19 14:23:31.000000000 +0200 @@ -571,7 +571,7 @@ static void sport_set_termios(struct uar spin_unlock_irqrestore(&up->port.lock, flags); } -struct uart_ops sport_uart_ops = { +const struct uart_ops sport_uart_ops = { .tx_empty = sport_tx_empty, .set_mctrl = sport_set_mctrl, .get_mctrl = sport_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/clps711x.c linux-2.6.39-pax/drivers/tty/serial/clps711x.c --- linux-2.6.39/drivers/tty/serial/clps711x.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/clps711x.c 2011-05-19 14:23:31.000000000 +0200 @@ -380,7 +380,7 @@ static int clps711xuart_request_port(str return 0; } -static struct uart_ops clps711x_pops = { +static const struct uart_ops clps711x_pops = { .tx_empty = clps711xuart_tx_empty, .set_mctrl = clps711xuart_set_mctrl_null, .get_mctrl = clps711xuart_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/cpm_uart/cpm_uart_core.c linux-2.6.39-pax/drivers/tty/serial/cpm_uart/cpm_uart_core.c --- linux-2.6.39/drivers/tty/serial/cpm_uart/cpm_uart_core.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/cpm_uart/cpm_uart_core.c 2011-05-19 14:23:31.000000000 +0200 @@ -1099,7 +1099,7 @@ static void cpm_put_poll_char(struct uar } #endif /* CONFIG_CONSOLE_POLL */ -static struct uart_ops cpm_uart_pops = { +static const struct uart_ops cpm_uart_pops = { .tx_empty = cpm_uart_tx_empty, .set_mctrl = cpm_uart_set_mctrl, .get_mctrl = cpm_uart_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/dz.c linux-2.6.39-pax/drivers/tty/serial/dz.c --- linux-2.6.39/drivers/tty/serial/dz.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/dz.c 2011-05-19 14:23:31.000000000 +0200 @@ -746,7 +746,7 @@ static int dz_verify_port(struct uart_po return ret; } -static struct uart_ops dz_ops = { +static const struct uart_ops dz_ops = { .tx_empty = dz_tx_empty, .get_mctrl = dz_get_mctrl, .set_mctrl = dz_set_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/imx.c linux-2.6.39-pax/drivers/tty/serial/imx.c --- linux-2.6.39/drivers/tty/serial/imx.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/imx.c 2011-05-19 14:23:31.000000000 +0200 @@ -1018,7 +1018,7 @@ imx_verify_port(struct uart_port *port, return ret; } -static struct uart_ops imx_pops = { +static const struct uart_ops imx_pops = { .tx_empty = imx_tx_empty, .set_mctrl = imx_set_mctrl, .get_mctrl = imx_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/ioc3_serial.c linux-2.6.39-pax/drivers/tty/serial/ioc3_serial.c --- linux-2.6.39/drivers/tty/serial/ioc3_serial.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/ioc3_serial.c 2011-05-19 14:23:31.000000000 +0200 @@ -1874,7 +1874,7 @@ static int ic3_request_port(struct uart_ } /* Associate the uart functions above - given to serial core */ -static struct uart_ops ioc3_ops = { +static const struct uart_ops ioc3_ops = { .tx_empty = ic3_tx_empty, .set_mctrl = ic3_set_mctrl, .get_mctrl = ic3_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/ioc4_serial.c linux-2.6.39-pax/drivers/tty/serial/ioc4_serial.c --- linux-2.6.39/drivers/tty/serial/ioc4_serial.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/ioc4_serial.c 2011-05-19 14:23:31.000000000 +0200 @@ -2593,7 +2593,7 @@ static int ic4_request_port(struct uart_ /* Associate the uart functions above - given to serial core */ -static struct uart_ops ioc4_ops = { +static const struct uart_ops ioc4_ops = { .tx_empty = ic4_tx_empty, .set_mctrl = ic4_set_mctrl, .get_mctrl = ic4_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/ip22zilog.c linux-2.6.39-pax/drivers/tty/serial/ip22zilog.c --- linux-2.6.39/drivers/tty/serial/ip22zilog.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/ip22zilog.c 2011-05-19 14:23:31.000000000 +0200 @@ -928,7 +928,7 @@ static int ip22zilog_verify_port(struct return -EINVAL; } -static struct uart_ops ip22zilog_pops = { +static const struct uart_ops ip22zilog_pops = { .tx_empty = ip22zilog_tx_empty, .set_mctrl = ip22zilog_set_mctrl, .get_mctrl = ip22zilog_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/kgdboc.c linux-2.6.39-pax/drivers/tty/serial/kgdboc.c --- linux-2.6.39/drivers/tty/serial/kgdboc.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/kgdboc.c 2011-05-19 14:23:31.000000000 +0200 @@ -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 @@ static void kgdboc_post_exp_handler(void 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/m32r_sio.c linux-2.6.39-pax/drivers/tty/serial/m32r_sio.c --- linux-2.6.39/drivers/tty/serial/m32r_sio.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/m32r_sio.c 2011-05-19 14:23:31.000000000 +0200 @@ -939,7 +939,7 @@ m32r_sio_type(struct uart_port *port) return uart_config[type].name; } -static struct uart_ops m32r_sio_pops = { +static const struct uart_ops m32r_sio_pops = { .tx_empty = m32r_sio_tx_empty, .set_mctrl = m32r_sio_set_mctrl, .get_mctrl = m32r_sio_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/max3100.c linux-2.6.39-pax/drivers/tty/serial/max3100.c --- linux-2.6.39/drivers/tty/serial/max3100.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/max3100.c 2011-05-19 14:23:31.000000000 +0200 @@ -710,7 +710,7 @@ static void max3100_break_ctl(struct uar dev_dbg(&s->spi->dev, "%s\n", __func__); } -static struct uart_ops max3100_ops = { +static const struct uart_ops max3100_ops = { .tx_empty = max3100_tx_empty, .set_mctrl = max3100_set_mctrl, .get_mctrl = max3100_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/max3107.c linux-2.6.39-pax/drivers/tty/serial/max3107.c --- linux-2.6.39/drivers/tty/serial/max3107.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/max3107.c 2011-05-19 14:23:31.000000000 +0200 @@ -910,7 +910,7 @@ static void max3107_break_ctl(struct uar /* Port functions */ -static struct uart_ops max3107_ops = { +static const struct uart_ops max3107_ops = { .tx_empty = max3107_tx_empty, .set_mctrl = max3107_set_mctrl, .get_mctrl = max3107_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/mfd.c linux-2.6.39-pax/drivers/tty/serial/mfd.c --- linux-2.6.39/drivers/tty/serial/mfd.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/mfd.c 2011-05-19 14:23:31.000000000 +0200 @@ -1178,7 +1178,7 @@ static struct console serial_hsu_console }; #endif -struct uart_ops serial_hsu_pops = { +const struct uart_ops serial_hsu_pops = { .tx_empty = serial_hsu_tx_empty, .set_mctrl = serial_hsu_set_mctrl, .get_mctrl = serial_hsu_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/mpc52xx_uart.c linux-2.6.39-pax/drivers/tty/serial/mpc52xx_uart.c --- linux-2.6.39/drivers/tty/serial/mpc52xx_uart.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/mpc52xx_uart.c 2011-05-19 14:23:31.000000000 +0200 @@ -283,7 +283,7 @@ static irqreturn_t mpc52xx_psc_handle_ir return mpc5xxx_uart_process_int(port); } -static struct psc_ops mpc52xx_psc_ops = { +static const struct psc_ops mpc52xx_psc_ops = { .fifo_init = mpc52xx_psc_fifo_init, .raw_rx_rdy = mpc52xx_psc_raw_rx_rdy, .raw_tx_rdy = mpc52xx_psc_raw_tx_rdy, @@ -304,7 +304,7 @@ static struct psc_ops mpc52xx_psc_ops = .handle_irq = mpc52xx_psc_handle_irq, }; -static struct psc_ops mpc5200b_psc_ops = { +static const struct psc_ops mpc5200b_psc_ops = { .fifo_init = mpc52xx_psc_fifo_init, .raw_rx_rdy = mpc52xx_psc_raw_rx_rdy, .raw_tx_rdy = mpc52xx_psc_raw_tx_rdy, @@ -571,7 +571,7 @@ static void mpc512x_psc_get_irq(struct u port->irq = psc_fifoc_irq; } -static struct psc_ops mpc512x_psc_ops = { +static const struct psc_ops mpc512x_psc_ops = { .fifo_init = mpc512x_psc_fifo_init, .raw_rx_rdy = mpc512x_psc_raw_rx_rdy, .raw_tx_rdy = mpc512x_psc_raw_tx_rdy, @@ -596,7 +596,7 @@ static struct psc_ops mpc512x_psc_ops = }; #endif -static struct psc_ops *psc_ops; +static const struct psc_ops *psc_ops; /* ======================================================================== */ /* UART operations */ @@ -905,7 +905,7 @@ mpc52xx_uart_verify_port(struct uart_por } -static struct uart_ops mpc52xx_uart_ops = { +static const struct uart_ops mpc52xx_uart_ops = { .tx_empty = mpc52xx_uart_tx_empty, .set_mctrl = mpc52xx_uart_set_mctrl, .get_mctrl = mpc52xx_uart_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/mpsc.c linux-2.6.39-pax/drivers/tty/serial/mpsc.c --- linux-2.6.39/drivers/tty/serial/mpsc.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/mpsc.c 2011-05-19 14:23:31.000000000 +0200 @@ -1663,7 +1663,7 @@ static void mpsc_put_poll_char(struct ua } #endif -static struct uart_ops mpsc_pops = { +static const struct uart_ops mpsc_pops = { .tx_empty = mpsc_tx_empty, .set_mctrl = mpsc_set_mctrl, .get_mctrl = mpsc_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/mrst_max3110.c linux-2.6.39-pax/drivers/tty/serial/mrst_max3110.c --- linux-2.6.39/drivers/tty/serial/mrst_max3110.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/mrst_max3110.c 2011-05-19 14:23:27.000000000 +0200 @@ -393,6 +393,8 @@ static void max3110_con_receive(struct u int loop = 1, num, total = 0; u8 recv_buf[512], *pbuf; + pax_track_stack(); + pbuf = recv_buf; do { num = max3110_read_multi(max, pbuf); @@ -726,7 +728,7 @@ static void serial_m3110_enable_ms(struc { } -struct uart_ops serial_m3110_ops = { +const struct uart_ops serial_m3110_ops = { .tx_empty = serial_m3110_tx_empty, .set_mctrl = serial_m3110_set_mctrl, .get_mctrl = serial_m3110_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/msm_serial.c linux-2.6.39-pax/drivers/tty/serial/msm_serial.c --- linux-2.6.39/drivers/tty/serial/msm_serial.c 2011-05-19 10:22:50.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/msm_serial.c 2011-05-19 14:23:31.000000000 +0200 @@ -702,7 +702,7 @@ static void msm_power(struct uart_port * } } -static struct uart_ops msm_uart_pops = { +static const struct uart_ops msm_uart_pops = { .tx_empty = msm_tx_empty, .set_mctrl = msm_set_mctrl, .get_mctrl = msm_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/msm_serial_hs.c linux-2.6.39-pax/drivers/tty/serial/msm_serial_hs.c --- linux-2.6.39/drivers/tty/serial/msm_serial_hs.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/msm_serial_hs.c 2011-05-19 14:23:31.000000000 +0200 @@ -360,7 +360,7 @@ struct msm_hs_port { static struct msm_hs_port q_uart_port[UARTDM_NR]; static struct platform_driver msm_serial_hs_platform_driver; static struct uart_driver msm_hs_driver; -static struct uart_ops msm_hs_ops; +static const struct uart_ops msm_hs_ops; static struct workqueue_struct *msm_hs_workqueue; #define UARTDM_TO_MSM(uart_port) \ @@ -1856,7 +1856,7 @@ static struct uart_driver msm_hs_driver .cons = 0, }; -static struct uart_ops msm_hs_ops = { +static const struct uart_ops msm_hs_ops = { .tx_empty = msm_hs_tx_empty, .set_mctrl = msm_hs_set_mctrl_locked, .get_mctrl = msm_hs_get_mctrl_locked, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/mux.c linux-2.6.39-pax/drivers/tty/serial/mux.c --- linux-2.6.39/drivers/tty/serial/mux.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/mux.c 2011-05-19 14:23:31.000000000 +0200 @@ -442,7 +442,7 @@ static struct console mux_console = { #define MUX_CONSOLE NULL #endif -static struct uart_ops mux_pops = { +static const struct uart_ops mux_pops = { .tx_empty = mux_tx_empty, .set_mctrl = mux_set_mctrl, .get_mctrl = mux_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/mxs-auart.c linux-2.6.39-pax/drivers/tty/serial/mxs-auart.c --- linux-2.6.39/drivers/tty/serial/mxs-auart.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/mxs-auart.c 2011-05-19 14:23:31.000000000 +0200 @@ -499,7 +499,7 @@ static void mxs_auart_enable_ms(struct u /* just empty */ } -static struct uart_ops mxs_auart_ops = { +static const struct uart_ops mxs_auart_ops = { .tx_empty = mxs_auart_tx_empty, .start_tx = mxs_auart_start_tx, .stop_tx = mxs_auart_stop_tx, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/netx-serial.c linux-2.6.39-pax/drivers/tty/serial/netx-serial.c --- linux-2.6.39/drivers/tty/serial/netx-serial.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/netx-serial.c 2011-05-19 14:23:31.000000000 +0200 @@ -464,7 +464,7 @@ netx_verify_port(struct uart_port *port, return ret; } -static struct uart_ops netx_pops = { +static const struct uart_ops netx_pops = { .tx_empty = netx_tx_empty, .set_mctrl = netx_set_mctrl, .get_mctrl = netx_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/nwpserial.c linux-2.6.39-pax/drivers/tty/serial/nwpserial.c --- linux-2.6.39/drivers/tty/serial/nwpserial.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/nwpserial.c 2011-05-19 14:23:31.000000000 +0200 @@ -303,7 +303,7 @@ static unsigned int nwpserial_tx_empty(s return ret & UART_LSR_TEMT ? TIOCSER_TEMT : 0; } -static struct uart_ops nwpserial_pops = { +static const struct uart_ops nwpserial_pops = { .tx_empty = nwpserial_tx_empty, .set_mctrl = nwpserial_set_mctrl, .get_mctrl = nwpserial_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/omap-serial.c linux-2.6.39-pax/drivers/tty/serial/omap-serial.c --- linux-2.6.39/drivers/tty/serial/omap-serial.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/omap-serial.c 2011-05-19 14:23:31.000000000 +0200 @@ -1029,7 +1029,7 @@ static inline void serial_omap_add_conso #endif -static struct uart_ops serial_omap_pops = { +static const struct uart_ops serial_omap_pops = { .tx_empty = serial_omap_tx_empty, .set_mctrl = serial_omap_set_mctrl, .get_mctrl = serial_omap_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/pch_uart.c linux-2.6.39-pax/drivers/tty/serial/pch_uart.c --- linux-2.6.39/drivers/tty/serial/pch_uart.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/pch_uart.c 2011-05-19 14:23:31.000000000 +0200 @@ -1351,7 +1351,7 @@ static int pch_uart_verify_port(struct u return 0; } -static struct uart_ops pch_uart_ops = { +static const struct uart_ops pch_uart_ops = { .tx_empty = pch_uart_tx_empty, .set_mctrl = pch_uart_set_mctrl, .get_mctrl = pch_uart_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/pmac_zilog.c linux-2.6.39-pax/drivers/tty/serial/pmac_zilog.c --- linux-2.6.39/drivers/tty/serial/pmac_zilog.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/pmac_zilog.c 2011-05-19 14:23:31.000000000 +0200 @@ -1427,7 +1427,7 @@ static void pmz_poll_put_char(struct uar #endif /* CONFIG_CONSOLE_POLL */ -static struct uart_ops pmz_pops = { +static const struct uart_ops pmz_pops = { .tx_empty = pmz_tx_empty, .set_mctrl = pmz_set_mctrl, .get_mctrl = pmz_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/pnx8xxx_uart.c linux-2.6.39-pax/drivers/tty/serial/pnx8xxx_uart.c --- linux-2.6.39/drivers/tty/serial/pnx8xxx_uart.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/pnx8xxx_uart.c 2011-05-19 14:23:31.000000000 +0200 @@ -614,7 +614,7 @@ pnx8xxx_verify_port(struct uart_port *po return ret; } -static struct uart_ops pnx8xxx_pops = { +static const struct uart_ops pnx8xxx_pops = { .tx_empty = pnx8xxx_tx_empty, .set_mctrl = pnx8xxx_set_mctrl, .get_mctrl = pnx8xxx_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/pxa.c linux-2.6.39-pax/drivers/tty/serial/pxa.c --- linux-2.6.39/drivers/tty/serial/pxa.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/pxa.c 2011-05-19 14:23:31.000000000 +0200 @@ -706,7 +706,7 @@ static struct console serial_pxa_console #define PXA_CONSOLE NULL #endif -struct uart_ops serial_pxa_pops = { +const struct uart_ops serial_pxa_pops = { .tx_empty = serial_pxa_tx_empty, .set_mctrl = serial_pxa_set_mctrl, .get_mctrl = serial_pxa_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/sa1100.c linux-2.6.39-pax/drivers/tty/serial/sa1100.c --- linux-2.6.39/drivers/tty/serial/sa1100.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/sa1100.c 2011-05-19 14:23:31.000000000 +0200 @@ -577,7 +577,7 @@ sa1100_verify_port(struct uart_port *por return ret; } -static struct uart_ops sa1100_pops = { +static const struct uart_ops sa1100_pops = { .tx_empty = sa1100_tx_empty, .set_mctrl = sa1100_set_mctrl, .get_mctrl = sa1100_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/samsung.c linux-2.6.39-pax/drivers/tty/serial/samsung.c --- linux-2.6.39/drivers/tty/serial/samsung.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/samsung.c 2011-05-19 14:23:31.000000000 +0200 @@ -860,7 +860,7 @@ static struct console s3c24xx_serial_con #define S3C24XX_SERIAL_CONSOLE NULL #endif -static struct uart_ops s3c24xx_serial_ops = { +static const struct uart_ops s3c24xx_serial_ops = { .pm = s3c24xx_serial_pm, .tx_empty = s3c24xx_serial_tx_empty, .get_mctrl = s3c24xx_serial_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/sc26xx.c linux-2.6.39-pax/drivers/tty/serial/sc26xx.c --- linux-2.6.39/drivers/tty/serial/sc26xx.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/sc26xx.c 2011-05-19 14:23:31.000000000 +0200 @@ -515,7 +515,7 @@ static int sc26xx_verify_port(struct uar return -EINVAL; } -static struct uart_ops sc26xx_ops = { +static const struct uart_ops sc26xx_ops = { .tx_empty = sc26xx_tx_empty, .set_mctrl = sc26xx_set_mctrl, .get_mctrl = sc26xx_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/serial_ks8695.c linux-2.6.39-pax/drivers/tty/serial/serial_ks8695.c --- linux-2.6.39/drivers/tty/serial/serial_ks8695.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/serial_ks8695.c 2011-05-19 14:23:32.000000000 +0200 @@ -528,7 +528,7 @@ static int ks8695uart_verify_port(struct return ret; } -static struct uart_ops ks8695uart_pops = { +static const struct uart_ops ks8695uart_pops = { .tx_empty = ks8695uart_tx_empty, .set_mctrl = ks8695uart_set_mctrl, .get_mctrl = ks8695uart_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/serial_txx9.c linux-2.6.39-pax/drivers/tty/serial/serial_txx9.c --- linux-2.6.39/drivers/tty/serial/serial_txx9.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/serial_txx9.c 2011-05-19 14:23:32.000000000 +0200 @@ -857,7 +857,7 @@ serial_txx9_type(struct uart_port *port) return "txx9"; } -static struct uart_ops serial_txx9_pops = { +static const struct uart_ops serial_txx9_pops = { .tx_empty = serial_txx9_tx_empty, .set_mctrl = serial_txx9_set_mctrl, .get_mctrl = serial_txx9_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/sn_console.c linux-2.6.39-pax/drivers/tty/serial/sn_console.c --- linux-2.6.39/drivers/tty/serial/sn_console.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/sn_console.c 2011-05-19 14:23:32.000000000 +0200 @@ -388,7 +388,7 @@ static void snp_config_port(struct uart_ /* Associate the uart functions above - given to serial core */ -static struct uart_ops sn_console_ops = { +static const struct uart_ops sn_console_ops = { .tx_empty = snp_tx_empty, .set_mctrl = snp_set_mctrl, .get_mctrl = snp_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/sunhv.c linux-2.6.39-pax/drivers/tty/serial/sunhv.c --- linux-2.6.39/drivers/tty/serial/sunhv.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/sunhv.c 2011-05-19 14:23:32.000000000 +0200 @@ -168,12 +168,12 @@ struct sunhv_ops { int (*receive_chars)(struct uart_port *port, struct tty_struct *tty); }; -static struct sunhv_ops bychar_ops = { +static const struct sunhv_ops bychar_ops = { .transmit_chars = transmit_chars_putchar, .receive_chars = receive_chars_getchar, }; -static struct sunhv_ops bywrite_ops = { +static const struct sunhv_ops bywrite_ops = { .transmit_chars = transmit_chars_write, .receive_chars = receive_chars_read, }; @@ -370,7 +370,7 @@ static int sunhv_verify_port(struct uart return -EINVAL; } -static struct uart_ops sunhv_pops = { +static const struct uart_ops sunhv_pops = { .tx_empty = sunhv_tx_empty, .set_mctrl = sunhv_set_mctrl, .get_mctrl = sunhv_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/sunsab.c linux-2.6.39-pax/drivers/tty/serial/sunsab.c --- linux-2.6.39/drivers/tty/serial/sunsab.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/sunsab.c 2011-05-19 14:23:32.000000000 +0200 @@ -804,7 +804,7 @@ static int sunsab_verify_port(struct uar return -EINVAL; } -static struct uart_ops sunsab_pops = { +static const struct uart_ops sunsab_pops = { .tx_empty = sunsab_tx_empty, .set_mctrl = sunsab_set_mctrl, .get_mctrl = sunsab_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/sunsu.c linux-2.6.39-pax/drivers/tty/serial/sunsu.c --- linux-2.6.39/drivers/tty/serial/sunsu.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/sunsu.c 2011-05-19 14:23:32.000000000 +0200 @@ -946,7 +946,7 @@ sunsu_type(struct uart_port *port) return uart_config[type].name; } -static struct uart_ops sunsu_pops = { +static const struct uart_ops sunsu_pops = { .tx_empty = sunsu_tx_empty, .set_mctrl = sunsu_set_mctrl, .get_mctrl = sunsu_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/sunzilog.c linux-2.6.39-pax/drivers/tty/serial/sunzilog.c --- linux-2.6.39/drivers/tty/serial/sunzilog.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/sunzilog.c 2011-05-19 14:23:32.000000000 +0200 @@ -1042,7 +1042,7 @@ static void sunzilog_put_poll_char(struc } #endif /* CONFIG_CONSOLE_POLL */ -static struct uart_ops sunzilog_pops = { +static const struct uart_ops sunzilog_pops = { .tx_empty = sunzilog_tx_empty, .set_mctrl = sunzilog_set_mctrl, .get_mctrl = sunzilog_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/timbuart.c linux-2.6.39-pax/drivers/tty/serial/timbuart.c --- linux-2.6.39/drivers/tty/serial/timbuart.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/timbuart.c 2011-05-19 14:23:32.000000000 +0200 @@ -394,7 +394,7 @@ static int timbuart_verify_port(struct u return -EINVAL; } -static struct uart_ops timbuart_ops = { +static const struct uart_ops timbuart_ops = { .tx_empty = timbuart_tx_empty, .set_mctrl = timbuart_set_mctrl, .get_mctrl = timbuart_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/uartlite.c linux-2.6.39-pax/drivers/tty/serial/uartlite.c --- linux-2.6.39/drivers/tty/serial/uartlite.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/uartlite.c 2011-05-19 14:23:32.000000000 +0200 @@ -331,7 +331,7 @@ static void ulite_put_poll_char(struct u } #endif -static struct uart_ops ulite_ops = { +static const struct uart_ops ulite_ops = { .tx_empty = ulite_tx_empty, .set_mctrl = ulite_set_mctrl, .get_mctrl = ulite_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/ucc_uart.c linux-2.6.39-pax/drivers/tty/serial/ucc_uart.c --- linux-2.6.39/drivers/tty/serial/ucc_uart.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/serial/ucc_uart.c 2011-05-19 14:23:32.000000000 +0200 @@ -1088,7 +1088,7 @@ static int qe_uart_verify_port(struct ua * * Details on these functions can be found in Documentation/serial/driver */ -static struct uart_ops qe_uart_pops = { +static const struct uart_ops qe_uart_pops = { .tx_empty = qe_uart_tx_empty, .set_mctrl = qe_uart_set_mctrl, .get_mctrl = qe_uart_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/vr41xx_siu.c linux-2.6.39-pax/drivers/tty/serial/vr41xx_siu.c --- linux-2.6.39/drivers/tty/serial/vr41xx_siu.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/vr41xx_siu.c 2011-05-19 14:23:32.000000000 +0200 @@ -683,7 +683,7 @@ static int siu_verify_port(struct uart_p return 0; } -static struct uart_ops siu_uart_ops = { +static const struct uart_ops siu_uart_ops = { .tx_empty = siu_tx_empty, .set_mctrl = siu_set_mctrl, .get_mctrl = siu_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/vt8500_serial.c linux-2.6.39-pax/drivers/tty/serial/vt8500_serial.c --- linux-2.6.39/drivers/tty/serial/vt8500_serial.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/vt8500_serial.c 2011-05-19 14:23:32.000000000 +0200 @@ -519,7 +519,7 @@ static struct console vt8500_console = { #define VT8500_CONSOLE NULL #endif -static struct uart_ops vt8500_uart_pops = { +static const struct uart_ops vt8500_uart_pops = { .tx_empty = vt8500_tx_empty, .set_mctrl = vt8500_set_mctrl, .get_mctrl = vt8500_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/serial/zs.c linux-2.6.39-pax/drivers/tty/serial/zs.c --- linux-2.6.39/drivers/tty/serial/zs.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/tty/serial/zs.c 2011-05-19 14:23:32.000000000 +0200 @@ -1044,7 +1044,7 @@ static int zs_verify_port(struct uart_po } -static struct uart_ops zs_ops = { +static const struct uart_ops zs_ops = { .tx_empty = zs_tx_empty, .set_mctrl = zs_set_mctrl, .get_mctrl = zs_get_mctrl, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/tty_io.c linux-2.6.39-pax/drivers/tty/tty_io.c --- linux-2.6.39/drivers/tty/tty_io.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/tty_io.c 2011-05-19 14:23:32.000000000 +0200 @@ -139,21 +139,11 @@ EXPORT_SYMBOL(tty_mutex); /* 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); @@ -937,7 +927,7 @@ EXPORT_SYMBOL(start_tty); * 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; @@ -963,6 +953,8 @@ static ssize_t tty_read(struct file *fil return i; } +EXPORT_SYMBOL(tty_read); + void tty_write_unlock(struct tty_struct *tty) { mutex_unlock(&tty->atomic_write_lock); @@ -1112,7 +1104,7 @@ void tty_write_message(struct tty_struct * 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; @@ -1138,6 +1130,8 @@ static ssize_t tty_write(struct file *fi return ret; } +EXPORT_SYMBOL(tty_write); + ssize_t redirected_tty_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { @@ -1777,6 +1771,8 @@ int tty_release(struct inode *inode, str return 0; } +EXPORT_SYMBOL(tty_release); + /** * tty_open - open a tty device * @inode: inode of device file @@ -1968,7 +1964,7 @@ got_driver: * 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; @@ -1984,6 +1980,8 @@ static unsigned int tty_poll(struct file return ret; } +EXPORT_SYMBOL(tty_poll); + static int __tty_fasync(int fd, struct file *filp, int on) { struct tty_struct *tty = file_tty(filp); @@ -2025,7 +2023,7 @@ out: 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(); @@ -2034,6 +2032,8 @@ static int tty_fasync(int fd, struct fil return retval; } +EXPORT_SYMBOL(tty_fasync); + /** * tiocsti - fake input character * @tty: tty to fake input into @@ -2695,8 +2695,10 @@ long tty_ioctl(struct file *file, unsign 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; @@ -2720,6 +2722,9 @@ static long tty_compat_ioctl(struct file return retval; } + +EXPORT_SYMBOL(tty_compat_ioctl); + #endif /* @@ -3198,11 +3203,6 @@ struct tty_struct *get_current_tty(void) } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/tty_ldisc.c linux-2.6.39-pax/drivers/tty/tty_ldisc.c --- linux-2.6.39/drivers/tty/tty_ldisc.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/tty_ldisc.c 2011-05-19 13:45:36.000000000 +0200 @@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc * 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); @@ -109,7 +109,7 @@ int tty_register_ldisc(int disc, struct 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; @@ -137,7 +137,7 @@ int tty_unregister_ldisc(int disc) 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; @@ -158,7 +158,7 @@ static struct tty_ldisc_ops *get_ldops(i if (ldops) { ret = ERR_PTR(-EAGAIN); if (try_module_get(ldops->owner)) { - ldops->refcount++; + atomic_inc(&ldops->refcount); ret = ldops; } } @@ -171,7 +171,7 @@ static void put_ldops(struct tty_ldisc_o 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/tty/vt/vt.c linux-2.6.39-pax/drivers/tty/vt/vt.c --- linux-2.6.39/drivers/tty/vt/vt.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/tty/vt/vt.c 2011-05-19 13:45:36.000000000 +0200 @@ -261,7 +261,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/uio/uio.c linux-2.6.39-pax/drivers/uio/uio.c --- linux-2.6.39/drivers/uio/uio.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/uio/uio.c 2011-05-19 13:45:36.000000000 +0200 @@ -25,6 +25,7 @@ #include #include #include +#include #define UIO_MAX_DEVICES (1U << MINORBITS) @@ -32,10 +33,10 @@ struct uio_device { struct module *owner; struct device *dev; int minor; - atomic_t event; + atomic_unchecked_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; @@ -242,7 +243,7 @@ static ssize_t show_event(struct device struct device_attribute *attr, char *buf) { struct uio_device *idev = dev_get_drvdata(dev); - return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event)); + return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event)); } static struct device_attribute uio_class_attributes[] = { @@ -402,7 +403,7 @@ void uio_event_notify(struct uio_info *i { struct uio_device *idev = info->uio_dev; - atomic_inc(&idev->event); + atomic_inc_unchecked(&idev->event); wake_up_interruptible(&idev->wait); kill_fasync(&idev->async_queue, SIGIO, POLL_IN); } @@ -455,7 +456,7 @@ static int uio_open(struct inode *inode, } listener->dev = idev; - listener->event_count = atomic_read(&idev->event); + listener->event_count = atomic_read_unchecked(&idev->event); filep->private_data = listener; if (idev->info->open) { @@ -506,7 +507,7 @@ static unsigned int uio_poll(struct file return -EIO; poll_wait(filep, &idev->wait, wait); - if (listener->event_count != atomic_read(&idev->event)) + if (listener->event_count != atomic_read_unchecked(&idev->event)) return POLLIN | POLLRDNORM; return 0; } @@ -531,7 +532,7 @@ static ssize_t uio_read(struct file *fil do { set_current_state(TASK_INTERRUPTIBLE); - event_count = atomic_read(&idev->event); + event_count = atomic_read_unchecked(&idev->event); if (event_count != listener->event_count) { if (copy_to_user(buf, &event_count, count)) retval = -EFAULT; @@ -602,13 +603,13 @@ static int uio_find_mem_index(struct vm_ 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) @@ -819,7 +820,7 @@ int __uio_register_device(struct module idev->owner = owner; idev->info = info; init_waitqueue_head(&idev->wait); - atomic_set(&idev->event, 0); + atomic_set_unchecked(&idev->event, 0); ret = uio_get_minor(idev); if (ret) diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/atm/cxacru.c linux-2.6.39-pax/drivers/usb/atm/cxacru.c --- linux-2.6.39/drivers/usb/atm/cxacru.c 2011-03-15 19:34:57.000000000 +0100 +++ linux-2.6.39-pax/drivers/usb/atm/cxacru.c 2011-05-19 13:45:36.000000000 +0200 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/atm/usbatm.c linux-2.6.39-pax/drivers/usb/atm/usbatm.c --- linux-2.6.39/drivers/usb/atm/usbatm.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/usb/atm/usbatm.c 2011-05-19 13:45:36.000000000 +0200 @@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru 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 @@ static void usbatm_extract_one_cell(stru 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 @@ static void usbatm_extract_one_cell(stru 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 @@ static void usbatm_extract_one_cell(stru 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 @@ static void usbatm_extract_one_cell(stru vcc->push(vcc, skb); - atomic_inc(&vcc->stats->rx); + atomic_inc_unchecked(&vcc->stats->rx); out: skb_trim(sarb, 0); } @@ -614,7 +614,7 @@ static void usbatm_tx_process(unsigned l 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 @@ static int usbatm_atm_proc_read(struct a 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/core/devices.c linux-2.6.39-pax/drivers/usb/core/devices.c --- linux-2.6.39/drivers/usb/core/devices.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/core/devices.c 2011-05-19 13:45:36.000000000 +0200 @@ -126,7 +126,7 @@ static const char *format_endpt = * time it gets called. */ static struct device_connect_event { - atomic_t count; + atomic_unchecked_t count; wait_queue_head_t wait; } device_event = { .count = ATOMIC_INIT(1), @@ -164,7 +164,7 @@ static const struct class_info clas_info void usbfs_conn_disc_event(void) { - atomic_add(2, &device_event.count); + atomic_add_unchecked(2, &device_event.count); wake_up(&device_event.wait); } @@ -648,7 +648,7 @@ static unsigned int usb_device_poll(stru poll_wait(file, &device_event.wait, wait); - event_count = atomic_read(&device_event.count); + event_count = atomic_read_unchecked(&device_event.count); if (file->f_version != event_count) { file->f_version = event_count; return POLLIN | POLLRDNORM; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/core/hcd.c linux-2.6.39-pax/drivers/usb/core/hcd.c --- linux-2.6.39/drivers/usb/core/hcd.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/core/hcd.c 2011-05-19 14:23:32.000000000 +0200 @@ -2577,7 +2577,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd #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. @@ -2587,7 +2587,7 @@ struct usb_mon_operations *mon_ops; * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/core/message.c linux-2.6.39-pax/drivers/usb/core/message.c --- linux-2.6.39/drivers/usb/core/message.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/core/message.c 2011-05-19 13:45:36.000000000 +0200 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/early/ehci-dbgp.c linux-2.6.39-pax/drivers/usb/early/ehci-dbgp.c --- linux-2.6.39/drivers/usb/early/ehci-dbgp.c 2011-05-19 10:22:51.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/early/ehci-dbgp.c 2011-05-19 14:23:32.000000000 +0200 @@ -96,7 +96,7 @@ static inline u32 dbgp_len_update(u32 x, } #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 @@ static void kgdbdbgp_write_char(u8 chr) 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/fsl_qe_udc.c linux-2.6.39-pax/drivers/usb/gadget/fsl_qe_udc.c --- linux-2.6.39/drivers/usb/gadget/fsl_qe_udc.c 2011-05-19 10:22:52.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/gadget/fsl_qe_udc.c 2011-05-19 14:23:32.000000000 +0200 @@ -1859,7 +1859,7 @@ out: return status; } -static struct usb_ep_ops qe_ep_ops = { +static const struct usb_ep_ops qe_ep_ops = { .enable = qe_ep_enable, .disable = qe_ep_disable, @@ -1928,7 +1928,7 @@ static int qe_pullup(struct usb_gadget * } /* defined in usb_gadget.h */ -static struct usb_gadget_ops qe_gadget_ops = { +static const struct usb_gadget_ops qe_gadget_ops = { .get_frame = qe_get_frame, .wakeup = qe_wakeup, /* .set_selfpowered = qe_set_selfpowered,*/ /* always selfpowered */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/fsl_udc_core.c linux-2.6.39-pax/drivers/usb/gadget/fsl_udc_core.c --- linux-2.6.39/drivers/usb/gadget/fsl_udc_core.c 2011-05-19 10:22:52.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/gadget/fsl_udc_core.c 2011-05-19 14:23:32.000000000 +0200 @@ -1003,7 +1003,7 @@ static void fsl_ep_fifo_flush(struct usb } while (fsl_readl(&dr_regs->endptstatus) & bits); } -static struct usb_ep_ops fsl_ep_ops = { +static const struct usb_ep_ops fsl_ep_ops = { .enable = fsl_ep_enable, .disable = fsl_ep_disable, @@ -1114,7 +1114,7 @@ static int fsl_pullup(struct usb_gadget } /* defined in gadget.h */ -static struct usb_gadget_ops fsl_gadget_ops = { +static const struct usb_gadget_ops fsl_gadget_ops = { .get_frame = fsl_get_frame, .wakeup = fsl_wakeup, /* .set_selfpowered = fsl_set_selfpowered, */ /* Always selfpowered */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/fusb300_udc.c linux-2.6.39-pax/drivers/usb/gadget/fusb300_udc.c --- linux-2.6.39/drivers/usb/gadget/fusb300_udc.c 2011-05-19 10:22:52.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/gadget/fusb300_udc.c 2011-05-19 14:23:32.000000000 +0200 @@ -527,7 +527,7 @@ static void fusb300_fifo_flush(struct us { } -static struct usb_ep_ops fusb300_ep_ops = { +static const struct usb_ep_ops fusb300_ep_ops = { .enable = fusb300_enable, .disable = fusb300_disable, @@ -1570,7 +1570,7 @@ static int fusb300_udc_pullup(struct usb return 0; } -static struct usb_gadget_ops fusb300_gadget_ops = { +static const struct usb_gadget_ops fusb300_gadget_ops = { .pullup = fusb300_udc_pullup, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/goku_udc.c linux-2.6.39-pax/drivers/usb/gadget/goku_udc.c --- linux-2.6.39/drivers/usb/gadget/goku_udc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/usb/gadget/goku_udc.c 2011-05-19 14:23:32.000000000 +0200 @@ -973,7 +973,7 @@ static void goku_fifo_flush(struct usb_e command(regs, COMMAND_FIFO_CLEAR, ep->num); } -static struct usb_ep_ops goku_ep_ops = { +static const struct usb_ep_ops goku_ep_ops = { .enable = goku_ep_enable, .disable = goku_ep_disable, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/imx_udc.c linux-2.6.39-pax/drivers/usb/gadget/imx_udc.c --- linux-2.6.39/drivers/usb/gadget/imx_udc.c 2011-03-15 19:34:58.000000000 +0100 +++ linux-2.6.39-pax/drivers/usb/gadget/imx_udc.c 2011-05-19 14:23:32.000000000 +0200 @@ -937,7 +937,7 @@ static void imx_ep_fifo_flush(struct usb local_irq_restore(flags); } -static struct usb_ep_ops imx_ep_ops = { +static const struct usb_ep_ops imx_ep_ops = { .enable = imx_ep_enable, .disable = imx_ep_disable, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/m66592-udc.c linux-2.6.39-pax/drivers/usb/gadget/m66592-udc.c --- linux-2.6.39/drivers/usb/gadget/m66592-udc.c 2011-05-19 10:22:52.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/gadget/m66592-udc.c 2011-05-19 14:23:32.000000000 +0200 @@ -1437,7 +1437,7 @@ static void m66592_fifo_flush(struct usb spin_unlock_irqrestore(&ep->m66592->lock, flags); } -static struct usb_ep_ops m66592_ep_ops = { +static const struct usb_ep_ops m66592_ep_ops = { .enable = m66592_enable, .disable = m66592_disable, @@ -1542,7 +1542,7 @@ static int m66592_get_frame(struct usb_g return m66592_read(m66592, M66592_FRMNUM) & 0x03FF; } -static struct usb_gadget_ops m66592_gadget_ops = { +static const struct usb_gadget_ops m66592_gadget_ops = { .get_frame = m66592_get_frame, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/mv_udc_core.c linux-2.6.39-pax/drivers/usb/gadget/mv_udc_core.c --- linux-2.6.39/drivers/usb/gadget/mv_udc_core.c 2011-05-19 10:22:52.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/gadget/mv_udc_core.c 2011-05-19 14:23:32.000000000 +0200 @@ -972,7 +972,7 @@ static int mv_ep_set_wedge(struct usb_ep return mv_ep_set_halt_wedge(_ep, 1, 1); } -static struct usb_ep_ops mv_ep_ops = { +static const struct usb_ep_ops mv_ep_ops = { .enable = mv_ep_enable, .disable = mv_ep_disable, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/omap_udc.c linux-2.6.39-pax/drivers/usb/gadget/omap_udc.c --- linux-2.6.39/drivers/usb/gadget/omap_udc.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/usb/gadget/omap_udc.c 2011-05-19 14:23:32.000000000 +0200 @@ -1177,7 +1177,7 @@ done: return status; } -static struct usb_ep_ops omap_ep_ops = { +static const struct usb_ep_ops omap_ep_ops = { .enable = omap_ep_enable, .disable = omap_ep_disable, @@ -1374,7 +1374,7 @@ static int omap_pullup(struct usb_gadget return 0; } -static struct usb_gadget_ops omap_gadget_ops = { +static const struct usb_gadget_ops omap_gadget_ops = { .get_frame = omap_get_frame, .wakeup = omap_wakeup, .set_selfpowered = omap_set_selfpowered, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/pxa25x_udc.c linux-2.6.39-pax/drivers/usb/gadget/pxa25x_udc.c --- linux-2.6.39/drivers/usb/gadget/pxa25x_udc.c 2011-05-19 10:22:52.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/gadget/pxa25x_udc.c 2011-05-19 14:23:32.000000000 +0200 @@ -896,7 +896,7 @@ static void pxa25x_ep_fifo_flush(struct } -static struct usb_ep_ops pxa25x_ep_ops = { +static const struct usb_ep_ops pxa25x_ep_ops = { .enable = pxa25x_ep_enable, .disable = pxa25x_ep_disable, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/pxa27x_udc.c linux-2.6.39-pax/drivers/usb/gadget/pxa27x_udc.c --- linux-2.6.39/drivers/usb/gadget/pxa27x_udc.c 2011-05-19 10:22:52.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/gadget/pxa27x_udc.c 2011-05-19 14:23:32.000000000 +0200 @@ -1491,7 +1491,7 @@ static int pxa_ep_disable(struct usb_ep return 0; } -static struct usb_ep_ops pxa_ep_ops = { +static const struct usb_ep_ops pxa_ep_ops = { .enable = pxa_ep_enable, .disable = pxa_ep_disable, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/r8a66597-udc.c linux-2.6.39-pax/drivers/usb/gadget/r8a66597-udc.c --- linux-2.6.39/drivers/usb/gadget/r8a66597-udc.c 2011-05-19 10:22:52.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/gadget/r8a66597-udc.c 2011-05-19 14:23:32.000000000 +0200 @@ -1392,7 +1392,7 @@ static void r8a66597_fifo_flush(struct u spin_unlock_irqrestore(&ep->r8a66597->lock, flags); } -static struct usb_ep_ops r8a66597_ep_ops = { +static const struct usb_ep_ops r8a66597_ep_ops = { .enable = r8a66597_enable, .disable = r8a66597_disable, @@ -1497,7 +1497,7 @@ static int r8a66597_get_frame(struct usb return r8a66597_read(r8a66597, FRMNUM) & 0x03FF; } -static struct usb_gadget_ops r8a66597_gadget_ops = { +static const struct usb_gadget_ops r8a66597_gadget_ops = { .get_frame = r8a66597_get_frame, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/s3c-hsotg.c linux-2.6.39-pax/drivers/usb/gadget/s3c-hsotg.c --- linux-2.6.39/drivers/usb/gadget/s3c-hsotg.c 2011-05-19 10:22:52.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/gadget/s3c-hsotg.c 2011-05-19 14:23:35.000000000 +0200 @@ -2461,7 +2461,7 @@ static int s3c_hsotg_ep_sethalt(struct u return 0; } -static struct usb_ep_ops s3c_hsotg_ep_ops = { +static const struct usb_ep_ops s3c_hsotg_ep_ops = { .enable = s3c_hsotg_ep_enable, .disable = s3c_hsotg_ep_disable, .alloc_request = s3c_hsotg_ep_alloc_request, @@ -2725,7 +2725,7 @@ static int s3c_hsotg_gadget_getframe(str return s3c_hsotg_read_frameno(to_hsotg(gadget)); } -static struct usb_gadget_ops s3c_hsotg_gadget_ops = { +static const struct usb_gadget_ops s3c_hsotg_gadget_ops = { .get_frame = s3c_hsotg_gadget_getframe, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/gadget/uvc_queue.c linux-2.6.39-pax/drivers/usb/gadget/uvc_queue.c --- linux-2.6.39/drivers/usb/gadget/uvc_queue.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/usb/gadget/uvc_queue.c 2011-05-19 14:23:35.000000000 +0200 @@ -400,7 +400,7 @@ static void uvc_vm_close(struct vm_area_ buffer->vma_use_count--; } -static struct vm_operations_struct uvc_vm_ops = { +static const struct vm_operations_struct uvc_vm_ops = { .open = uvc_vm_open, .close = uvc_vm_close, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/host/ehci-fsl.c linux-2.6.39-pax/drivers/usb/host/ehci-fsl.c --- linux-2.6.39/drivers/usb/host/ehci-fsl.c 2011-03-15 19:34:58.000000000 +0100 +++ linux-2.6.39-pax/drivers/usb/host/ehci-fsl.c 2011-05-19 14:23:35.000000000 +0200 @@ -380,7 +380,7 @@ static int ehci_fsl_drv_restore(struct d return 0; } -static struct dev_pm_ops ehci_fsl_pm_ops = { +static const struct dev_pm_ops ehci_fsl_pm_ops = { .suspend = ehci_fsl_drv_suspend, .resume = ehci_fsl_drv_resume, .restore = ehci_fsl_drv_restore, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/host/xhci-mem.c linux-2.6.39-pax/drivers/usb/host/xhci-mem.c --- linux-2.6.39/drivers/usb/host/xhci-mem.c 2011-05-19 10:22:55.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/host/xhci-mem.c 2011-05-19 13:45:36.000000000 +0200 @@ -1671,6 +1671,8 @@ static int xhci_check_trb_in_td_math(str unsigned int num_tests; int i, ret; + pax_track_stack(); + num_tests = ARRAY_SIZE(simple_test_vector); for (i = 0; i < num_tests; i++) { ret = xhci_test_trb_in_td(xhci, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/mon/mon_main.c linux-2.6.39-pax/drivers/usb/mon/mon_main.c --- linux-2.6.39/drivers/usb/mon/mon_main.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/usb/mon/mon_main.c 2011-05-19 14:23:36.000000000 +0200 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { /* * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/musb/cppi_dma.h linux-2.6.39-pax/drivers/usb/musb/cppi_dma.h --- linux-2.6.39/drivers/usb/musb/cppi_dma.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/usb/musb/cppi_dma.h 2011-05-19 14:23:36.000000000 +0200 @@ -113,7 +113,7 @@ struct cppi_channel { /* CPPI DMA controller object */ struct cppi { - struct dma_controller controller; + const struct dma_controller controller; struct musb *musb; void __iomem *mregs; /* Mentor regs */ void __iomem *tibase; /* TI/CPPI regs */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/otg/msm_otg.c linux-2.6.39-pax/drivers/usb/otg/msm_otg.c --- linux-2.6.39/drivers/usb/otg/msm_otg.c 2011-05-19 10:22:55.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/otg/msm_otg.c 2011-05-19 14:23:36.000000000 +0200 @@ -95,7 +95,7 @@ static int ulpi_write(struct otg_transce return 0; } -static struct otg_io_access_ops msm_otg_io_ops = { +static const struct otg_io_access_ops msm_otg_io_ops = { .read = ulpi_read, .write = ulpi_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/otg/ulpi_viewport.c linux-2.6.39-pax/drivers/usb/otg/ulpi_viewport.c --- linux-2.6.39/drivers/usb/otg/ulpi_viewport.c 2011-05-19 10:22:55.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/otg/ulpi_viewport.c 2011-05-19 14:23:36.000000000 +0200 @@ -74,7 +74,7 @@ static int ulpi_viewport_write(struct ot return ulpi_viewport_wait(view, ULPI_VIEW_RUN); } -struct otg_io_access_ops ulpi_viewport_access_ops = { +const struct otg_io_access_ops ulpi_viewport_access_ops = { .read = ulpi_viewport_read, .write = ulpi_viewport_write, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/serial/ftdi_sio.c linux-2.6.39-pax/drivers/usb/serial/ftdi_sio.c --- linux-2.6.39/drivers/usb/serial/ftdi_sio.c 2011-05-19 10:22:56.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/serial/ftdi_sio.c 2011-05-19 14:23:36.000000000 +0200 @@ -104,27 +104,27 @@ static int ftdi_stmclite_probe(struct static void ftdi_USB_UIRT_setup(struct ftdi_private *priv); static void ftdi_HE_TIRA1_setup(struct ftdi_private *priv); -static struct ftdi_sio_quirk ftdi_jtag_quirk = { +static const struct ftdi_sio_quirk ftdi_jtag_quirk = { .probe = ftdi_jtag_probe, }; -static struct ftdi_sio_quirk ftdi_mtxorb_hack_quirk = { +static const struct ftdi_sio_quirk ftdi_mtxorb_hack_quirk = { .probe = ftdi_mtxorb_hack_setup, }; -static struct ftdi_sio_quirk ftdi_NDI_device_quirk = { +static const struct ftdi_sio_quirk ftdi_NDI_device_quirk = { .probe = ftdi_NDI_device_setup, }; -static struct ftdi_sio_quirk ftdi_USB_UIRT_quirk = { +static const struct ftdi_sio_quirk ftdi_USB_UIRT_quirk = { .port_probe = ftdi_USB_UIRT_setup, }; -static struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = { +static const struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = { .port_probe = ftdi_HE_TIRA1_setup, }; -static struct ftdi_sio_quirk ftdi_stmclite_quirk = { +static const struct ftdi_sio_quirk ftdi_stmclite_quirk = { .probe = ftdi_stmclite_probe, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/wusbcore/wa-hc.h linux-2.6.39-pax/drivers/usb/wusbcore/wa-hc.h --- linux-2.6.39/drivers/usb/wusbcore/wa-hc.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/usb/wusbcore/wa-hc.h 2011-05-19 13:45:36.000000000 +0200 @@ -192,7 +192,7 @@ struct wahc { struct list_head xfer_delayed_list; spinlock_t xfer_list_lock; struct work_struct xfer_work; - atomic_t xfer_id_count; + atomic_unchecked_t xfer_id_count; }; @@ -246,7 +246,7 @@ static inline void wa_init(struct wahc * INIT_LIST_HEAD(&wa->xfer_delayed_list); spin_lock_init(&wa->xfer_list_lock); INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run); - atomic_set(&wa->xfer_id_count, 1); + atomic_set_unchecked(&wa->xfer_id_count, 1); } /** diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/usb/wusbcore/wa-xfer.c linux-2.6.39-pax/drivers/usb/wusbcore/wa-xfer.c --- linux-2.6.39/drivers/usb/wusbcore/wa-xfer.c 2011-05-19 10:22:56.000000000 +0200 +++ linux-2.6.39-pax/drivers/usb/wusbcore/wa-xfer.c 2011-05-19 13:45:36.000000000 +0200 @@ -294,7 +294,7 @@ out: */ static void wa_xfer_id_init(struct wa_xfer *xfer) { - xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count); + xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count); } /* diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/vhost/vhost.c linux-2.6.39-pax/drivers/vhost/vhost.c --- linux-2.6.39/drivers/vhost/vhost.c 2011-05-19 10:22:56.000000000 +0200 +++ linux-2.6.39-pax/drivers/vhost/vhost.c 2011-05-19 13:45:36.000000000 +0200 @@ -580,7 +580,7 @@ static int init_used(struct vhost_virtqu 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/corgi_lcd.c linux-2.6.39-pax/drivers/video/backlight/corgi_lcd.c --- linux-2.6.39/drivers/video/backlight/corgi_lcd.c 2011-05-19 10:22:57.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/backlight/corgi_lcd.c 2011-05-19 14:23:36.000000000 +0200 @@ -383,7 +383,7 @@ static int corgi_lcd_get_power(struct lc return lcd->power; } -static struct lcd_ops corgi_lcd_ops = { +static const struct lcd_ops corgi_lcd_ops = { .get_power = corgi_lcd_get_power, .set_power = corgi_lcd_set_power, .set_mode = corgi_lcd_set_mode, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/cr_bllcd.c linux-2.6.39-pax/drivers/video/backlight/cr_bllcd.c --- linux-2.6.39/drivers/video/backlight/cr_bllcd.c 2011-05-19 10:22:57.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/backlight/cr_bllcd.c 2011-05-19 14:23:36.000000000 +0200 @@ -165,7 +165,7 @@ static int cr_lcd_set_power(struct lcd_d return 0; } -static struct lcd_ops cr_lcd_ops = { +static const struct lcd_ops cr_lcd_ops = { .set_power = cr_lcd_set_power, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/ili9320.c linux-2.6.39-pax/drivers/video/backlight/ili9320.c --- linux-2.6.39/drivers/video/backlight/ili9320.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/backlight/ili9320.c 2011-05-19 14:23:36.000000000 +0200 @@ -166,7 +166,7 @@ static int ili9320_get_power(struct lcd_ return lcd->power; } -static struct lcd_ops ili9320_ops = { +static const struct lcd_ops ili9320_ops = { .get_power = ili9320_get_power, .set_power = ili9320_set_power, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/jornada720_lcd.c linux-2.6.39-pax/drivers/video/backlight/jornada720_lcd.c --- linux-2.6.39/drivers/video/backlight/jornada720_lcd.c 2011-05-19 10:22:57.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/backlight/jornada720_lcd.c 2011-05-19 14:23:36.000000000 +0200 @@ -87,7 +87,7 @@ static int jornada_lcd_set_power(struct return 0; } -static struct lcd_ops jornada_lcd_props = { +static const struct lcd_ops jornada_lcd_props = { .get_contrast = jornada_lcd_get_contrast, .set_contrast = jornada_lcd_set_contrast, .get_power = jornada_lcd_get_power, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/l4f00242t03.c linux-2.6.39-pax/drivers/video/backlight/l4f00242t03.c --- linux-2.6.39/drivers/video/backlight/l4f00242t03.c 2011-03-15 19:35:00.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/backlight/l4f00242t03.c 2011-05-19 14:23:36.000000000 +0200 @@ -149,7 +149,7 @@ static int l4f00242t03_lcd_power_set(str return 0; } -static struct lcd_ops l4f_ops = { +static const struct lcd_ops l4f_ops = { .set_power = l4f00242t03_lcd_power_set, .get_power = l4f00242t03_lcd_power_get, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/lcd.c linux-2.6.39-pax/drivers/video/backlight/lcd.c --- linux-2.6.39/drivers/video/backlight/lcd.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/backlight/lcd.c 2011-05-19 14:23:36.000000000 +0200 @@ -192,7 +192,7 @@ static struct device_attribute lcd_devic * or a pointer to the newly allocated device. */ struct lcd_device *lcd_device_register(const char *name, struct device *parent, - void *devdata, struct lcd_ops *ops) + void *devdata, const struct lcd_ops *ops) { struct lcd_device *new_ld; int rc; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/ld9040.c linux-2.6.39-pax/drivers/video/backlight/ld9040.c --- linux-2.6.39/drivers/video/backlight/ld9040.c 2011-05-19 10:22:57.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/backlight/ld9040.c 2011-05-19 14:23:36.000000000 +0200 @@ -651,7 +651,7 @@ static int ld9040_set_brightness(struct return ret; } -static struct lcd_ops ld9040_lcd_ops = { +static const struct lcd_ops ld9040_lcd_ops = { .set_power = ld9040_set_power, .get_power = ld9040_get_power, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/lms283gf05.c linux-2.6.39-pax/drivers/video/backlight/lms283gf05.c --- linux-2.6.39/drivers/video/backlight/lms283gf05.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/backlight/lms283gf05.c 2011-05-19 14:23:36.000000000 +0200 @@ -144,7 +144,7 @@ static int lms283gf05_power_set(struct l return 0; } -static struct lcd_ops lms_ops = { +static const struct lcd_ops lms_ops = { .set_power = lms283gf05_power_set, .get_power = NULL, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/ltv350qv.c linux-2.6.39-pax/drivers/video/backlight/ltv350qv.c --- linux-2.6.39/drivers/video/backlight/ltv350qv.c 2011-03-15 19:35:00.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/backlight/ltv350qv.c 2011-05-19 14:23:36.000000000 +0200 @@ -221,7 +221,7 @@ static int ltv350qv_get_power(struct lcd return lcd->power; } -static struct lcd_ops ltv_ops = { +static const struct lcd_ops ltv_ops = { .get_power = ltv350qv_get_power, .set_power = ltv350qv_set_power, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/platform_lcd.c linux-2.6.39-pax/drivers/video/backlight/platform_lcd.c --- linux-2.6.39/drivers/video/backlight/platform_lcd.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/backlight/platform_lcd.c 2011-05-19 14:23:36.000000000 +0200 @@ -66,7 +66,7 @@ static int platform_lcd_match(struct lcd return plcd->us->parent == info->device; } -static struct lcd_ops platform_lcd_ops = { +static const struct lcd_ops platform_lcd_ops = { .get_power = platform_lcd_get_power, .set_power = platform_lcd_set_power, .check_fb = platform_lcd_match, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/s6e63m0.c linux-2.6.39-pax/drivers/video/backlight/s6e63m0.c --- linux-2.6.39/drivers/video/backlight/s6e63m0.c 2011-05-19 10:22:58.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/backlight/s6e63m0.c 2011-05-19 14:23:36.000000000 +0200 @@ -644,7 +644,7 @@ static int s6e63m0_set_brightness(struct return ret; } -static struct lcd_ops s6e63m0_lcd_ops = { +static const struct lcd_ops s6e63m0_lcd_ops = { .set_power = s6e63m0_set_power, .get_power = s6e63m0_get_power, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/tdo24m.c linux-2.6.39-pax/drivers/video/backlight/tdo24m.c --- linux-2.6.39/drivers/video/backlight/tdo24m.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/backlight/tdo24m.c 2011-05-19 14:23:36.000000000 +0200 @@ -322,7 +322,7 @@ static int tdo24m_set_mode(struct lcd_de return lcd->adj_mode(lcd, mode); } -static struct lcd_ops tdo24m_ops = { +static const struct lcd_ops tdo24m_ops = { .get_power = tdo24m_get_power, .set_power = tdo24m_set_power, .set_mode = tdo24m_set_mode, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/backlight/tosa_lcd.c linux-2.6.39-pax/drivers/video/backlight/tosa_lcd.c --- linux-2.6.39/drivers/video/backlight/tosa_lcd.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/backlight/tosa_lcd.c 2011-05-19 14:23:36.000000000 +0200 @@ -163,7 +163,7 @@ static int tosa_lcd_set_mode(struct lcd_ return 0; } -static struct lcd_ops tosa_lcd_ops = { +static const struct lcd_ops tosa_lcd_ops = { .set_power = tosa_lcd_set_power, .get_power = tosa_lcd_get_power, .set_mode = tosa_lcd_set_mode, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/bf537-lq035.c linux-2.6.39-pax/drivers/video/bf537-lq035.c --- linux-2.6.39/drivers/video/bf537-lq035.c 2011-03-15 19:35:00.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/bf537-lq035.c 2011-05-19 14:23:36.000000000 +0200 @@ -682,7 +682,7 @@ static int bfin_lcd_check_fb(struct lcd_ return 0; } -static struct lcd_ops bfin_lcd_ops = { +static const struct lcd_ops bfin_lcd_ops = { .get_power = bfin_lcd_get_power, .set_power = bfin_lcd_set_power, .get_contrast = bfin_lcd_get_contrast, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/bf54x-lq043fb.c linux-2.6.39-pax/drivers/video/bf54x-lq043fb.c --- linux-2.6.39/drivers/video/bf54x-lq043fb.c 2011-05-19 10:22:58.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/bf54x-lq043fb.c 2011-05-19 14:23:36.000000000 +0200 @@ -467,7 +467,7 @@ static int bfin_lcd_check_fb(struct lcd_ return 0; } -static struct lcd_ops bfin_lcd_ops = { +static const struct lcd_ops bfin_lcd_ops = { .get_power = bfin_lcd_get_power, .set_power = bfin_lcd_set_power, .get_contrast = bfin_lcd_get_contrast, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/bfin-t350mcqb-fb.c linux-2.6.39-pax/drivers/video/bfin-t350mcqb-fb.c --- linux-2.6.39/drivers/video/bfin-t350mcqb-fb.c 2011-05-19 10:22:58.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/bfin-t350mcqb-fb.c 2011-05-19 14:23:36.000000000 +0200 @@ -387,7 +387,7 @@ static int bfin_lcd_check_fb(struct lcd_ return 0; } -static struct lcd_ops bfin_lcd_ops = { +static const struct lcd_ops bfin_lcd_ops = { .get_power = bfin_lcd_get_power, .set_power = bfin_lcd_set_power, .get_contrast = bfin_lcd_get_contrast, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/fbcmap.c linux-2.6.39-pax/drivers/video/fbcmap.c --- linux-2.6.39/drivers/video/fbcmap.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/fbcmap.c 2011-05-19 13:45:36.000000000 +0200 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/fbmem.c linux-2.6.39-pax/drivers/video/fbmem.c --- linux-2.6.39/drivers/video/fbmem.c 2011-05-19 10:22:59.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/fbmem.c 2011-05-19 13:45:36.000000000 +0200 @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in 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; } @@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_in 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; } @@ -939,6 +939,8 @@ fb_set_var(struct fb_info *info, struct int flags = info->flags; int ret = 0; + pax_track_stack(); + if (var->activate & FB_ACTIVATE_INV_MODE) { struct fb_videomode mode1, mode2; @@ -1064,6 +1066,8 @@ static long do_fb_ioctl(struct fb_info * void __user *argp = (void __user *)arg; long ret = 0; + pax_track_stack(); + switch (cmd) { case FBIOGET_VSCREENINFO: if (!lock_fb_info(info)) @@ -1143,7 +1147,7 @@ static long do_fb_ioctl(struct fb_info * 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/geode/display_gx1.c linux-2.6.39-pax/drivers/video/geode/display_gx1.c --- linux-2.6.39/drivers/video/geode/display_gx1.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/geode/display_gx1.c 2011-05-19 14:23:36.000000000 +0200 @@ -208,7 +208,7 @@ static void gx1_set_hw_palette_reg(struc writel(val, par->dc_regs + DC_PAL_DATA); } -struct geode_dc_ops gx1_dc_ops = { +const struct geode_dc_ops gx1_dc_ops = { .set_mode = gx1_set_mode, .set_palette_reg = gx1_set_hw_palette_reg, }; diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/geode/display_gx1.h linux-2.6.39-pax/drivers/video/geode/display_gx1.h --- linux-2.6.39/drivers/video/geode/display_gx1.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/geode/display_gx1.h 2011-05-19 14:23:36.000000000 +0200 @@ -18,7 +18,7 @@ unsigned gx1_gx_base(void); int gx1_frame_buffer_size(void); -extern struct geode_dc_ops gx1_dc_ops; +extern const struct geode_dc_ops gx1_dc_ops; /* GX1 configuration I/O registers */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/geode/geodefb.h linux-2.6.39-pax/drivers/video/geode/geodefb.h --- linux-2.6.39/drivers/video/geode/geodefb.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/geode/geodefb.h 2011-05-19 14:23:36.000000000 +0200 @@ -31,8 +31,8 @@ struct geodefb_par { int panel_y; void __iomem *dc_regs; void __iomem *vid_regs; - struct geode_dc_ops *dc_ops; - struct geode_vid_ops *vid_ops; + const struct geode_dc_ops *dc_ops; + const struct geode_vid_ops *vid_ops; }; #endif /* !__GEODEFB_H__ */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/geode/video_cs5530.c linux-2.6.39-pax/drivers/video/geode/video_cs5530.c --- linux-2.6.39/drivers/video/geode/video_cs5530.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/geode/video_cs5530.c 2011-05-19 14:23:36.000000000 +0200 @@ -186,7 +186,7 @@ static int cs5530_blank_display(struct f return 0; } -struct geode_vid_ops cs5530_vid_ops = { +const struct geode_vid_ops cs5530_vid_ops = { .set_dclk = cs5530_set_dclk_frequency, .configure_display = cs5530_configure_display, .blank_display = cs5530_blank_display, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/geode/video_cs5530.h linux-2.6.39-pax/drivers/video/geode/video_cs5530.h --- linux-2.6.39/drivers/video/geode/video_cs5530.h 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/geode/video_cs5530.h 2011-05-19 14:23:36.000000000 +0200 @@ -15,7 +15,7 @@ #ifndef __VIDEO_CS5530_H__ #define __VIDEO_CS5530_H__ -extern struct geode_vid_ops cs5530_vid_ops; +extern const struct geode_vid_ops cs5530_vid_ops; /* CS5530 Video device registers */ diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/i810/i810_accel.c linux-2.6.39-pax/drivers/video/i810/i810_accel.c --- linux-2.6.39/drivers/video/i810/i810_accel.c 2011-05-19 10:23:00.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/i810/i810_accel.c 2011-05-19 13:45:36.000000000 +0200 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/matrox/matroxfb_base.c linux-2.6.39-pax/drivers/video/matrox/matroxfb_base.c --- linux-2.6.39/drivers/video/matrox/matroxfb_base.c 2011-05-19 10:23:00.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/matrox/matroxfb_base.c 2011-05-19 14:23:36.000000000 +0200 @@ -1232,7 +1232,7 @@ static struct fb_ops matroxfb_ops = { #define RSText 0x7 #define RSText8 0x8 /* 9-F */ -static struct { struct fb_bitfield red, green, blue, transp; int bits_per_pixel; } colors[] = { +static const struct { struct fb_bitfield red, green, blue, transp; int bits_per_pixel; } colors[] = { { { 0, 8, 0}, { 0, 8, 0}, { 0, 8, 0}, { 0, 0, 0}, 8 }, { { 10, 5, 0}, { 5, 5, 0}, { 0, 5, 0}, { 15, 1, 0}, 16 }, { { 11, 5, 0}, { 5, 6, 0}, { 0, 5, 0}, { 0, 0, 0}, 16 }, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/omap/lcd_ams_delta.c linux-2.6.39-pax/drivers/video/omap/lcd_ams_delta.c --- linux-2.6.39/drivers/video/omap/lcd_ams_delta.c 2011-01-05 01:50:19.000000000 +0100 +++ linux-2.6.39-pax/drivers/video/omap/lcd_ams_delta.c 2011-05-19 14:23:36.000000000 +0200 @@ -87,7 +87,7 @@ static int ams_delta_lcd_get_contrast(st return ams_delta_lcd & AMS_DELTA_MAX_CONTRAST; } -static struct lcd_ops ams_delta_lcd_ops = { +static const struct lcd_ops ams_delta_lcd_ops = { .get_power = ams_delta_lcd_get_power, .set_power = ams_delta_lcd_set_power, .get_contrast = ams_delta_lcd_get_contrast, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/pxa3xx-gcu.c linux-2.6.39-pax/drivers/video/pxa3xx-gcu.c --- linux-2.6.39/drivers/video/pxa3xx-gcu.c 2011-05-19 10:23:01.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/pxa3xx-gcu.c 2011-05-19 14:23:36.000000000 +0200 @@ -103,7 +103,7 @@ struct pxa3xx_gcu_priv { 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 -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/sh_mobile_lcdcfb.c linux-2.6.39-pax/drivers/video/sh_mobile_lcdcfb.c --- linux-2.6.39/drivers/video/sh_mobile_lcdcfb.c 2011-05-19 10:23:01.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/sh_mobile_lcdcfb.c 2011-05-19 14:23:36.000000000 +0200 @@ -245,7 +245,7 @@ static unsigned long lcdc_sys_read_data( return lcdc_read(ch->lcdc, _LDDRDR) & 0x3ffff; } -struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = { +const struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = { lcdc_sys_write_index, lcdc_sys_write_data, lcdc_sys_read_data, diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/udlfb.c linux-2.6.39-pax/drivers/video/udlfb.c --- linux-2.6.39/drivers/video/udlfb.c 2011-05-19 10:23:01.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/udlfb.c 2011-05-19 13:45:44.000000000 +0200 @@ -584,11 +584,11 @@ int dlfb_handle_damage(struct dlfb_data dlfb_urb_completion(urb); error: - atomic_add(bytes_sent, &dev->bytes_sent); - atomic_add(bytes_identical, &dev->bytes_identical); - atomic_add(width*height*2, &dev->bytes_rendered); + atomic_add_unchecked(bytes_sent, &dev->bytes_sent); + atomic_add_unchecked(bytes_identical, &dev->bytes_identical); + atomic_add_unchecked(width*height*2, &dev->bytes_rendered); end_cycles = get_cycles(); - atomic_add(((unsigned int) ((end_cycles - start_cycles) + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles) >> 10)), /* Kcycles */ &dev->cpu_kcycles_used); @@ -709,11 +709,11 @@ static void dlfb_dpy_deferred_io(struct dlfb_urb_completion(urb); error: - atomic_add(bytes_sent, &dev->bytes_sent); - atomic_add(bytes_identical, &dev->bytes_identical); - atomic_add(bytes_rendered, &dev->bytes_rendered); + atomic_add_unchecked(bytes_sent, &dev->bytes_sent); + atomic_add_unchecked(bytes_identical, &dev->bytes_identical); + atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered); end_cycles = get_cycles(); - atomic_add(((unsigned int) ((end_cycles - start_cycles) + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles) >> 10)), /* Kcycles */ &dev->cpu_kcycles_used); } @@ -1301,7 +1301,7 @@ static ssize_t metrics_bytes_rendered_sh struct fb_info *fb_info = dev_get_drvdata(fbdev); struct dlfb_data *dev = fb_info->par; return snprintf(buf, PAGE_SIZE, "%u\n", - atomic_read(&dev->bytes_rendered)); + atomic_read_unchecked(&dev->bytes_rendered)); } static ssize_t metrics_bytes_identical_show(struct device *fbdev, @@ -1309,7 +1309,7 @@ static ssize_t metrics_bytes_identical_s struct fb_info *fb_info = dev_get_drvdata(fbdev); struct dlfb_data *dev = fb_info->par; return snprintf(buf, PAGE_SIZE, "%u\n", - atomic_read(&dev->bytes_identical)); + atomic_read_unchecked(&dev->bytes_identical)); } static ssize_t metrics_bytes_sent_show(struct device *fbdev, @@ -1317,7 +1317,7 @@ static ssize_t metrics_bytes_sent_show(s struct fb_info *fb_info = dev_get_drvdata(fbdev); struct dlfb_data *dev = fb_info->par; return snprintf(buf, PAGE_SIZE, "%u\n", - atomic_read(&dev->bytes_sent)); + atomic_read_unchecked(&dev->bytes_sent)); } static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev, @@ -1325,7 +1325,7 @@ static ssize_t metrics_cpu_kcycles_used_ struct fb_info *fb_info = dev_get_drvdata(fbdev); struct dlfb_data *dev = fb_info->par; return snprintf(buf, PAGE_SIZE, "%u\n", - atomic_read(&dev->cpu_kcycles_used)); + atomic_read_unchecked(&dev->cpu_kcycles_used)); } static ssize_t edid_show( @@ -1382,10 +1382,10 @@ static ssize_t metrics_reset_store(struc struct fb_info *fb_info = dev_get_drvdata(fbdev); struct dlfb_data *dev = fb_info->par; - atomic_set(&dev->bytes_rendered, 0); - atomic_set(&dev->bytes_identical, 0); - atomic_set(&dev->bytes_sent, 0); - atomic_set(&dev->cpu_kcycles_used, 0); + atomic_set_unchecked(&dev->bytes_rendered, 0); + atomic_set_unchecked(&dev->bytes_identical, 0); + atomic_set_unchecked(&dev->bytes_sent, 0); + atomic_set_unchecked(&dev->cpu_kcycles_used, 0); return count; } diff -NurpX linux-2.6.39-pax/Documentation/dontdiff linux-2.6.39/drivers/video/uvesafb.c linux-2.6.39-pax/drivers/video/uvesafb.c --- linux-2.6.39/drivers/video/uvesafb.c 2011-05-19 10:23:01.000000000 +0200 +++ linux-2.6.39-pax/drivers/video/uvesafb.c 2011-05-19 14:23:27.000000000 +0200 @@ -19,6 +19,7 @@ #include #include #include +#include #include